Commit 9ed15db2 authored by ossy@webkit.org's avatar ossy@webkit.org

2010-08-29 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 ||


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66338 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 91543431
2010-08-29 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-29 Darin Adler <darin@apple.com>
Try to fix Mac build.
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment