Changeset 205806 in webkit

Timestamp:

Sep 12, 2016 2:28:52 AM (8 years ago)

Author:

Chris Dumez

Message:

ol.start may return incorrect value for reversed lists when not explicitly set
​https://bugs.webkit.org/show_bug.cgi?id=161713

Reviewed by Ryosuke Niwa.

Fix style nit after r205689.

• html/HTMLOListElement.cpp:

(WebCore::HTMLOListElement::itemCount):
(WebCore::HTMLOListElement::itemCountAfterLayout):

• html/HTMLOListElement.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-12  Chris Dumez  <cdumez@apple.com>
+
+        ol.start may return incorrect value for reversed lists when not explicitly set
+        https://bugs.webkit.org/show_bug.cgi?id=161713
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix style nit after r205689.
+
+        * html/HTMLOListElement.cpp:
+        (WebCore::HTMLOListElement::itemCount):
+        (WebCore::HTMLOListElement::itemCountAfterLayout):
+        * html/HTMLOListElement.h:
+
 2016-09-12  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/html/HTMLOListElement.cpp

@@ -105 +105 @@
 }
 
-unsigned HTMLOListElement::itemCount(ShouldLayout shouldLayout) const
+unsigned HTMLOListElement::itemCount() const
 {
-    if (shouldLayout == ShouldLayout::Yes)
-        document().updateLayoutIgnorePendingStylesheets();
-
     if (m_shouldRecalculateItemCount)
         const_cast<HTMLOListElement*>(this)->recalculateItemCount();
     return m_itemCount;
+}
+
+unsigned HTMLOListElement::itemCountAfterLayout() const
+{
+    document().updateLayoutIgnorePendingStylesheets();
+
+    return itemCount();
 }
 

trunk/Source/WebCore/html/HTMLOListElement.h

@@ -36 +36 @@
     // from rendering code and this is unfortunately one of the few cases where the render tree is mutated
     // while in layout.
-    int start() const { return m_start ? m_start.value() : (m_isReversed ? itemCount(ShouldLayout::No) : 1); }
-    int startForBindings() const { return m_start ? m_start.value() : (m_isReversed ? itemCount(ShouldLayout::Yes) : 1); }
+    int start() const { return m_start ? m_start.value() : (m_isReversed ? itemCount() : 1); }
+    int startForBindings() const { return m_start ? m_start.value() : (m_isReversed ? itemCountAfterLayout() : 1); }
 
     WEBCORE_EXPORT void setStartForBindings(int);
@@ -50 +50 @@
     void updateItemValues();
 
-    enum class ShouldLayout { No, Yes };
-    WEBCORE_EXPORT unsigned itemCount(ShouldLayout) const;
+    WEBCORE_EXPORT unsigned itemCountAfterLayout() const;
+    WEBCORE_EXPORT unsigned itemCount() const;
 
     WEBCORE_EXPORT void recalculateItemCount();