Changeset 137119 in webkit

Timestamp:

Dec 10, 2012 1:03:06 AM (11 years ago)

Author:

morrita@google.com

Message:

[Shadow DOM][Refacdtoring] nextTo() and previousTo() can be part of ContentDistribution
​https://bugs.webkit.org/show_bug.cgi?id=104514

Reviewed by Kentaro Hara.

InsertionPoint::nextTo() and InsertionPoint::previousTo() are an
query to distributed nodes, which is what ContentDistribution
represents. We can move them to better home.

No new tests. No behavior change.

• html/shadow/ContentDistributor.cpp:

(WebCore::ContentDistribution::nextTo): Moved from InsertionPoint
(WebCore):
(WebCore::ContentDistribution::previousTo): Moved from InsertionPoint

• html/shadow/ContentDistributor.h:

(ContentDistribution):

• html/shadow/InsertionPoint.cpp:
• html/shadow/InsertionPoint.h:

(WebCore::InsertionPoint::nextTo): Delegated to ContentDistribution
(WebCore::InsertionPoint::previousTo): Delegated to ContentDistribution

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/shadow/ContentDistributor.cpp (modified) (1 diff)
• html/shadow/ContentDistributor.h (modified) (1 diff)
• html/shadow/InsertionPoint.cpp (modified) (1 diff)
• html/shadow/InsertionPoint.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-10  Hajime Morrita  <morrita@google.com>
+
+        [Shadow DOM][Refacdtoring] nextTo() and previousTo() can be part of ContentDistribution
+        https://bugs.webkit.org/show_bug.cgi?id=104514
+
+        Reviewed by Kentaro Hara.
+
+        InsertionPoint::nextTo() and InsertionPoint::previousTo() are an
+        query to distributed nodes, which is what ContentDistribution
+        represents. We can move them to better home.
+
+        No new tests. No behavior change.
+
+        * html/shadow/ContentDistributor.cpp:
+        (WebCore::ContentDistribution::nextTo): Moved from InsertionPoint
+        (WebCore):
+        (WebCore::ContentDistribution::previousTo): Moved from InsertionPoint
+        * html/shadow/ContentDistributor.h:
+        (ContentDistribution):
+        * html/shadow/InsertionPoint.cpp:
+        * html/shadow/InsertionPoint.h:
+        (WebCore::InsertionPoint::nextTo): Delegated to ContentDistribution
+        (WebCore::InsertionPoint::previousTo): Delegated to ContentDistribution
+
 2012-12-10  Joanmarie Diggs  <jdiggs@igalia.com>
 

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

@@ -59 +59 @@
 }
 
+Node* ContentDistribution::nextTo(const Node* node) const
+{
+    size_t index = find(node);
+    if (index == notFound || index + 1 == size())
+        return 0;
+    return at(index + 1).get();
+}
+
+Node* ContentDistribution::previousTo(const Node* node) const
+{
+    size_t index = find(node);
+    if (index == notFound || !index)
+        return 0;
+    return at(index - 1).get();
+}
+
+
 ShadowRootContentDistributionData::ShadowRootContentDistributionData()
     : m_insertionPointAssignedTo(0)

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

@@ -59 +59 @@
     bool contains(const Node* node) const { return m_indices.contains(node); }
     size_t find(const Node*) const;
+    Node* nextTo(const Node*) const;
+    Node* previousTo(const Node*) const;
 
     void swap(ContentDistribution& other);

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

@@ -113 +113 @@
 }
 
-Node* InsertionPoint::nextTo(const Node* node) const
-{
-    size_t index = m_distribution.find(node);
-    if (index == notFound || index + 1 == m_distribution.size())
-        return 0;
-    return m_distribution.at(index + 1).get();
-}
-
-Node* InsertionPoint::previousTo(const Node* node) const
-{
-    size_t index = m_distribution.find(node);
-    if (index == notFound || !index)
-        return 0;
-    return m_distribution.at(index - 1).get();
-}
-
 void InsertionPoint::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
 {

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

@@ -72 +72 @@
     Node* first() const { return m_distribution.isEmpty() ? 0 : m_distribution.first().get(); }
     Node* last() const { return m_distribution.isEmpty() ? 0 : m_distribution.last().get(); }
-    Node* nextTo(const Node*) const;
-    Node* previousTo(const Node*) const;
+    Node* nextTo(const Node* node) const { return m_distribution.nextTo(node); }
+    Node* previousTo(const Node* node) const { return m_distribution.previousTo(node); }
 
 protected: