<!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>[161205] 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/161205">161205</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 01:49:41 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove public attachRenderTree
https://bugs.webkit.org/show_bug.cgi?id=126368
Reviewed by Andreas Kling.
Remove the remaining explicit render tree construction.
* dom/Document.cpp:
(WebCore::Document::createRenderTree):
Use recalcStyle() instead of calling attachRenderTree directly.
* html/HTMLViewSourceDocument.cpp:
(WebCore::HTMLViewSourceDocument::addText):
Remove forgotten attachTextRenderer.
* html/shadow/InsertionPoint.cpp:
(WebCore::InsertionPoint::InsertionPoint):
Remove willAttachRenderers/didAttachRenderers hack.
* html/shadow/InsertionPoint.h:
(WebCore::toInsertionPoint):
* loader/PlaceholderDocument.cpp:
(WebCore::PlaceholderDocument::createRenderTree):
Seriously, nothing to do here.
* style/StyleResolveTree.cpp:
(WebCore::Style::attachDistributedChildren):
(WebCore::Style::attachChildren):
(WebCore::Style::detachDistributedChildren):
(WebCore::Style::detachChildren):
Making attaching and detaching distributed insertion point children part of ResolveTree internals.
* style/StyleResolveTree.h:
Remove interfaces with no clients.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLViewSourceDocumentcpp">trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowInsertionPointcpp">trunk/Source/WebCore/html/shadow/InsertionPoint.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowInsertionPointh">trunk/Source/WebCore/html/shadow/InsertionPoint.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPlaceholderDocumentcpp">trunk/Source/WebCore/loader/PlaceholderDocument.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreecpp">trunk/Source/WebCore/style/StyleResolveTree.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleResolveTreeh">trunk/Source/WebCore/style/StyleResolveTree.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-01-01 Antti Koivisto <antti@apple.com>
+
+ Remove public attachRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=126368
+
+ Reviewed by Andreas Kling.
+
+ Remove the remaining explicit render tree construction.
+
+ * dom/Document.cpp:
+ (WebCore::Document::createRenderTree):
+
+ Use recalcStyle() instead of calling attachRenderTree directly.
+
+ * html/HTMLViewSourceDocument.cpp:
+ (WebCore::HTMLViewSourceDocument::addText):
+
+ Remove forgotten attachTextRenderer.
+
+ * html/shadow/InsertionPoint.cpp:
+ (WebCore::InsertionPoint::InsertionPoint):
+
+ Remove willAttachRenderers/didAttachRenderers hack.
+
+ * html/shadow/InsertionPoint.h:
+ (WebCore::toInsertionPoint):
+ * loader/PlaceholderDocument.cpp:
+ (WebCore::PlaceholderDocument::createRenderTree):
+
+ Seriously, nothing to do here.
+
+ * style/StyleResolveTree.cpp:
+ (WebCore::Style::attachDistributedChildren):
+ (WebCore::Style::attachChildren):
+ (WebCore::Style::detachDistributedChildren):
+ (WebCore::Style::detachChildren):
+
+ Making attaching and detaching distributed insertion point children part of ResolveTree internals.
+
+ * style/StyleResolveTree.h:
+
+ Remove interfaces with no clients.
+
</ins><span class="cx"> 2014-01-01 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove stale ScriptProfiler methods
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -1959,9 +1959,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> recalcStyle(Style::Force);
</span><del>-
- if (m_documentElement)
- Style::attachRenderTree(*m_documentElement);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void pageWheelEventHandlerCountChanged(Page& page)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLViewSourceDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -240,7 +240,6 @@
</span><span class="cx"> }
</span><span class="cx"> RefPtr<Text> text = Text::create(*this, substring);
</span><span class="cx"> m_current->parserAppendChild(text);
</span><del>- Style::attachTextRenderer(*text);
</del><span class="cx"> if (i < size - 1)
</span><span class="cx"> finishLine();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowInsertionPointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/InsertionPoint.cpp (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/html/shadow/InsertionPoint.cpp 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -43,44 +43,12 @@
</span><span class="cx"> : HTMLElement(tagName, document, CreateInsertionPoint)
</span><span class="cx"> , m_hasDistribution(false)
</span><span class="cx"> {
</span><del>- setHasCustomStyleResolveCallbacks();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InsertionPoint::~InsertionPoint()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InsertionPoint::willAttachRenderers()
-{
- if (ShadowRoot* shadowRoot = containingShadowRoot())
- ContentDistributor::ensureDistribution(shadowRoot);
- for (Node* current = firstDistributed(); current; current = nextDistributedTo(current)) {
- if (current->isTextNode()) {
- if (current->renderer())
- continue;
- Style::attachTextRenderer(*toText(current));
- continue;
- }
- if (current->isElementNode()) {
- if (current->renderer())
- Style::detachRenderTree(*toElement(current));
- Style::attachRenderTree(*toElement(current));
- }
- }
-}
-
-void InsertionPoint::willDetachRenderers()
-{
- for (Node* current = firstDistributed(); current; current = nextDistributedTo(current)) {
- if (current->isTextNode()) {
- Style::detachTextRenderer(*toText(current));
- continue;
- }
- if (current->isElementNode())
- Style::detachRenderTree(*toElement(current));
- }
-}
-
</del><span class="cx"> bool InsertionPoint::shouldUseFallbackElements() const
</span><span class="cx"> {
</span><span class="cx"> return isActive() && !hasDistribution();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowInsertionPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/InsertionPoint.h (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/InsertionPoint.h 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/html/shadow/InsertionPoint.h 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -55,9 +55,6 @@
</span><span class="cx">
</span><span class="cx"> virtual MatchType matchTypeFor(Node*) const { return AlwaysMatches; }
</span><span class="cx">
</span><del>- virtual void willAttachRenderers() OVERRIDE;
- virtual void willDetachRenderers() OVERRIDE;
-
</del><span class="cx"> bool shouldUseFallbackElements() const;
</span><span class="cx">
</span><span class="cx"> Node* firstDistributed() const;
</span><span class="lines">@@ -78,17 +75,9 @@
</span><span class="cx"> bool m_hasDistribution;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline InsertionPoint* toInsertionPoint(Node* node)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isInsertionPoint());
- return static_cast<InsertionPoint*>(node);
-}
</del><ins>+inline bool isInsertionPoint(const Node& node) { return node.isInsertionPoint(); }
</ins><span class="cx">
</span><del>-inline const InsertionPoint* toInsertionPoint(const Node* node)
-{
- ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isInsertionPoint());
- return static_cast<const InsertionPoint*>(node);
-}
</del><ins>+NODE_TYPE_CASTS(InsertionPoint);
</ins><span class="cx">
</span><span class="cx"> inline bool isActiveInsertionPoint(const Node* node)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPlaceholderDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PlaceholderDocument.cpp (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/loader/PlaceholderDocument.cpp 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -33,9 +33,6 @@
</span><span class="cx"> void PlaceholderDocument::createRenderTree()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!renderView());
</span><del>-
- for (auto& child : childrenOfType<Element>(*this))
- Style::attachRenderTree(child);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.cpp (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/style/StyleResolveTree.cpp 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "ElementRareData.h"
</span><span class="cx"> #include "ElementTraversal.h"
</span><span class="cx"> #include "FlowThreadController.h"
</span><ins>+#include "InsertionPoint.h"
</ins><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="cx"> #include "NodeRenderingTraversal.h"
</span><span class="cx"> #include "NodeTraversal.h"
</span><span class="lines">@@ -61,6 +62,7 @@
</span><span class="cx"> enum DetachType { NormalDetach, ReattachDetach };
</span><span class="cx">
</span><span class="cx"> static void attachRenderTree(Element&, PassRefPtr<RenderStyle>);
</span><ins>+static void attachTextRenderer(Text&);
</ins><span class="cx"> static void detachRenderTree(Element&, DetachType);
</span><span class="cx">
</span><span class="cx"> Change determineChange(const RenderStyle* s1, const RenderStyle* s2, Settings* settings)
</span><span class="lines">@@ -296,7 +298,7 @@
</span><span class="cx">
</span><span class="cx"> static void reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(Node& current)
</span><span class="cx"> {
</span><del>- if (current.isInsertionPoint())
</del><ins>+ if (isInsertionPoint(current))
</ins><span class="cx"> return;
</span><span class="cx"> // This function finds sibling text renderers where the results of textRendererIsNeeded may have changed as a result of
</span><span class="cx"> // the current node gaining or losing the renderer. This can only affect white space text nodes.
</span><span class="lines">@@ -431,10 +433,32 @@
</span><span class="cx"> textRenderer->setTextWithOffset(textNode.dataImpl(), offsetOfReplacedData, lengthOfReplacedData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void attachDistributedChildren(InsertionPoint& insertionPoint)
+{
+ if (ShadowRoot* shadowRoot = insertionPoint.containingShadowRoot())
+ ContentDistributor::ensureDistribution(shadowRoot);
+ for (Node* current = insertionPoint.firstDistributed(); current; current = insertionPoint.nextDistributedTo(current)) {
+ if (current->isTextNode()) {
+ if (current->renderer())
+ continue;
+ attachTextRenderer(*toText(current));
+ continue;
+ }
+ if (current->isElementNode()) {
+ if (current->renderer())
+ detachRenderTree(*toElement(current));
+ attachRenderTree(*toElement(current), nullptr);
+ }
+ }
+}
+
</ins><span class="cx"> static void attachChildren(ContainerNode& current)
</span><span class="cx"> {
</span><ins>+ if (isInsertionPoint(current))
+ attachDistributedChildren(toInsertionPoint(current));
+
</ins><span class="cx"> for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
</span><del>- ASSERT(!child->renderer() || current.shadowRoot() || current.isInsertionPoint());
</del><ins>+ ASSERT(!child->renderer() || current.shadowRoot() || isInsertionPoint(current));
</ins><span class="cx"> if (child->renderer())
</span><span class="cx"> continue;
</span><span class="cx"> if (child->isTextNode()) {
</span><span class="lines">@@ -549,8 +573,23 @@
</span><span class="cx"> current.didAttachRenderers();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void detachDistributedChildren(InsertionPoint& insertionPoint)
+{
+ for (Node* current = insertionPoint.firstDistributed(); current; current = insertionPoint.nextDistributedTo(current)) {
+ if (current->isTextNode()) {
+ detachTextRenderer(*toText(current));
+ continue;
+ }
+ if (current->isElementNode())
+ detachRenderTree(*toElement(current));
+ }
+}
+
</ins><span class="cx"> static void detachChildren(ContainerNode& current, DetachType detachType)
</span><span class="cx"> {
</span><ins>+ if (isInsertionPoint(current))
+ detachDistributedChildren(toInsertionPoint(current));
+
</ins><span class="cx"> for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
</span><span class="cx"> if (child->isTextNode()) {
</span><span class="cx"> Style::detachTextRenderer(*toText(child));
</span><span class="lines">@@ -875,21 +914,10 @@
</span><span class="cx"> resolveTree(*documentElement, change);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void attachRenderTree(Element& element)
-{
- attachRenderTree(element, nullptr);
- reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(element);
-}
-
</del><span class="cx"> void detachRenderTree(Element& element)
</span><span class="cx"> {
</span><span class="cx"> detachRenderTree(element, NormalDetach);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void detachRenderTreeInReattachMode(Element& element)
-{
- detachRenderTree(element, ReattachDetach);
</del><span class="cx"> }
</span><del>-
</del><span class="cx"> }
</span><del>-}
</del></span></pre></div>
<a id="trunkSourceWebCorestyleStyleResolveTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleResolveTree.h (161204 => 161205)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleResolveTree.h 2014-01-02 06:21:06 UTC (rev 161204)
+++ trunk/Source/WebCore/style/StyleResolveTree.h 2014-01-02 09:49:41 UTC (rev 161205)
</span><span class="lines">@@ -41,12 +41,8 @@
</span><span class="cx"> void resolveTree(Element&, Change);
</span><span class="cx"> void resolveTree(Document&, Change);
</span><span class="cx">
</span><del>-void attachRenderTree(Element&);
</del><span class="cx"> void detachRenderTree(Element&);
</span><del>-// FIXME: This is only used for "lazy reattach" for shadow trees.
-void detachRenderTreeInReattachMode(Element&);
</del><span class="cx">
</span><del>-void attachTextRenderer(Text&);
</del><span class="cx"> void detachTextRenderer(Text&);
</span><span class="cx"> void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>