Changeset 161205 in webkit

Timestamp:

Jan 2, 2014, 1:49:41 AM (11 years ago)

Author:

Antti Koivisto

Message:

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.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• html/HTMLViewSourceDocument.cpp (modified) (1 diff)
• html/shadow/InsertionPoint.cpp (modified) (1 diff)
• html/shadow/InsertionPoint.h (modified) (2 diffs)
• loader/PlaceholderDocument.cpp (modified) (1 diff)
• style/StyleResolveTree.cpp (modified) (7 diffs)
• style/StyleResolveTree.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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.
+
 2014-01-01  Seokju Kwon  <seokju@webkit.org>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1960 +1960 @@
 
     recalcStyle(Style::Force);
-
-    if (m_documentElement)
-        Style::attachRenderTree(*m_documentElement);
 }
 

trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp

@@ -241 +241 @@
         RefPtr<Text> text = Text::create(*this, substring);
         m_current->parserAppendChild(text);
-        Style::attachTextRenderer(*text);
         if (i < size - 1)
             finishLine();

trunk/Source/WebCore/html/shadow/InsertionPoint.cpp

@@ -44 +44 @@
     , m_hasDistribution(false)
 {
-    setHasCustomStyleResolveCallbacks();
 }
 
 InsertionPoint::~InsertionPoint()
 {
-}
-
-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));
-    }
 }
 

trunk/Source/WebCore/html/shadow/InsertionPoint.h

@@ -56 +56 @@
     virtual MatchType matchTypeFor(Node*) const { return AlwaysMatches; }
 
-    virtual void willAttachRenderers() OVERRIDE;
-    virtual void willDetachRenderers() OVERRIDE;
-
     bool shouldUseFallbackElements() const;
 
@@ -79 +76 @@
 };
 
-inline InsertionPoint* toInsertionPoint(Node* node)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isInsertionPoint());
-    return static_cast<InsertionPoint*>(node);
-}
+inline bool isInsertionPoint(const Node& node) { return node.isInsertionPoint(); }
 
-inline const InsertionPoint* toInsertionPoint(const Node* node)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!node || node->isInsertionPoint());
-    return static_cast<const InsertionPoint*>(node);
-}
+NODE_TYPE_CASTS(InsertionPoint);
 
 inline bool isActiveInsertionPoint(const Node* node)

trunk/Source/WebCore/loader/PlaceholderDocument.cpp

@@ -34 +34 @@
 {
     ASSERT(!renderView());
-
-    for (auto& child : childrenOfType<Element>(*this))
-        Style::attachRenderTree(child);
 }
 

trunk/Source/WebCore/style/StyleResolveTree.cpp

@@ -35 +35 @@
 #include "ElementTraversal.h"
 #include "FlowThreadController.h"
+#include "InsertionPoint.h"
 #include "NodeRenderStyle.h"
 #include "NodeRenderingTraversal.h"
@@ -62 +63 @@
 
 static void attachRenderTree(Element&, PassRefPtr<RenderStyle>);
+static void attachTextRenderer(Text&);
 static void detachRenderTree(Element&, DetachType);
 
@@ -297 +299 @@
 static void reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(Node& current)
 {
-    if (current.isInsertionPoint())
+    if (isInsertionPoint(current))
         return;
     // This function finds sibling text renderers where the results of textRendererIsNeeded may have changed as a result of
@@ -432 +434 @@
 }
 
+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);
+        }
+    }
+}
+
 static void attachChildren(ContainerNode& current)
 {
+    if (isInsertionPoint(current))
+        attachDistributedChildren(toInsertionPoint(current));
+
     for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
-        ASSERT(!child->renderer() || current.shadowRoot() || current.isInsertionPoint());
+        ASSERT(!child->renderer() || current.shadowRoot() || isInsertionPoint(current));
         if (child->renderer())
             continue;
@@ -550 +574 @@
 }
 
+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));
+    }
+}
+
 static void detachChildren(ContainerNode& current, DetachType detachType)
 {
+    if (isInsertionPoint(current))
+        detachDistributedChildren(toInsertionPoint(current));
+
     for (Node* child = current.firstChild(); child; child = child->nextSibling()) {
         if (child->isTextNode()) {
@@ -876 +915 @@
 }
 
-void attachRenderTree(Element& element)
-{
-    attachRenderTree(element, nullptr);
-    reattachTextRenderersForWhitespaceOnlySiblingsAfterAttachIfNeeded(element);
-}
-
 void detachRenderTree(Element& element)
 {
@@ -887 +920 @@
 }
 
-void detachRenderTreeInReattachMode(Element& element)
-{
-    detachRenderTree(element, ReattachDetach);
-}
-
-}
-}
+}
+}

trunk/Source/WebCore/style/StyleResolveTree.h

@@ -42 +42 @@
 void resolveTree(Document&, Change);
 
-void attachRenderTree(Element&);
 void detachRenderTree(Element&);
-// FIXME: This is only used for "lazy reattach" for shadow trees.
-void detachRenderTreeInReattachMode(Element&);
 
-void attachTextRenderer(Text&);
 void detachTextRenderer(Text&);
 void updateTextRendererAfterContentChange(Text&, unsigned offsetOfReplacedData, unsigned lengthOfReplacedData);