Ticket #57751: patch-src_3rdparty_webkit_Source_WebCore_dom_Element_cpp

File patch-src_3rdparty_webkit_Source_WebCore_dom_Element_cpp, 994 bytes (added by devernay (Frédéric Devernay), 5 years ago)
Line 
1$OpenBSD$
2
3Prevent error from gcc 6.
4Element.cpp:1083:60: error: operands to ?: have different types
5'WebCore::RenderStyle*' and 'bool'
6
7Index: src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
8--- src/3rdparty/webkit/Source/WebCore/dom/Element.cpp.orig
9+++ src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
10@@ -1080,7 +1080,7 @@ void Element::recalcStyle(StyleChange change)
11 {
12     // Ref currentStyle in case it would otherwise be deleted when setRenderStyle() is called.
13     RefPtr<RenderStyle> currentStyle(renderStyle());
14-    bool hasParentStyle = parentNodeForRenderingAndStyle() ? parentNodeForRenderingAndStyle()->renderStyle() : false;
15+    bool hasParentStyle = parentNodeForRenderingAndStyle() ? bool(parentNodeForRenderingAndStyle()->renderStyle()) : false;
16     bool hasDirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByDirectAdjacentRules();
17     bool hasIndirectAdjacentRules = currentStyle && currentStyle->childrenAffectedByForwardPositionalRules();
18