From 1b914638db989aaa98631a1c1e02c7b2d44805d8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 11 May 2012 09:43:24 +0200 Subject: Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736) New snapshot to include QDeclarative* -> QQml* build fixes --- Source/WebCore/dom/NodeRenderingContext.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/WebCore/dom/NodeRenderingContext.cpp') diff --git a/Source/WebCore/dom/NodeRenderingContext.cpp b/Source/WebCore/dom/NodeRenderingContext.cpp index 271f5cad0..5898419a6 100644 --- a/Source/WebCore/dom/NodeRenderingContext.cpp +++ b/Source/WebCore/dom/NodeRenderingContext.cpp @@ -71,7 +71,7 @@ NodeRenderingContext::NodeRenderingContext(Node* node) } if (parent->isElementNode() || parent->isShadowRoot()) { - if (parent->isElementNode() && toElement(parent)->hasShadowRoot()) + if (parent->isElementNode()) m_visualParentShadow = toElement(parent)->shadow(); else if (parent->isShadowRoot()) m_visualParentShadow = toShadowRoot(parent)->owner(); -- cgit v1.2.1