From 2fa3e2299ba924ea33cf23ed8e4072de0a006cf8 Mon Sep 17 00:00:00 2001 From: synergydev Date: Sun, 13 Oct 2013 11:02:34 -0700 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp index 5fb6cdc4b..546671a14 100644 --- a/Source/WebCore/dom/Element.cpp +++ b/Source/WebCore/dom/Element.cpp @@ -1073,7 +1073,7 @@ void Element::recalcStyle(StyleChange change) { // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called. RefPtr currentStyle(renderStyle()); - bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false; + bool hasParentStyle = parentNodeForRenderingAndStyle() ? static_cast(parentNodeForRenderingAndStyle()->renderStyle()) : false; bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules(); if ((change > NoChange || needsStyleRecalc())) { -- cgit v1.2.3