REGRESSION(r66324): Fix warnings in editing/ApplyStyleCommand.cpp
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Aug 2010 09:42:35 +0000 (09:42 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 30 Aug 2010 09:42:35 +0000 (09:42 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@66378 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/editing/ApplyStyleCommand.cpp

index 22f4db2..809b250 100644 (file)
@@ -1,3 +1,13 @@
+2010-08-30  Csaba Osztrogon√°c  <ossy@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@gmail.com>
 
         Unreviewed, rolling out r66198.
index f31a00f..f002e49 100644 (file)
@@ -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;