[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 318d99657ad78a0c74496421081ea2a95b02c88e
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 30 09:42:35 2010 +0000

    REGRESSION(r66324): Fix warnings in editing/ApplyStyleCommand.cpp
    https://bugs.webkit.org/show_bug.cgi?id=44843
    
    Reviewed by Darin Adler.
    
    * editing/ApplyStyleCommand.cpp:
    (WebCore::ApplyStyleCommand::removeImplicitlyStyledElement): Suggested parentheses added around && within ||
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22f4db2..809b250 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-30  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-30  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r66198.
diff --git a/WebCore/editing/ApplyStyleCommand.cpp b/WebCore/editing/ApplyStyleCommand.cpp
index f31a00f..f002e49 100644
--- a/WebCore/editing/ApplyStyleCommand.cpp
+++ b/WebCore/editing/ApplyStyleCommand.cpp
@@ -1205,7 +1205,7 @@ bool ApplyStyleCommand::removeImplicitlyStyledElement(CSSMutableStyleDeclaration
     for (size_t i = 0; i < sizeof(HTMLEquivalents) / sizeof(HTMLEquivalent); i++) {
         const HTMLEquivalent& equivalent = HTMLEquivalents[i];
         ASSERT(equivalent.element || equivalent.attribute);
-        if (extractedStyle && equivalent.pushDownType == ShouldNotBePushedDown
+        if ((extractedStyle && equivalent.pushDownType == ShouldNotBePushedDown)
             || (equivalent.element && !element->hasTagName(*equivalent.element))
             || (equivalent.attribute && !element->hasAttribute(*equivalent.attribute)))
             continue;

-- 
WebKit Debian packaging