<!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>[199056] 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/199056">199056</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-05 08:04:02 -0700 (Tue, 05 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Render tree teardown should be iterative
https://bugs.webkit.org/show_bug.cgi?id=156233
Reviewed by Andreas Kling.
* dom/ContainerNode.cpp:
(WebCore::destroyRenderTreeIfNeeded):
(WebCore::ContainerNode::takeAllChildrenFrom):
* dom/Document.cpp:
(WebCore::Document::destroyRenderTree):
* dom/Element.cpp:
(WebCore::disconnectPseudoElement):
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::prepareForDocumentSuspension):
* mathml/MathMLSelectElement.cpp:
(WebCore::MathMLSelectElement::updateSelectedChild):
* style/RenderTreeUpdater.cpp:
(WebCore::RenderTreeUpdater::updateElementRenderer):
(WebCore::RenderTreeUpdater::updateTextRenderer):
(WebCore::RenderTreeUpdater::updateBeforeOrAfterPseudoElement):
(WebCore::RenderTreeUpdater::tearDownRenderers):
Tear down render tree using ComposedTreeIterator for traversal.
(WebCore::RenderTreeUpdater::tearDownRenderer):
* style/RenderTreeUpdater.h:
* style/StyleTreeResolver.cpp:
(WebCore::Style::ensurePlaceholderStyle):
(WebCore::Style::TreeResolver::styleForElement):
(WebCore::Style::resetStyleForNonRenderedDescendants):
(WebCore::Style::affectsRenderedSubtree):
(WebCore::Style::SelectorFilterPusher::SelectorFilterPusher): Deleted.
(WebCore::Style::SelectorFilterPusher::push): Deleted.
(WebCore::Style::SelectorFilterPusher::~SelectorFilterPusher): Deleted.
Unused class.
(WebCore::Style::detachTextRenderer): Deleted.
(WebCore::Style::detachChildren): Deleted.
(WebCore::Style::detachShadowRoot): Deleted.
(WebCore::Style::detachSlotAssignees): Deleted.
(WebCore::Style::detachRenderTree): Deleted.
Remove the old recursive code.
* style/StyleTreeResolver.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoremathmlMathMLSelectElementcpp">trunk/Source/WebCore/mathml/MathMLSelectElement.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdatercpp">trunk/Source/WebCore/style/RenderTreeUpdater.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleRenderTreeUpdaterh">trunk/Source/WebCore/style/RenderTreeUpdater.h</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolvercpp">trunk/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleTreeResolverh">trunk/Source/WebCore/style/StyleTreeResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/ChangeLog 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -1,3 +1,53 @@
</span><ins>+2016-04-05 Antti Koivisto <antti@apple.com>
+
+ Render tree teardown should be iterative
+ https://bugs.webkit.org/show_bug.cgi?id=156233
+
+ Reviewed by Andreas Kling.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::destroyRenderTreeIfNeeded):
+ (WebCore::ContainerNode::takeAllChildrenFrom):
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree):
+ * dom/Element.cpp:
+ (WebCore::disconnectPseudoElement):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::prepareForDocumentSuspension):
+ * mathml/MathMLSelectElement.cpp:
+ (WebCore::MathMLSelectElement::updateSelectedChild):
+ * style/RenderTreeUpdater.cpp:
+ (WebCore::RenderTreeUpdater::updateElementRenderer):
+ (WebCore::RenderTreeUpdater::updateTextRenderer):
+ (WebCore::RenderTreeUpdater::updateBeforeOrAfterPseudoElement):
+ (WebCore::RenderTreeUpdater::tearDownRenderers):
+
+ Tear down render tree using ComposedTreeIterator for traversal.
+
+ (WebCore::RenderTreeUpdater::tearDownRenderer):
+
+ * style/RenderTreeUpdater.h:
+ * style/StyleTreeResolver.cpp:
+ (WebCore::Style::ensurePlaceholderStyle):
+ (WebCore::Style::TreeResolver::styleForElement):
+ (WebCore::Style::resetStyleForNonRenderedDescendants):
+ (WebCore::Style::affectsRenderedSubtree):
+ (WebCore::Style::SelectorFilterPusher::SelectorFilterPusher): Deleted.
+ (WebCore::Style::SelectorFilterPusher::push): Deleted.
+ (WebCore::Style::SelectorFilterPusher::~SelectorFilterPusher): Deleted.
+
+ Unused class.
+
+ (WebCore::Style::detachTextRenderer): Deleted.
+ (WebCore::Style::detachChildren): Deleted.
+ (WebCore::Style::detachShadowRoot): Deleted.
+ (WebCore::Style::detachSlotAssignees): Deleted.
+ (WebCore::Style::detachRenderTree): Deleted.
+
+ Remove the old recursive code.
+
+ * style/StyleTreeResolver.h:
+
</ins><span class="cx"> 2016-04-05 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL2] Allow enabling WebGL2 with a runtime flag
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> #include "RadioNodeList.h"
</span><span class="cx"> #include "RenderBox.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><ins>+#include "RenderTreeUpdater.h"
</ins><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "RootInlineBox.h"
</span><span class="cx"> #include "SVGDocumentExtensions.h"
</span><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><span class="cx"> #include "SelectorQuery.h"
</span><del>-#include "StyleTreeResolver.h"
</del><span class="cx"> #include "TemplateContentDocumentFragment.h"
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="lines">@@ -103,9 +103,9 @@
</span><span class="cx"> if (!child.renderer() && !child.isNamedFlowContentNode() && !is<HTMLSlotElement>(child))
</span><span class="cx"> return;
</span><span class="cx"> if (is<Element>(child))
</span><del>- Style::detachRenderTree(downcast<Element>(child));
</del><ins>+ RenderTreeUpdater::tearDownRenderers(downcast<Element>(child));
</ins><span class="cx"> else if (is<Text>(child))
</span><del>- Style::detachTextRenderer(downcast<Text>(child));
</del><ins>+ RenderTreeUpdater::tearDownRenderer(downcast<Text>(child));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContainerNode::takeAllChildrenFrom(ContainerNode* oldParent)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -2353,7 +2353,7 @@
</span><span class="cx"> m_activeElement = nullptr;
</span><span class="cx">
</span><span class="cx"> if (m_documentElement)
</span><del>- Style::detachRenderTree(*m_documentElement);
</del><ins>+ RenderTreeUpdater::tearDownRenderers(*m_documentElement);
</ins><span class="cx">
</span><span class="cx"> clearChildNeedsStyleRecalc();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><ins>+#include "RenderTreeUpdater.h"
</ins><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="cx"> #include "SVGDocumentExtensions.h"
</span><span class="lines">@@ -2703,7 +2704,7 @@
</span><span class="cx"> if (!pseudoElement)
</span><span class="cx"> return;
</span><span class="cx"> if (pseudoElement->renderer())
</span><del>- Style::detachRenderTree(*pseudoElement);
</del><ins>+ RenderTreeUpdater::tearDownRenderers(*pseudoElement);
</ins><span class="cx"> ASSERT(pseudoElement->hostElement());
</span><span class="cx"> pseudoElement->clearHostElement();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "RenderEmbeddedObject.h"
</span><span class="cx"> #include "RenderImage.h"
</span><span class="cx"> #include "RenderSnapshottedPlugIn.h"
</span><ins>+#include "RenderTreeUpdater.h"
</ins><span class="cx"> #include "SchemeRegistry.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="lines">@@ -322,7 +323,7 @@
</span><span class="cx"> void HTMLPlugInImageElement::prepareForDocumentSuspension()
</span><span class="cx"> {
</span><span class="cx"> if (renderer())
</span><del>- Style::detachRenderTree(*this);
</del><ins>+ RenderTreeUpdater::tearDownRenderers(*this);
</ins><span class="cx">
</span><span class="cx"> HTMLPlugInElement::prepareForDocumentSuspension();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoremathmlMathMLSelectElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/mathml/MathMLSelectElement.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/mathml/MathMLSelectElement.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/mathml/MathMLSelectElement.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -33,9 +33,9 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "MathMLNames.h"
</span><span class="cx"> #include "RenderMathMLRow.h"
</span><ins>+#include "RenderTreeUpdater.h"
</ins><span class="cx"> #include "SVGElement.h"
</span><span class="cx"> #include "SVGNames.h"
</span><del>-#include "StyleTreeResolver.h"
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_selectedChild && m_selectedChild->renderer())
</span><del>- Style::detachRenderTree(*m_selectedChild);
</del><ins>+ RenderTreeUpdater::tearDownRenderers(*m_selectedChild);
</ins><span class="cx">
</span><span class="cx"> m_selectedChild = newSelectedChild;
</span><span class="cx"> setNeedsStyleRecalc();
</span></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdatercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> {
</span><span class="cx"> bool shouldTearDownRenderers = update.change == Style::Detach && (element.renderer() || element.isNamedFlowContentNode());
</span><span class="cx"> if (shouldTearDownRenderers)
</span><del>- detachRenderTree(element, Style::ReattachDetach);
</del><ins>+ tearDownRenderers(element, TeardownType::KeepHoverAndActive);
</ins><span class="cx">
</span><span class="cx"> bool shouldCreateNewRenderer = !element.renderer() && update.style && !hasImplicitDisplayContents(element);
</span><span class="cx"> if (shouldCreateNewRenderer) {
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> if (hasRenderer) {
</span><span class="cx"> if (needsRenderer)
</span><span class="cx"> return;
</span><del>- Style::detachTextRenderer(text);
</del><ins>+ tearDownRenderer(text);
</ins><span class="cx"> invalidateWhitespaceOnlyTextSiblingsAfterAttachIfNeeded(text);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -506,4 +506,59 @@
</span><span class="cx"> pseudoElement->didRecalcStyle(elementUpdate.change);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderTreeUpdater::tearDownRenderers(Element& root, TeardownType teardownType)
+{
+ WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
+
+ Vector<Element*, 30> teardownStack;
+
+ auto push = [&] (Element& element) {
+ if (element.hasCustomStyleResolveCallbacks())
+ element.willDetachRenderers();
+ if (teardownType != TeardownType::KeepHoverAndActive)
+ element.clearHoverAndActiveStatusBeforeDetachingRenderer();
+ element.clearStyleDerivedDataBeforeDetachingRenderer();
+
+ teardownStack.append(&element);
+ };
+
+ auto pop = [&] (unsigned depth) {
+ while (teardownStack.size() > depth) {
+ auto& element = *teardownStack.takeLast();
+
+ if (auto* renderer = element.renderer()) {
+ renderer->destroyAndCleanupAnonymousWrappers();
+ element.setRenderer(nullptr);
+ }
+ if (element.hasCustomStyleResolveCallbacks())
+ element.didDetachRenderers();
+ }
+ };
+
+ push(root);
+
+ auto descendants = composedTreeDescendants(root);
+ for (auto it = descendants.begin(), end = descendants.end(); it != end; ++it) {
+ pop(it.depth());
+
+ if (is<Text>(*it)) {
+ tearDownRenderer(downcast<Text>(*it));
+ continue;
+ }
+
+ push(downcast<Element>(*it));
+ }
+
+ pop(0);
</ins><span class="cx"> }
</span><ins>+
+void RenderTreeUpdater::tearDownRenderer(Text& text)
+{
+ auto* renderer = text.renderer();
+ if (!renderer)
+ return;
+ renderer->destroyAndCleanupAnonymousWrappers();
+ text.setRenderer(nullptr);
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorestyleRenderTreeUpdaterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/RenderTreeUpdater.h (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/RenderTreeUpdater.h 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/style/RenderTreeUpdater.h 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx">
</span><span class="cx"> void commit(std::unique_ptr<const Style::Update>);
</span><span class="cx">
</span><ins>+ enum class TeardownType { Normal, KeepHoverAndActive };
+ static void tearDownRenderers(Element&, TeardownType = TeardownType::Normal);
+ static void tearDownRenderer(Text&);
+
</ins><span class="cx"> private:
</span><span class="cx"> void updateRenderTree(ContainerNode& root);
</span><span class="cx"> void updateTextRenderer(Text&);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.cpp (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/style/StyleTreeResolver.cpp 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -50,37 +50,6 @@
</span><span class="cx">
</span><span class="cx"> namespace Style {
</span><span class="cx">
</span><del>-class SelectorFilterPusher {
-public:
- enum PushMode { Push, NoPush };
- SelectorFilterPusher(SelectorFilter& selectorFilter, Element& parent, PushMode pushMode = Push)
- : m_selectorFilter(selectorFilter)
- , m_parent(parent)
- {
- if (pushMode == Push)
- push();
- }
- void push()
- {
- if (m_didPush)
- return;
- m_didPush = true;
- m_selectorFilter.pushParent(&m_parent);
- }
- ~SelectorFilterPusher()
- {
- if (!m_didPush)
- return;
- m_selectorFilter.popParent();
- }
-
-private:
- SelectorFilter& m_selectorFilter;
- Element& m_parent;
- bool m_didPush { false };
-};
-
-
</del><span class="cx"> static RenderStyle* placeholderStyle;
</span><span class="cx">
</span><span class="cx"> static void ensurePlaceholderStyle(Document& document)
</span><span class="lines">@@ -176,13 +145,6 @@
</span><span class="cx"> return WTFMove(elementStyle.renderStyle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void detachTextRenderer(Text& textNode)
-{
- if (textNode.renderer())
- textNode.renderer()->destroyAndCleanupAnonymousWrappers();
- textNode.setRenderer(0);
-}
-
</del><span class="cx"> static void resetStyleForNonRenderedDescendants(Element& current)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This is not correct with shadow trees. This should be done with ComposedTreeIterator.
</span><span class="lines">@@ -204,72 +166,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void detachChildren(ContainerNode& current, DetachType detachType)
-{
- for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
- if (is<Text>(*child))
- detachTextRenderer(downcast<Text>(*child));
- else if (is<Element>(*child))
- detachRenderTree(downcast<Element>(*child), detachType);
- }
- current.clearChildNeedsStyleRecalc();
-}
-
-static void detachShadowRoot(ShadowRoot& shadowRoot, DetachType detachType)
-{
- detachChildren(shadowRoot, detachType);
-}
-
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
-static void detachSlotAssignees(HTMLSlotElement& slot, DetachType detachType)
-{
- ASSERT(!slot.renderer());
- if (auto* assignedNodes = slot.assignedNodes()) {
- for (auto* child : *assignedNodes) {
- if (is<Text>(*child))
- detachTextRenderer(downcast<Text>(*child));
- else if (is<Element>(*child))
- detachRenderTree(downcast<Element>(*child), detachType);
- }
- } else
- detachChildren(slot, detachType);
-
- slot.clearNeedsStyleRecalc();
- slot.clearChildNeedsStyleRecalc();
-}
-#endif
-
-void detachRenderTree(Element& current, DetachType detachType)
-{
- WidgetHierarchyUpdatesSuspensionScope suspendWidgetHierarchyUpdates;
-
- if (current.hasCustomStyleResolveCallbacks())
- current.willDetachRenderers();
-
- current.clearStyleDerivedDataBeforeDetachingRenderer();
-
- // Do not remove the element's hovered and active status
- // if performing a reattach.
- if (detachType != ReattachDetach)
- current.clearHoverAndActiveStatusBeforeDetachingRenderer();
-
-#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
- if (is<HTMLSlotElement>(current))
- detachSlotAssignees(downcast<HTMLSlotElement>(current), detachType);
-#endif
- else if (ShadowRoot* shadowRoot = current.shadowRoot())
- detachShadowRoot(*shadowRoot, detachType);
-
- detachChildren(current, detachType);
-
- if (current.renderer())
- current.renderer()->destroyAndCleanupAnonymousWrappers();
- current.setRenderer(nullptr);
-
- if (current.hasCustomStyleResolveCallbacks())
- current.didDetachRenderers();
-}
-
</del><span class="cx"> static bool affectsRenderedSubtree(Element& element, const RenderStyle& newStyle)
</span><span class="cx"> {
</span><span class="cx"> if (element.renderer())
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleTreeResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleTreeResolver.h (199055 => 199056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleTreeResolver.h 2016-04-05 11:22:17 UTC (rev 199055)
+++ trunk/Source/WebCore/style/StyleTreeResolver.h 2016-04-05 15:04:02 UTC (rev 199056)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -108,10 +108,6 @@
</span><span class="cx"> std::unique_ptr<Update> m_update;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum DetachType { NormalDetach, ReattachDetach };
-void detachRenderTree(Element&, DetachType = NormalDetach);
-void detachTextRenderer(Text&);
-
</del><span class="cx"> void queuePostResolutionCallback(std::function<void ()>);
</span><span class="cx"> bool postResolutionCallbacksAreSuspended();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>