[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f8ace8d2159d4748c2131772f8d6ecca34a097fc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 22 17:25:35 2010 +0000

    2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Fix compiler warning "suggest parentheses around"
            https://bugs.webkit.org/show_bug.cgi?id=35197
    
            No new tests as there is no new functionality.
    
            * wml/WMLVariables.cpp:
            (WebCore::substituteVariableReferences):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55087 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 36c28a0..0b10a45 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-22  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix compiler warning "suggest parentheses around"
+        https://bugs.webkit.org/show_bug.cgi?id=35197
+
+        No new tests as there is no new functionality.
+
+        * wml/WMLVariables.cpp:
+        (WebCore::substituteVariableReferences):
+
 2010-02-22  Gustavo Noronha Silva  <gns at gnome.org>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/wml/WMLVariables.cpp b/WebCore/wml/WMLVariables.cpp
index f48aa1c..f7be400 100644
--- a/WebCore/wml/WMLVariables.cpp
+++ b/WebCore/wml/WMLVariables.cpp
@@ -251,7 +251,7 @@ String substituteVariableReferences(const String& reference, Document* document,
         if (!conversionMode.isEmpty()) {
             // Override default escape mode, if desired
             WMLVariableEscapingMode specifiedEscapeMode = WMLVariableEscapingNone; 
-            if (isValid = isValidVariableEscapingModeString(conversionMode, specifiedEscapeMode))
+            if ((isValid = isValidVariableEscapingModeString(conversionMode, specifiedEscapeMode)))
                 escapeMode = specifiedEscapeMode;
 
             if (!isValid)

-- 
WebKit Debian packaging