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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 30b34ec45878ca6ef5ef206563214508b5f65013
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 15 01:16:41 2002 +0000

    Fixed optimized find() implementation.  I had the sense of caseSensitive inverted.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@744 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 7bd0638..bc61eac 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-03-14  Richard Williamson  <rjw at apple.com>
 
+        Fixed optimized find() implementation.  I had the sense of caseSensitive inverted.
+        
+	* src/kwq/KWQString.mm: (QString::find):
+
+2002-03-14  Richard Williamson  <rjw at apple.com>
+
         Attempted implementation of space optimizations.  Disabled for now.
         
 	* src/kwq/KWQFontMetrics.mm: (+[KWQLayoutInfo _dumpLayoutCache:]),
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 7bd0638..bc61eac 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,11 @@
 2002-03-14  Richard Williamson  <rjw at apple.com>
 
+        Fixed optimized find() implementation.  I had the sense of caseSensitive inverted.
+        
+	* src/kwq/KWQString.mm: (QString::find):
+
+2002-03-14  Richard Williamson  <rjw at apple.com>
+
         Attempted implementation of space optimizations.  Disabled for now.
         
 	* src/kwq/KWQFontMetrics.mm: (+[KWQLayoutInfo _dumpLayoutCache:]),
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 7bd0638..bc61eac 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,11 @@
 2002-03-14  Richard Williamson  <rjw at apple.com>
 
+        Fixed optimized find() implementation.  I had the sense of caseSensitive inverted.
+        
+	* src/kwq/KWQString.mm: (QString::find):
+
+2002-03-14  Richard Williamson  <rjw at apple.com>
+
         Attempted implementation of space optimizations.  Disabled for now.
         
 	* src/kwq/KWQFontMetrics.mm: (+[KWQLayoutInfo _dumpLayoutCache:]),
diff --git a/WebCore/kwq/KWQString.mm b/WebCore/kwq/KWQString.mm
index d9a466e..30f57cf 100644
--- a/WebCore/kwq/KWQString.mm
+++ b/WebCore/kwq/KWQString.mm
@@ -546,8 +546,7 @@ int QString::find(const char *chs, int index, bool caseSensitive) const
         if (index < 0) {
             index += len;
         }
-        //if (internalBuffer == 0){
-        if (1){
+        if (internalBuffer == 0){
 #ifdef DEBUG_FIND_COUNTER
             findExpensiveCount++;
             if (findCount % 500 == 0)
@@ -594,7 +593,7 @@ int QString::find(const char *chs, int index, bool caseSensitive) const
                         while (*compareTo && *_chs){
                             c1 = (UniChar)(*compareTo++);
                             c2 = (UniChar)(*_chs);
-                            if (caseSensitive){
+                            if (!caseSensitive){
                                 if (c2 >= 'a' && c2 <= 'z')
                                     otherCase_c2 = c2 - caseDelta;
                                 else if (c2 >= 'A' && c2 <= 'Z')
diff --git a/WebCore/src/kwq/KWQString.mm b/WebCore/src/kwq/KWQString.mm
index d9a466e..30f57cf 100644
--- a/WebCore/src/kwq/KWQString.mm
+++ b/WebCore/src/kwq/KWQString.mm
@@ -546,8 +546,7 @@ int QString::find(const char *chs, int index, bool caseSensitive) const
         if (index < 0) {
             index += len;
         }
-        //if (internalBuffer == 0){
-        if (1){
+        if (internalBuffer == 0){
 #ifdef DEBUG_FIND_COUNTER
             findExpensiveCount++;
             if (findCount % 500 == 0)
@@ -594,7 +593,7 @@ int QString::find(const char *chs, int index, bool caseSensitive) const
                         while (*compareTo && *_chs){
                             c1 = (UniChar)(*compareTo++);
                             c2 = (UniChar)(*_chs);
-                            if (caseSensitive){
+                            if (!caseSensitive){
                                 if (c2 >= 'a' && c2 <= 'z')
                                     otherCase_c2 = c2 - caseDelta;
                                 else if (c2 >= 'A' && c2 <= 'Z')

-- 
WebKit Debian packaging