Changeset 161593 in webkit

Timestamp:

Jan 9, 2014 4:02:51 PM (10 years ago)

Author:

andersca@apple.com

Message:

History::StateObjectType should be a strong enum
​https://bugs.webkit.org/show_bug.cgi?id=126725

Reviewed by Beth Dakin.

• bindings/js/JSHistoryCustom.cpp:

(WebCore::JSHistory::pushState):
(WebCore::JSHistory::replaceState):

• loader/HistoryController.cpp:

(WebCore::HistoryController::pushState):

• page/History.cpp:

(WebCore::History::stateObjectAdded):

• page/History.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSHistoryCustom.cpp (modified) (2 diffs)
• loader/HistoryController.cpp (modified) (1 diff)
• page/History.cpp (modified) (2 diffs)
• page/History.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-09  Anders Carlsson  <andersca@apple.com>
+
+        History::StateObjectType should be a strong enum
+        https://bugs.webkit.org/show_bug.cgi?id=126725
+
+        Reviewed by Beth Dakin.
+
+        * bindings/js/JSHistoryCustom.cpp:
+        (WebCore::JSHistory::pushState):
+        (WebCore::JSHistory::replaceState):
+        * loader/HistoryController.cpp:
+        (WebCore::HistoryController::pushState):
+        * page/History.cpp:
+        (WebCore::History::stateObjectAdded):
+        * page/History.h:
+
 2014-01-09  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp

@@ -162 +162 @@
 
     ExceptionCode ec = 0;
-    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectPush, ec);
+    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Push, ec);
     setDOMException(exec, ec);
 
@@ -188 +188 @@
 
     ExceptionCode ec = 0;
-    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectReplace, ec);
+    impl().stateObjectAdded(historyState.release(), title, url, History::StateObjectType::Replace, ec);
     setDOMException(exec, ec);
 

trunk/Source/WebCore/loader/HistoryController.cpp

@@ -856 +856 @@
     addVisitedLink(page, URL(ParsedURLString, urlString));
     m_frame.loader().client().updateGlobalHistory();
-
 }
 

trunk/Source/WebCore/page/History.cpp

@@ -148 +148 @@
     }
 
-    if (stateObjectType == StateObjectPush)
+    if (stateObjectType == StateObjectType::Push)
         m_frame->loader().history().pushState(data, title, fullURL.string());
-    else if (stateObjectType == StateObjectReplace)
+    else if (stateObjectType == StateObjectType::Replace)
         m_frame->loader().history().replaceState(data, title, fullURL.string());
             
@@ -156 +156 @@
         m_frame->document()->updateURLForPushOrReplaceState(fullURL);
 
-    if (stateObjectType == StateObjectPush)
+    if (stateObjectType == StateObjectType::Push)
         m_frame->loader().client().dispatchDidPushStateWithinPage();
-    else if (stateObjectType == StateObjectReplace)
+    else if (stateObjectType == StateObjectType::Replace)
         m_frame->loader().client().dispatchDidReplaceStateWithinPage();
 }

trunk/Source/WebCore/page/History.h

@@ -58 +58 @@
     bool isSameAsCurrentState(SerializedScriptValue*) const;
 
-    enum StateObjectType {
-        StateObjectPush,
-        StateObjectReplace
+    enum class StateObjectType {
+        Push,
+        Replace
     };
     void stateObjectAdded(PassRefPtr<SerializedScriptValue>, const String& title, const String& url, StateObjectType, ExceptionCode&);