Title: [197364] trunk/Source/WebCore
Revision
197364
Author
[email protected]
Date
2016-02-29 13:32:28 -0800 (Mon, 29 Feb 2016)

Log Message

Use WTF::Optional for HTMLOListElement::m_start
https://bugs.webkit.org/show_bug.cgi?id=154824

Reviewed by Andreas Kling.

Use WTF::Optional for HTMLOListElement::m_start.

* html/HTMLOListElement.cpp:
(WebCore::HTMLOListElement::parseAttribute):
* html/HTMLOListElement.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (197363 => 197364)


--- trunk/Source/WebCore/ChangeLog	2016-02-29 21:14:51 UTC (rev 197363)
+++ trunk/Source/WebCore/ChangeLog	2016-02-29 21:32:28 UTC (rev 197364)
@@ -1,3 +1,16 @@
+2016-02-29  Chris Dumez  <[email protected]>
+
+        Use WTF::Optional for HTMLOListElement::m_start
+        https://bugs.webkit.org/show_bug.cgi?id=154824
+
+        Reviewed by Andreas Kling.
+
+        Use WTF::Optional for HTMLOListElement::m_start.
+
+        * html/HTMLOListElement.cpp:
+        (WebCore::HTMLOListElement::parseAttribute):
+        * html/HTMLOListElement.h:
+
 2016-02-29  Gavin Barraclough  <[email protected]>
 
         RefCounter<T>::Event -> RefCounterEvent

Modified: trunk/Source/WebCore/html/HTMLOListElement.cpp (197363 => 197364)


--- trunk/Source/WebCore/html/HTMLOListElement.cpp	2016-02-29 21:14:51 UTC (rev 197363)
+++ trunk/Source/WebCore/html/HTMLOListElement.cpp	2016-02-29 21:32:28 UTC (rev 197364)
@@ -35,9 +35,7 @@
 
 HTMLOListElement::HTMLOListElement(const QualifiedName& tagName, Document& document)
     : HTMLElement(tagName, document)
-    , m_start(0xBADBEEF)
     , m_itemCount(0)
-    , m_hasExplicitStart(false)
     , m_isReversed(false)
     , m_shouldRecalculateItemCount(false)
 {
@@ -82,9 +80,11 @@
 {
     if (name == startAttr) {
         int oldStart = start();
-        m_hasExplicitStart = parseHTMLInteger(value, m_start);
-        if (!m_hasExplicitStart)
-            m_start = 0xBADBEEF;
+        int parsedStart;
+        if (parseHTMLInteger(value, parsedStart))
+            m_start = parsedStart;
+        else
+            m_start = Nullopt;
         if (oldStart == start())
             return;
         updateItemValues();

Modified: trunk/Source/WebCore/html/HTMLOListElement.h (197363 => 197364)


--- trunk/Source/WebCore/html/HTMLOListElement.h	2016-02-29 21:14:51 UTC (rev 197363)
+++ trunk/Source/WebCore/html/HTMLOListElement.h	2016-02-29 21:32:28 UTC (rev 197364)
@@ -24,6 +24,7 @@
 #define HTMLOListElement_h
 
 #include "HTMLElement.h"
+#include <wtf/Optional.h>
 
 namespace WebCore {
 
@@ -32,7 +33,7 @@
     static Ref<HTMLOListElement> create(Document&);
     static Ref<HTMLOListElement> create(const QualifiedName&, Document&);
 
-    int start() const { return m_hasExplicitStart ? m_start : (m_isReversed ? itemCount() : 1); }
+    int start() const { return m_start ? m_start.value() : (m_isReversed ? itemCount() : 1); }
     void setStart(int);
 
     bool isReversed() const { return m_isReversed; }
@@ -57,10 +58,9 @@
     virtual bool isPresentationAttribute(const QualifiedName&) const override;
     virtual void collectStyleForPresentationAttribute(const QualifiedName&, const AtomicString&, MutableStyleProperties&) override;
 
-    int m_start;
+    Optional<int> m_start;
     unsigned m_itemCount;
 
-    bool m_hasExplicitStart : 1;
     bool m_isReversed : 1;
     bool m_shouldRecalculateItemCount : 1;
 };
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to