Changeset 149405 in webkit

Timestamp:

Apr 30, 2013 3:23:29 PM (11 years ago)

Author:

abucur@adobe.com

Message:

Cleanup HTMLOListElement<->RenderListItem bridge
​https://bugs.webkit.org/show_bug.cgi?id=115434

Reviewed by Darin Adler.

Refactor the way HTMLOListElement is accessing its list items. Instead
of exposing the nextListItem function, wrap the desiredfunctionality
in static methods on RenderListItem. This should make the code more readable.
I've also added more constness to some functions in RenderListItem.

Tests: No new tests, just refactoring.

• html/HTMLOListElement.cpp:

(WebCore::HTMLOListElement::updateItemValues): Use updateItemValuesForOrderedList.
(WebCore::HTMLOListElement::recalculateItemCount): Use itemCountForOrderedList.

• rendering/RenderListItem.cpp:

(WebCore::isList): Add more constness.
(WebCore::nextListItem): Make local to the CPP and add constness.
(WebCore::previousListItem): Add constness.
(WebCore::RenderListItem::updateItemValuesForOrderedList): Called by OL elements.
(WebCore::RenderListItem::itemCountForOrderedList): Called by OL elements.
(WebCore::previousOrNextItem):

• rendering/RenderListItem.h: Add updateItemValuesForOrderedList and itemCountForOrderedList.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLOListElement.cpp (modified) (1 diff)
• rendering/RenderListItem.cpp (modified) (5 diffs)
• rendering/RenderListItem.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-30  Andrei Bucur  <abucur@adobe.com>
+
+        Cleanup HTMLOListElement<->RenderListItem bridge
+        https://bugs.webkit.org/show_bug.cgi?id=115434
+
+        Reviewed by Darin Adler.
+
+        Refactor the way HTMLOListElement is accessing its list items. Instead
+        of exposing the nextListItem function, wrap the desiredfunctionality
+        in static methods on RenderListItem. This should make the code more readable.
+        I've also added more constness to some functions in RenderListItem.
+
+        Tests: No new tests, just refactoring.
+
+        * html/HTMLOListElement.cpp:
+        (WebCore::HTMLOListElement::updateItemValues): Use updateItemValuesForOrderedList.
+        (WebCore::HTMLOListElement::recalculateItemCount): Use itemCountForOrderedList.
+        * rendering/RenderListItem.cpp:
+        (WebCore::isList): Add more constness.
+        (WebCore::nextListItem): Make local to the CPP and add constness.
+        (WebCore::previousListItem): Add constness.
+        (WebCore::RenderListItem::updateItemValuesForOrderedList): Called by OL elements.
+        (WebCore::RenderListItem::itemCountForOrderedList): Called by OL elements.
+        (WebCore::previousOrNextItem):
+        * rendering/RenderListItem.h: Add updateItemValuesForOrderedList and itemCountForOrderedList.
+
 2013-04-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/html/HTMLOListElement.cpp

@@ -107 +107 @@
 void HTMLOListElement::updateItemValues()
 {
-    for (RenderListItem* listItem = RenderListItem::nextListItem(this); listItem; listItem = RenderListItem::nextListItem(this, listItem))
-        listItem->updateValue();
+    RenderListItem::updateItemValuesForOrderedList(this);
 }
 
 void HTMLOListElement::recalculateItemCount()
 {
-    m_itemCount = 0;
-
-    for (RenderListItem* listItem = RenderListItem::nextListItem(this); listItem; listItem = RenderListItem::nextListItem(this, listItem))
-        m_itemCount++;
-
+    m_itemCount = RenderListItem::itemCountForOrderedList(this);
     m_shouldRecalculateItemCount = false;
 }

trunk/Source/WebCore/rendering/RenderListItem.cpp

@@ -93 +93 @@
 }
 
-static bool isList(Node* node)
+static bool isList(const Node* node)
 {
     return (node->hasTagName(ulTag) || node->hasTagName(olTag));
@@ -118 +118 @@
 
 // Returns the next list item with respect to the DOM order.
-RenderListItem* RenderListItem::nextListItem(Node* listNode, const RenderListItem* item)
+static RenderListItem* nextListItem(const Node* listNode, const RenderListItem* item = 0)
 {
     if (!listNode)
         return 0;
 
-    Node* current = item ? item->node() : listNode;
+    const Node* current = item ? item->node() : listNode;
     current = ElementTraversal::nextIncludingPseudo(current, listNode);
 
@@ -145 +145 @@
 
 // Returns the previous list item with respect to the DOM order.
-static RenderListItem* previousListItem(Node* listNode, const RenderListItem* item)
+static RenderListItem* previousListItem(const Node* listNode, const RenderListItem* item)
 {
     Node* current = item->node();
@@ -164 +164 @@
     }
     return 0;
+}
+
+void RenderListItem::updateItemValuesForOrderedList(const HTMLOListElement* listNode)
+{
+    ASSERT(listNode);
+
+    for (RenderListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
+        listItem->updateValue();
+}
+
+unsigned RenderListItem::itemCountForOrderedList(const HTMLOListElement* listNode)
+{
+    ASSERT(listNode);
+
+    unsigned itemCount = 0;
+    for (RenderListItem* listItem = nextListItem(listNode); listItem; listItem = nextListItem(listNode, listItem))
+        itemCount++;
+
+    return itemCount;
 }
 
@@ -465 +484 @@
 static RenderListItem* previousOrNextItem(bool isListReversed, Node* list, RenderListItem* item)
 {
-    return isListReversed ? previousListItem(list, item) : RenderListItem::nextListItem(list, item);
+    return isListReversed ? previousListItem(list, item) : nextListItem(list, item);
 }
 

trunk/Source/WebCore/rendering/RenderListItem.h

@@ -28 +28 @@
 namespace WebCore {
 
+class HTMLOListElement;
 class RenderListMarker;
 
@@ -50 +51 @@
     void updateListMarkerNumbers();
 
-    static RenderListItem* nextListItem(Node*, const RenderListItem* = 0);
+    static void updateItemValuesForOrderedList(const HTMLOListElement*);
+    static unsigned itemCountForOrderedList(const HTMLOListElement*);
 
 private: