debian/patches/upstream_changeset_r93631.diff


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20

Description: Fixed warnings produced by gcc-4.6.0.
Author: Ahmad Sharif <asharif@chromium.org>
Bug: https://bugs.webkit.org/show_bug.cgi?id=62168
Origin: upstream, http://trac.webkit.org/changeset/93631

---
 Source/WebCore/dom/Element.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/Source/WebCore/dom/Element.cpp
+++ b/Source/WebCore/dom/Element.cpp
@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange ch
 {
     // 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();
     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();