diff options
| author | synergydev <synergye@codefi.re> | 2013-10-13 11:02:34 -0700 |
|---|---|---|
| committer | synergydev <synergye@codefi.re> | 2013-10-13 12:03:48 -0700 |
| commit | 2fa3e2299ba924ea33cf23ed8e4072de0a006cf8 (patch) | |
| tree | df28e451b0985f7b2836343ea86a1deda2fd8b05 | |
| parent | 739431e2499360001123042103ee3425c098c0f6 (diff) | |
| download | webkit-2fa3e2299ba924ea33cf23ed8e4072de0a006cf8.tar.gz | |
webkit: workaround incompatible operand types
Works around the following:
error: incompatible operand types ('WebCore::RenderStyle *' and 'bool')
Change-Id: Ic87e958d9bc06ce0a3ae203c8b4812d0e3a2aaef
| -rw-r--r-- | Source/WebCore/dom/Element.cpp | 2 |
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())) { |