Changeset 264501 in webkit

Timestamp:

Jul 16, 2020, 11:39:08 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Make DocumentParser.ParserState an enum class
​https://bugs.webkit.org/show_bug.cgi?id=214416

Patch by Rob Buis <​rbuis@igalia.com> on 2020-07-16
Reviewed by Darin Adler.

Make DocumentParser.ParserState an enum class since it is more readable.

• dom/DocumentParser.cpp:

(WebCore::DocumentParser::DocumentParser):
(WebCore::DocumentParser::startParsing):
(WebCore::DocumentParser::prepareToStopParsing):
(WebCore::DocumentParser::stopParsing):
(WebCore::DocumentParser::detach):

• dom/DocumentParser.h:

(WebCore::DocumentParser::isParsing const):
(WebCore::DocumentParser::isStopping const):
(WebCore::DocumentParser::isStopped const):
(WebCore::DocumentParser::isDetached const):
(): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DocumentParser.cpp (modified) (2 diffs)
• dom/DocumentParser.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-16  Rob Buis  <rbuis@igalia.com>
+
+        Make DocumentParser.ParserState an enum class
+        https://bugs.webkit.org/show_bug.cgi?id=214416
+
+        Reviewed by Darin Adler.
+
+        Make DocumentParser.ParserState an enum class since it is more readable.
+
+        * dom/DocumentParser.cpp:
+        (WebCore::DocumentParser::DocumentParser):
+        (WebCore::DocumentParser::startParsing):
+        (WebCore::DocumentParser::prepareToStopParsing):
+        (WebCore::DocumentParser::stopParsing):
+        (WebCore::DocumentParser::detach):
+        * dom/DocumentParser.h:
+        (WebCore::DocumentParser::isParsing const):
+        (WebCore::DocumentParser::isStopping const):
+        (WebCore::DocumentParser::isStopped const):
+        (WebCore::DocumentParser::isDetached const):
+        (): Deleted.
+
 2020-07-16  Xabier Rodriguez Calvar  <calvaris@igalia.com>
 

trunk/Source/WebCore/dom/DocumentParser.cpp

@@ -33 +33 @@
 
 DocumentParser::DocumentParser(Document& document)
-    : m_state(ParsingState)
+    : m_state(ParserState::Parsing)
     , m_documentWasLoadedAsPartOfNavigation(false)
     , m_document(makeWeakPtr(document))
@@ -49 +49 @@
 void DocumentParser::startParsing()
 {
-    m_state = ParsingState;
+    m_state = ParserState::Parsing;
 }
 
 void DocumentParser::prepareToStopParsing()
 {
-    ASSERT(m_state == ParsingState);
-    m_state = StoppingState;
+    ASSERT(m_state == ParserState::Parsing);
+    m_state = ParserState::Stopping;
 }
 
 void DocumentParser::stopParsing()
 {
-    m_state = StoppedState;
+    m_state = ParserState::Stopped;
 }
 
 void DocumentParser::detach()
 {
-    m_state = DetachedState;
+    m_state = ParserState::Detached;
     m_document = nullptr;
 }

trunk/Source/WebCore/dom/DocumentParser.h

@@ -66 +66 @@
     Document* document() const { ASSERT(m_document); return m_document.get(); }
 
-    bool isParsing() const { return m_state == ParsingState; }
-    bool isStopping() const { return m_state == StoppingState; }
-    bool isStopped() const { return m_state >= StoppedState; }
-    bool isDetached() const { return m_state == DetachedState; }
+    bool isParsing() const { return m_state == ParserState::Parsing; }
+    bool isStopping() const { return m_state == ParserState::Stopping; }
+    bool isStopped() const { return m_state >= ParserState::Stopped; }
+    bool isDetached() const { return m_state == ParserState::Detached; }
 
     // FIXME: Is this necessary? Does XMLDocumentParserLibxml2 really need to set this?
@@ -105 +105 @@
 
 private:
-    enum ParserState {
-        ParsingState,
-        StoppingState,
-        StoppedState,
-        DetachedState
+    enum class ParserState : uint8_t {
+        Parsing,
+        Stopping,
+        Stopped,
+        Detached
     };
     ParserState m_state;