Title: [126824] trunk/Source/WebCore
Revision
126824
Author
[email protected]
Date
2012-08-27 17:14:37 -0700 (Mon, 27 Aug 2012)

Log Message

Rename ContentDistributor::distributeShadowChildrenTo to distributeNodeChildrenTo.
https://bugs.webkit.org/show_bug.cgi?id=95150

Reviewed by Hajime Morita.

Also, made the function take ContainerNode, which decouples it from the callsite's context.

No new tests, simple rename.

* html/shadow/ContentDistributor.cpp:
(WebCore::ContentDistributor::distribute): Changed the callsite.
(WebCore::ContentDistributor::distributeNodeChildrenTo): Renamed from distributeShadowChildrenTo.
* html/shadow/ContentDistributor.h:
(WebCore): Added forward decl for ContainerNode.
(ContentDistributor): Changed the decl name.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (126823 => 126824)


--- trunk/Source/WebCore/ChangeLog	2012-08-28 00:04:06 UTC (rev 126823)
+++ trunk/Source/WebCore/ChangeLog	2012-08-28 00:14:37 UTC (rev 126824)
@@ -1,3 +1,21 @@
+2012-08-27  Dimitri Glazkov  <[email protected]>
+
+        Rename ContentDistributor::distributeShadowChildrenTo to distributeNodeChildrenTo.
+        https://bugs.webkit.org/show_bug.cgi?id=95150
+
+        Reviewed by Hajime Morita.
+
+        Also, made the function take ContainerNode, which decouples it from the callsite's context.
+
+        No new tests, simple rename.
+
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ContentDistributor::distribute): Changed the callsite.
+        (WebCore::ContentDistributor::distributeNodeChildrenTo): Renamed from distributeShadowChildrenTo.
+        * html/shadow/ContentDistributor.h:
+        (WebCore): Added forward decl for ContainerNode.
+        (ContentDistributor): Changed the decl name.
+
 2012-08-27  Adam Barth  <[email protected]>
 
         [V8] Inline V8DOMWindowShell::clearDocumentWrapper

Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.cpp (126823 => 126824)


--- trunk/Source/WebCore/html/shadow/ContentDistributor.cpp	2012-08-28 00:04:06 UTC (rev 126823)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.cpp	2012-08-28 00:14:37 UTC (rev 126824)
@@ -71,7 +71,7 @@
             if (point->doesSelectFromHostChildren())
                 distributeSelectionsTo(point, pool);
             else if (older && !older->assignedTo()) {
-                distributeShadowChildrenTo(point, older);
+                distributeNodeChildrenTo(point, older);
                 older->setAssignedTo(point);
             }
         }
@@ -126,10 +126,10 @@
     insertionPoint->setDistribution(distribution);
 }
 
-void ContentDistributor::distributeShadowChildrenTo(InsertionPoint* insertionPoint, ShadowRoot* root)
+void ContentDistributor::distributeNodeChildrenTo(InsertionPoint* insertionPoint, ContainerNode* containerNode)
 {
     ContentDistribution distribution;
-    for (Node* node = root->firstChild(); node; node = node->nextSibling()) {
+    for (Node* node = containerNode->firstChild(); node; node = node->nextSibling()) {
         distribution.append(node);
         m_nodeToInsertionPoint.add(node, insertionPoint);
     }

Modified: trunk/Source/WebCore/html/shadow/ContentDistributor.h (126823 => 126824)


--- trunk/Source/WebCore/html/shadow/ContentDistributor.h	2012-08-28 00:04:06 UTC (rev 126823)
+++ trunk/Source/WebCore/html/shadow/ContentDistributor.h	2012-08-28 00:14:37 UTC (rev 126824)
@@ -38,6 +38,7 @@
 
 namespace WebCore {
 
+class ContainerNode;
 class Element;
 class InsertionPoint;
 class Node;
@@ -69,7 +70,7 @@
     bool needsInvalidation() const { return m_validity != Invalidated; }
 
     void distributeSelectionsTo(InsertionPoint*, ContentDistribution& pool);
-    void distributeShadowChildrenTo(InsertionPoint*, ShadowRoot*);
+    void distributeNodeChildrenTo(InsertionPoint*, ContainerNode*);
     void invalidateDistributionIn(ContentDistribution*);
 
 private:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to