[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 0bd1b1b14026032c4fbc5c8d67d061ee8fe7a935
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 27 19:54:04 2004 +0000

    	Don't do unnecessary string comparisons when no composite operator is
    	specified.
    
            Reviewed by Hyatt.
    
            * kwq/KWQPainter.mm:
            (compositeOperatorFromString):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6495 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c46fac4..2746063 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-04-27  Richard Williamson   <rjw at apple.com>
+
+	Don't do unnecessary string comparisons when no composite operator is
+	specified.  
+
+        Reviewed by Hyatt.
+
+        * kwq/KWQPainter.mm:
+        (compositeOperatorFromString):
+
 2004-04-27  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/kwq/KWQPainter.mm b/WebCore/kwq/KWQPainter.mm
index 1912926..923df6f 100644
--- a/WebCore/kwq/KWQPainter.mm
+++ b/WebCore/kwq/KWQPainter.mm
@@ -463,12 +463,14 @@ struct CompositeOperator compositeOperators[NUM_COMPOSITE_OPERATORS] = {
 
 static NSCompositingOperation compositeOperatorFromString (QString aString)
 {
-    const char *operatorString = aString.ascii();
-    int i;
-    
-    for (i = 0; i < NUM_COMPOSITE_OPERATORS; i++) {
-        if (strcasecmp (operatorString, compositeOperators[i].name) == 0) {
-            return compositeOperators[i].value;
+    if (aString.length()) {
+        const char *operatorString = aString.ascii();
+        int i;
+        
+        for (i = 0; i < NUM_COMPOSITE_OPERATORS; i++) {
+            if (strcasecmp (operatorString, compositeOperators[i].name) == 0) {
+                return compositeOperators[i].value;
+            }
         }
     }
     return NSCompositeSourceOver;

-- 
WebKit Debian packaging