[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 9ed15db2acd1633b1758b5417c2b51ab9c9dc4a9
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Aug 29 22:09:01 2010 +0000

    2010-08-29  Csaba Osztrogonác  <ossy at webkit.org>
    
            Reviewed by Darin Adler.
    
            REGRESSION(r66324): Fix warnings in editing/ApplyStyleCommand.cpp
            https://bugs.webkit.org/show_bug.cgi?id=44843
    
            * editing/ApplyStyleCommand.cpp:
            (WebCore::ApplyStyleCommand::removeImplicitlyStyledElement): Suggested parentheses added around && within ||
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b460082..2dcaaf8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-29  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(r66324): Fix warnings in editing/ApplyStyleCommand.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=44843
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::removeImplicitlyStyledElement): Suggested parentheses added around && within ||
+
 2010-08-29  Darin Adler  <darin at apple.com>
 
         Try to fix Mac build.
diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index 9098da4..f31a00f 100644
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -1206,8 +1206,8 @@ bool ApplyStyleCommand::removeImplicitlyStyledElement(CSSMutableStyleDeclaration
         const HTMLEquivalent& equivalent = HTMLEquivalents[i];
         ASSERT(equivalent.element || equivalent.attribute);
         if (extractedStyle && equivalent.pushDownType == ShouldNotBePushedDown
-            || equivalent.element && !element->hasTagName(*equivalent.element)
-            || equivalent.attribute && !element->hasAttribute(*equivalent.attribute))
+            || (equivalent.element && !element->hasTagName(*equivalent.element))
+            || (equivalent.attribute && !element->hasAttribute(*equivalent.attribute)))
             continue;
 
         RefPtr<CSSValue> styleValue = style->getPropertyCSSValue(equivalent.propertyID);

-- 
WebKit Debian packaging