[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit a5d8250bbae7a1cd14622b2e3866d00dd5e46771
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 29 18:00:41 2003 +0000

    WebCore:
    
    	- fixed 3346707 -- AutoFill does not fill in email address on
    	Apple Store new account page
    
            Reviewed by Darin
    
            * kwq/KWQRegExp.h:
            * kwq/KWQRegExp.mm:
            (QRegExp::searchRev):
    	This method (that Trey had added) used a placeholder 2nd parameter
    	that was always -1 and should have been ignored. But it was
    	being passed into QRegExp::match as the starting index, which
    	happened to work in many cases, but not if the byte of memory
    	before the string happened to be a null character. Fixed by
    	eliminating the placeholder parameter entirely.
    
    WebBrowser:
    
    	- fixed 3345689 -- Safari-89: timeout alert sheet sometimes
    	shows for the wrong tab
    
            Reviewed by Darin
    
            * BrowserWindowController.m:
            (-[BrowserWindowController closeTab:]):
    	We were removing the old tab, then switching to the next tab.
    	But removing the old tab causes NSTabView to switch to the
    	previous tab, so there was an instant where the previous tab
    	was switched in and thus felt compelled to put up its pending
    	sheet. Fixed by switching to new tab before removing old one,
    	which should also be a slight speed improvement, since we bypass
    	going to the wrong tab momentarily.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4727 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c4734a1..1460d5f 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,20 @@
+2003-07-29  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3346707 -- AutoFill does not fill in email address on 
+	Apple Store new account page
+
+        Reviewed by Darin
+
+        * kwq/KWQRegExp.h:
+        * kwq/KWQRegExp.mm:
+        (QRegExp::searchRev):
+	This method (that Trey had added) used a placeholder 2nd parameter
+	that was always -1 and should have been ignored. But it was
+	being passed into QRegExp::match as the starting index, which
+	happened to work in many cases, but not if the byte of memory
+	before the string happened to be a null character. Fixed by
+	eliminating the placeholder parameter entirely.
+
 2003-07-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c4734a1..1460d5f 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,20 @@
+2003-07-29  John Sullivan  <sullivan at apple.com>
+
+	- fixed 3346707 -- AutoFill does not fill in email address on 
+	Apple Store new account page
+
+        Reviewed by Darin
+
+        * kwq/KWQRegExp.h:
+        * kwq/KWQRegExp.mm:
+        (QRegExp::searchRev):
+	This method (that Trey had added) used a placeholder 2nd parameter
+	that was always -1 and should have been ignored. But it was
+	being passed into QRegExp::match as the starting index, which
+	happened to work in many cases, but not if the byte of memory
+	before the string happened to be a null character. Fixed by
+	eliminating the placeholder parameter entirely.
+
 2003-07-28  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Richard.
diff --git a/WebCore/kwq/KWQRegExp.h b/WebCore/kwq/KWQRegExp.h
index acd391c..8a157ac 100644
--- a/WebCore/kwq/KWQRegExp.h
+++ b/WebCore/kwq/KWQRegExp.h
@@ -44,7 +44,7 @@ public:
     int match(const QString &, int startFrom = 0, int *matchLength = 0, bool treatStartAsStartOfInput = true) const;
 
     int search(const QString &, int startFrom = 0) const;
-    int searchRev(const QString &, int startFrom = -1) const;
+    int searchRev(const QString &) const;
 
     int pos(int n = 0);
     int matchedLength() const;
diff --git a/WebCore/kwq/KWQRegExp.mm b/WebCore/kwq/KWQRegExp.mm
index 1dd52d6..d0f5237 100644
--- a/WebCore/kwq/KWQRegExp.mm
+++ b/WebCore/kwq/KWQRegExp.mm
@@ -147,7 +147,7 @@ QString QRegExp::pattern() const
 }
 
 int QRegExp::match(const QString &str, int startFrom, int *matchLength, bool treatStartAsStartOfInput) const
-{
+{    
     const char *cstring = str.latin1() + startFrom;
 
     int flags = 0;
@@ -181,9 +181,8 @@ int QRegExp::search(const QString &str, int startFrom) const
     return match(str, startFrom, NULL, false);
 }
 
-int QRegExp::searchRev(const QString &str, int startFrom) const
+int QRegExp::searchRev(const QString &str) const
 {
-    ASSERT(startFrom == -1);
     // FIXME: Total hack for now.  Search forward, return the last, greedy match
     int start = 0;
     int pos;
@@ -191,14 +190,14 @@ int QRegExp::searchRev(const QString &str, int startFrom) const
     int lastMatchLength = -1;
     do {
         int matchLength;
-        pos = match(str, startFrom, &matchLength, start == 0);
+        pos = match(str, start, &matchLength, start == 0);
         if (pos >= 0) {
             if ((pos+matchLength) > (lastPos+lastMatchLength)) {
                 // replace last match if this one is later and not a subset of the last match
                 lastPos = pos;
                 lastMatchLength = matchLength;
             }
-            startFrom = pos + 1;
+            start = pos + 1;
         }
     } while (pos != -1);
     d->lastMatchPos = lastPos;

-- 
WebKit Debian packaging