summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-10-16 19:10:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-16 19:10:43 +0000
commitb5f8fbb89c3d48053d7e38282fd6f6aac3fdd0e6 (patch)
treedf28e451b0985f7b2836343ea86a1deda2fd8b05
parent739431e2499360001123042103ee3425c098c0f6 (diff)
parent2fa3e2299ba924ea33cf23ed8e4072de0a006cf8 (diff)
downloadwebkit-b5f8fbb89c3d48053d7e38282fd6f6aac3fdd0e6.tar.gz
Merge "webkit: workaround incompatible operand types"HEADmastermain
-rw-r--r--Source/WebCore/dom/Element.cpp2
1 files changed, 1 insertions, 1 deletions
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<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())) {