diff options
author | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-16 15:08:36 -0700 |
---|---|---|
committer | Teng-Hui Zhu <ztenghui@google.com> | 2012-04-16 15:16:31 -0700 |
commit | 95217a662a9bdf75bcd22acb92bccce312ea974b (patch) | |
tree | e547a8759595403965e22cb36760240f2f2e2ecf /Source/WebCore/css | |
parent | c9efa1bf37f8bbf12a5b5dd465cbfb06c8053d9c (diff) | |
download | external_webkit-95217a662a9bdf75bcd22acb92bccce312ea974b.zip external_webkit-95217a662a9bdf75bcd22acb92bccce312ea974b.tar.gz external_webkit-95217a662a9bdf75bcd22acb92bccce312ea974b.tar.bz2 |
Revert "Cherry-pick WebKit change r92139 to fix a LayoutTest crash"
This was causing HTML5 video to crash.
bug:6342146
This reverts commit d60e027437c746fb2412aef1c1cad6b1347c1b5e.
Change-Id: I15893f6c49bba2f0f738590d29c8b0c9024a98e6
Diffstat (limited to 'Source/WebCore/css')
-rw-r--r-- | Source/WebCore/css/CSSStyleSelector.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/Source/WebCore/css/CSSStyleSelector.cpp b/Source/WebCore/css/CSSStyleSelector.cpp index e49ad2a..2424349 100644 --- a/Source/WebCore/css/CSSStyleSelector.cpp +++ b/Source/WebCore/css/CSSStyleSelector.cpp @@ -1237,15 +1237,6 @@ PassRefPtr<RenderStyle> CSSStyleSelector::styleForDocument(Document* document) return documentStyle.release(); } -static inline bool isAtShadowBoundary(Element* element) -{ - if (!element) - return false; - - ContainerNode* parentNode = element->parentNode(); - return parentNode && parentNode->isShadowBoundary(); -} - // If resolveForRootDefault is true, style based on user agent style sheet only. This is used in media queries, where // relative units are interpreted according to document root element style, styled only with UA stylesheet @@ -1288,10 +1279,6 @@ PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* e, RenderStyl initForStyleResolve(e, defaultParent); } - // Don't propagate user-modify into shadow DOM - if (isAtShadowBoundary(e)) - m_style->setUserModify(RenderStyle::initialUserModify()); - m_checker.m_matchVisitedPseudoClass = matchVisitedPseudoClass; m_style = RenderStyle::create(); @@ -1786,6 +1773,15 @@ static void addIntrinsicMargins(RenderStyle* style) } } +static inline bool isAtShadowBoundary(Element* element) +{ + if (!element) + return false; + + ContainerNode* parentNode = element->parentNode(); + return parentNode && parentNode->isShadowBoundary(); +} + void CSSStyleSelector::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e) { // Cache our original display. |