commit b5f8fbb89c3d48053d7e38282fd6f6aac3fdd0e6
author Nick Kralevich <nnk@google.com> Wed Oct 16 19:10:43 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 16 19:10:43 2013 +0000
tree df28e451b0985f7b2836343ea86a1deda2fd8b05
parent 739431e2499360001123042103ee3425c098c0f6
parent 2fa3e2299ba924ea33cf23ed8e4072de0a006cf8

Merge "webkit: workaround incompatible operand types"

Source/WebCore/dom/Element.cpp

diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
index 5fb6cdc..546671a 100644
--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -1073,7 +1073,7 @@
 {
     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
     RefPtr<RenderStyle> currentStyle(renderStyle());
-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
+    bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast<bool>(parentNodeForRenderingAndStyle()->renderStyle()) : false;
     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
 
     if ((change > NoChange || needsStyleRecalc())) {