commit 2fa3e2299ba924ea33cf23ed8e4072de0a006cf8
author synergydev <synergye@codefi.re> Sun Oct 13 11:02:34 2013 -0700
committer synergydev <synergye@codefi.re> Sun Oct 13 12:03:48 2013 -0700
tree df28e451b0985f7b2836343ea86a1deda2fd8b05
parent 739431e2499360001123042103ee3425c098c0f6

webkit: workaround incompatible operand types

Works around the following:
error: incompatible operand types ('WebCore::RenderStyle *' and 'bool')

Change-Id: Ic87e958d9bc06ce0a3ae203c8b4812d0e3a2aaef

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())) {