<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189987] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189987">189987</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-09-18 15:25:08 -0700 (Fri, 18 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support style isolation in shadow trees
https://bugs.webkit.org/show_bug.cgi?id=149353
Reviewed by Ryosuke Niwa.
Allow ShadowRoots to have their own StyleResolvers.
This patch just adds the mechanism, all shadow roots still use the document resolver.
* css/StyleResolver.h:
(WebCore::StyleResolverParentPusher::push):
(WebCore::StyleResolverParentPusher::~StyleResolverParentPusher):
* dom/Element.cpp:
(WebCore::Element::absoluteLinkURL):
(WebCore::Element::styleResolver):
Helper function for getting the right StyleResolver for the element.
(WebCore::Element::resolveStyle):
Helper function for resolving element style.
* dom/Element.h:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::~ShadowRoot):
(WebCore::ShadowRoot::styleResolver):
(WebCore::ShadowRoot::cloneNode):
* dom/ShadowRoot.h:
(WebCore::ShadowRoot::resetStyleInheritance):
* editing/EditingStyle.cpp:
(WebCore::styleFromMatchedRulesForElement):
* html/HTMLTitleElement.cpp:
(WebCore::HTMLTitleElement::computedTextWithDirection):
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::setFont):
* inspector/InspectorCSSAgent.cpp:
(WebCore::InspectorCSSAgent::getMatchedStylesForNode):
* page/animation/KeyframeAnimation.cpp:
(WebCore::KeyframeAnimation::KeyframeAnimation):
* rendering/RenderElement.cpp:
(WebCore::RenderElement::getUncachedPseudoStyle):
(WebCore::RenderElement::containingBlockForFixedPosition):
* rendering/RenderNamedFlowFragment.cpp:
(WebCore::RenderNamedFlowFragment::checkRegionStyle):
(WebCore::RenderNamedFlowFragment::computeStyleInRegion):
* style/StyleResolveTree.cpp:
(WebCore::Style::styleForElement):
* svg/SVGElement.cpp:
(WebCore::SVGElement::customStyleForRenderer):
(WebCore::SVGElement::animatedSMILStyleProperties):
* svg/SVGElementRareData.h:
(WebCore::SVGElementRareData::overrideComputedStyle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoredomShadowRooth">trunk/Source/WebCore/dom/ShadowRoot.h</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLTitleElementcpp">trunk/Source/WebCore/html/HTMLTitleElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorCSSAgentcpp">trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationKeyframeAnimationcpp">trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp">trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementRareDatah">trunk/Source/WebCore/svg/SVGElementRareData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/ChangeLog 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-09-18 Antti Koivisto <antti@apple.com>
+
+ Support style isolation in shadow trees
+ https://bugs.webkit.org/show_bug.cgi?id=149353
+
+ Reviewed by Ryosuke Niwa.
+
+ Allow ShadowRoots to have their own StyleResolvers.
+
+ This patch just adds the mechanism, all shadow roots still use the document resolver.
+
+ * css/StyleResolver.h:
+ (WebCore::StyleResolverParentPusher::push):
+ (WebCore::StyleResolverParentPusher::~StyleResolverParentPusher):
+ * dom/Element.cpp:
+ (WebCore::Element::absoluteLinkURL):
+ (WebCore::Element::styleResolver):
+
+ Helper function for getting the right StyleResolver for the element.
+
+ (WebCore::Element::resolveStyle):
+
+ Helper function for resolving element style.
+
+ * dom/Element.h:
+ * dom/ShadowRoot.cpp:
+ (WebCore::ShadowRoot::~ShadowRoot):
+ (WebCore::ShadowRoot::styleResolver):
+ (WebCore::ShadowRoot::cloneNode):
+ * dom/ShadowRoot.h:
+ (WebCore::ShadowRoot::resetStyleInheritance):
+ * editing/EditingStyle.cpp:
+ (WebCore::styleFromMatchedRulesForElement):
+ * html/HTMLTitleElement.cpp:
+ (WebCore::HTMLTitleElement::computedTextWithDirection):
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::setFont):
+ * inspector/InspectorCSSAgent.cpp:
+ (WebCore::InspectorCSSAgent::getMatchedStylesForNode):
+ * page/animation/KeyframeAnimation.cpp:
+ (WebCore::KeyframeAnimation::KeyframeAnimation):
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::getUncachedPseudoStyle):
+ (WebCore::RenderElement::containingBlockForFixedPosition):
+ * rendering/RenderNamedFlowFragment.cpp:
+ (WebCore::RenderNamedFlowFragment::checkRegionStyle):
+ (WebCore::RenderNamedFlowFragment::computeStyleInRegion):
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::styleForElement):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::customStyleForRenderer):
+ (WebCore::SVGElement::animatedSMILStyleProperties):
+ * svg/SVGElementRareData.h:
+ (WebCore::SVGElementRareData::overrideComputedStyle):
+
</ins><span class="cx"> 2015-09-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Fix bindings tests after r189934.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_pushedStyleResolver)
</span><span class="cx"> return;
</span><del>- m_pushedStyleResolver = &m_parent->document().ensureStyleResolver();
</del><ins>+ m_pushedStyleResolver = &m_parent->styleResolver();
</ins><span class="cx"> m_pushedStyleResolver->pushParentElement(m_parent);
</span><span class="cx"> }
</span><span class="cx"> ~StyleResolverParentPusher()
</span><span class="lines">@@ -587,9 +587,7 @@
</span><span class="cx"> return;
</span><span class="cx"> // This tells us that our pushed style selector is in a bad state,
</span><span class="cx"> // so we should just bail out in that scenario.
</span><del>- ASSERT(m_pushedStyleResolver == &m_parent->document().ensureStyleResolver());
- if (m_pushedStyleResolver != &m_parent->document().ensureStyleResolver())
- return;
</del><ins>+ ASSERT(m_pushedStyleResolver == &m_parent->styleResolver());
</ins><span class="cx"> m_pushedStyleResolver->popParentElement(m_parent);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -1381,6 +1381,19 @@
</span><span class="cx"> return document().completeURL(stripLeadingAndTrailingHTMLSpaces(linkAttribute));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+StyleResolver& Element::styleResolver()
+{
+ if (auto* shadowRoot = containingShadowRoot())
+ return shadowRoot->styleResolver();
+
+ return document().ensureStyleResolver();
+}
+
+Ref<RenderStyle> Element::resolveStyle(RenderStyle* parentStyle)
+{
+ return styleResolver().styleForElement(this, parentStyle);
+}
+
</ins><span class="cx"> // Returns true is the given attribute is an event handler.
</span><span class="cx"> // We consider an event handler any attribute that begins with "on".
</span><span class="cx"> // It is a simple solution that has the advantage of not requiring any
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/dom/Element.h 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -487,6 +487,9 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT URL absoluteLinkURL() const;
</span><span class="cx">
</span><ins>+ StyleResolver& styleResolver();
+ Ref<RenderStyle> resolveStyle(RenderStyle* parentStyle);
+
</ins><span class="cx"> protected:
</span><span class="cx"> Element(const QualifiedName&, Document&, ConstructionType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
</span><span class="cx"> unsigned countersAndFlags[1];
</span><ins>+ void* styleResolver;
</ins><span class="cx"> void* host;
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span><span class="cx"> void* slotAssignment;
</span><span class="lines">@@ -70,6 +71,14 @@
</span><span class="cx"> removeDetachedChildren();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+StyleResolver& ShadowRoot::styleResolver()
+{
+ if (m_styleResolver)
+ return *m_styleResolver;
+
+ return document().ensureStyleResolver();
+}
+
</ins><span class="cx"> PassRefPtr<Node> ShadowRoot::cloneNode(bool, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ec = DATA_CLONE_ERR;
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRooth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.h (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/dom/ShadowRoot.h 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -55,6 +55,8 @@
</span><span class="cx">
</span><span class="cx"> virtual ~ShadowRoot();
</span><span class="cx">
</span><ins>+ StyleResolver& styleResolver();
+
</ins><span class="cx"> bool resetStyleInheritance() const { return m_resetStyleInheritance; }
</span><span class="cx"> void setResetStyleInheritance(bool);
</span><span class="cx">
</span><span class="lines">@@ -99,6 +101,8 @@
</span><span class="cx"> bool m_resetStyleInheritance : 1;
</span><span class="cx"> Type m_type;
</span><span class="cx">
</span><ins>+ std::unique_ptr<StyleResolver> m_styleResolver;
+
</ins><span class="cx"> Element* m_host;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHADOW_DOM)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -1277,7 +1277,7 @@
</span><span class="cx"> static PassRefPtr<MutableStyleProperties> styleFromMatchedRulesForElement(Element* element, unsigned rulesToInclude)
</span><span class="cx"> {
</span><span class="cx"> RefPtr<MutableStyleProperties> style = MutableStyleProperties::create();
</span><del>- auto matchedRules = element->document().ensureStyleResolver().styleRulesForElement(element, rulesToInclude);
</del><ins>+ auto matchedRules = element->styleResolver().styleRulesForElement(element, rulesToInclude);
</ins><span class="cx"> for (unsigned i = 0; i < matchedRules.size(); ++i) {
</span><span class="cx"> if (matchedRules[i]->isStyleRule())
</span><span class="cx"> style->mergeAndOverrideOnConflict(static_pointer_cast<StyleRule>(matchedRules[i])->properties());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLTitleElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLTitleElement.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLTitleElement.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/html/HTMLTitleElement.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> if (RenderStyle* computedStyle = this->computedStyle())
</span><span class="cx"> direction = computedStyle->direction();
</span><span class="cx"> else {
</span><del>- Ref<RenderStyle> style(document().ensureStyleResolver().styleForElement(this, parentElement() ? parentElement()->renderStyle() : nullptr));
</del><ins>+ auto style = resolveStyle(parentElement() ? parentElement()->renderStyle() : nullptr);
</ins><span class="cx"> direction = style.get().direction();
</span><span class="cx"> }
</span><span class="cx"> return StringWithDirection(text(), direction);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -2163,7 +2163,7 @@
</span><span class="cx"> newStyle->fontCascade().update(&document.fontSelector());
</span><span class="cx">
</span><span class="cx"> // Now map the font property longhands into the style.
</span><del>- StyleResolver& styleResolver = canvas()->document().ensureStyleResolver();
</del><ins>+ StyleResolver& styleResolver = canvas()->styleResolver();
</ins><span class="cx"> styleResolver.applyPropertyToStyle(CSSPropertyFontFamily, parsedStyle->getPropertyCSSValue(CSSPropertyFontFamily).get(), &newStyle.get());
</span><span class="cx"> styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontStyle, parsedStyle->getPropertyCSSValue(CSSPropertyFontStyle).get());
</span><span class="cx"> styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontVariant, parsedStyle->getPropertyCSSValue(CSSPropertyFontVariant).get());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorCSSAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/inspector/InspectorCSSAgent.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Matched rules.
</span><del>- StyleResolver& styleResolver = element->document().ensureStyleResolver();
</del><ins>+ StyleResolver& styleResolver = element->styleResolver();
</ins><span class="cx"> auto matchedRules = styleResolver.pseudoStyleRulesForElement(element, elementPseudoId, StyleResolver::AllCSSRules);
</span><span class="cx"> matchedCSSRules = buildArrayForMatchedRuleList(matchedRules, styleResolver, element, elementPseudoId);
</span><span class="cx">
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx"> auto entries = Inspector::Protocol::Array<Inspector::Protocol::CSS::InheritedStyleEntry>::create();
</span><span class="cx"> Element* parentElement = element->parentElement();
</span><span class="cx"> while (parentElement) {
</span><del>- StyleResolver& parentStyleResolver = parentElement->document().ensureStyleResolver();
</del><ins>+ StyleResolver& parentStyleResolver = parentElement->styleResolver();
</ins><span class="cx"> auto parentMatchedRules = parentStyleResolver.styleRulesForElement(parentElement, StyleResolver::AllCSSRules);
</span><span class="cx"> auto entry = Inspector::Protocol::CSS::InheritedStyleEntry::create()
</span><span class="cx"> .setMatchedCSSRules(buildArrayForMatchedRuleList(parentMatchedRules, styleResolver, parentElement, NOPSEUDO))
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationKeyframeAnimationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/page/animation/KeyframeAnimation.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Get the keyframe RenderStyles
</span><span class="cx"> if (m_object && m_object->element())
</span><del>- m_object->document().ensureStyleResolver().keyframeStylesForAnimation(m_object->element(), unanimatedStyle, m_keyframes);
</del><ins>+ m_object->element()->styleResolver().keyframeStylesForAnimation(m_object->element(), unanimatedStyle, m_keyframes);
</ins><span class="cx">
</span><span class="cx"> // Update the m_transformFunctionListValid flag based on whether the function lists in the keyframes match.
</span><span class="cx"> validateTransformFunctionList();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -1537,13 +1537,15 @@
</span><span class="cx"> if (isAnonymous())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ auto& styleResolver = element()->styleResolver();
+
</ins><span class="cx"> if (pseudoStyleRequest.pseudoId == FIRST_LINE_INHERITED) {
</span><del>- RefPtr<RenderStyle> result = document().ensureStyleResolver().styleForElement(element(), parentStyle, DisallowStyleSharing);
</del><ins>+ RefPtr<RenderStyle> result = styleResolver.styleForElement(element(), parentStyle, DisallowStyleSharing);
</ins><span class="cx"> result->setStyleType(FIRST_LINE_INHERITED);
</span><span class="cx"> return result.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return document().ensureStyleResolver().pseudoStyleForElement(element(), pseudoStyleRequest, parentStyle);
</del><ins>+ return styleResolver.pseudoStyleForElement(element(), pseudoStyleRequest, parentStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBlock* RenderElement::containingBlockForFixedPosition() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowFragment.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Region styling doesn't work for pseudo elements.
</span><span class="cx"> if (!isPseudoElement())
</span><del>- customRegionStyle = view().document().ensureStyleResolver().checkRegionStyle(generatingElement());
</del><ins>+ customRegionStyle = generatingElement()->styleResolver().checkRegionStyle(generatingElement());
</ins><span class="cx"> setHasCustomRegionStyle(customRegionStyle);
</span><span class="cx"> downcast<RenderNamedFlowThread>(*m_flowThread).checkRegionsWithStyling();
</span><span class="cx"> }
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> ASSERT(!renderer.isAnonymous());
</span><span class="cx">
</span><span class="cx"> // FIXME: Region styling fails for pseudo-elements because the renderers don't have a node.
</span><del>- RefPtr<RenderStyle> renderObjectRegionStyle = renderer.view().document().ensureStyleResolver().styleForElement(renderer.element(), &parentStyle, DisallowStyleSharing, MatchAllRules, this);
</del><ins>+ RefPtr<RenderStyle> renderObjectRegionStyle = renderer.element()->styleResolver().styleForElement(renderer.element(), &parentStyle, DisallowStyleSharing, MatchAllRules, this);
</ins><span class="cx">
</span><span class="cx"> return renderObjectRegionStyle.release();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> if (RefPtr<RenderStyle> style = element.customStyleForRenderer(inheritedStyle))
</span><span class="cx"> return style.releaseNonNull();
</span><span class="cx"> }
</span><del>- return element.document().ensureStyleResolver().styleForElement(&element, &inheritedStyle);
</del><ins>+ return element.resolveStyle(&inheritedStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -792,9 +792,9 @@
</span><span class="cx"> RefPtr<RenderStyle> SVGElement::customStyleForRenderer(RenderStyle& parentStyle)
</span><span class="cx"> {
</span><span class="cx"> if (!correspondingElement())
</span><del>- return document().ensureStyleResolver().styleForElement(this, &parentStyle);
</del><ins>+ return resolveStyle(&parentStyle);
</ins><span class="cx">
</span><del>- return document().ensureStyleResolver().styleForElement(correspondingElement(), &parentStyle, DisallowStyleSharing);
</del><ins>+ return styleResolver().styleForElement(correspondingElement(), &parentStyle, DisallowStyleSharing);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MutableStyleProperties* SVGElement::animatedSMILStyleProperties() const
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementRareDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElementRareData.h (189986 => 189987)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElementRareData.h 2015-09-18 21:37:17 UTC (rev 189986)
+++ trunk/Source/WebCore/svg/SVGElementRareData.h 2015-09-18 22:25:08 UTC (rev 189987)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> if (!m_overrideComputedStyle || m_needsOverrideComputedStyleUpdate) {
</span><span class="cx"> // The style computed here contains no CSS Animations/Transitions or SMIL induced rules - this is needed to compute the "base value" for the SMIL animation sandwhich model.
</span><del>- m_overrideComputedStyle = element->document().ensureStyleResolver().styleForElement(element, parentStyle, DisallowStyleSharing, MatchAllRulesExcludingSMIL);
</del><ins>+ m_overrideComputedStyle = element->styleResolver().styleForElement(element, parentStyle, DisallowStyleSharing, MatchAllRulesExcludingSMIL);
</ins><span class="cx"> m_needsOverrideComputedStyleUpdate = false;
</span><span class="cx"> }
</span><span class="cx"> ASSERT(m_overrideComputedStyle);
</span></span></pre>
</div>
</div>
</body>
</html>