Diff
Modified: trunk/Source/WebKit2/ChangeLog (159438 => 159439)
--- trunk/Source/WebKit2/ChangeLog 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-18 19:10:14 UTC (rev 159439)
@@ -1,5 +1,31 @@
2013-11-18 Anders Carlsson <[email protected]>
+ Use a strong enum for frame load states
+ https://bugs.webkit.org/show_bug.cgi?id=124524
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKFrame.cpp:
+ (WKFrameGetFrameLoadState):
+ * UIProcess/FrameLoadState.cpp:
+ (WebKit::FrameLoadState::FrameLoadState):
+ (WebKit::FrameLoadState::didStartProvisionalLoad):
+ (WebKit::FrameLoadState::didReceiveServerRedirectForProvisionalLoad):
+ (WebKit::FrameLoadState::didFailProvisionalLoad):
+ (WebKit::FrameLoadState::didCommitLoad):
+ (WebKit::FrameLoadState::didFinishLoad):
+ (WebKit::FrameLoadState::didFailLoad):
+ * UIProcess/FrameLoadState.h:
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::activeURL):
+ (WebKit::WebPageProxy::resetStateAfterProcessExited):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::loadStateAtProcessExit):
+
+2013-11-18 Anders Carlsson <[email protected]>
+
Remove unnecessary COMPILER(CLANG) #ifdefs in Mac-only code
https://bugs.webkit.org/show_bug.cgi?id=124523
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2013-11-18 19:10:14 UTC (rev 159439)
@@ -44,12 +44,12 @@
WKFrameLoadState WKFrameGetFrameLoadState(WKFrameRef frameRef)
{
WebFrameProxy* frame = toImpl(frameRef);
- switch (frame->frameLoadState().m_loadState) {
- case FrameLoadState::LoadStateProvisional:
+ switch (frame->frameLoadState().m_state) {
+ case FrameLoadState::State::Provisional:
return kWKFrameLoadStateProvisional;
- case FrameLoadState::LoadStateCommitted:
+ case FrameLoadState::State::Committed:
return kWKFrameLoadStateCommitted;
- case FrameLoadState::LoadStateFinished:
+ case FrameLoadState::State::Finished:
return kWKFrameLoadStateFinished;
}
Modified: trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp 2013-11-18 19:10:14 UTC (rev 159439)
@@ -29,7 +29,7 @@
namespace WebKit {
FrameLoadState::FrameLoadState()
- : m_loadState(LoadStateFinished)
+ : m_state(State::Finished)
{
}
@@ -41,49 +41,49 @@
{
ASSERT(m_provisionalURL.isEmpty());
- m_loadState = LoadStateProvisional;
+ m_state = State::Provisional;
m_provisionalURL = url;
}
void FrameLoadState::didReceiveServerRedirectForProvisionalLoad(const String& url)
{
- ASSERT(m_loadState == LoadStateProvisional);
+ ASSERT(m_state == State::Provisional);
m_provisionalURL = url;
}
void FrameLoadState::didFailProvisionalLoad()
{
- ASSERT(m_loadState == LoadStateProvisional);
+ ASSERT(m_state == State::Provisional);
- m_loadState = LoadStateFinished;
+ m_state = State::Finished;
m_provisionalURL = String();
m_unreachableURL = m_lastUnreachableURL;
}
void FrameLoadState::didCommitLoad()
{
- ASSERT(m_loadState == LoadStateProvisional);
+ ASSERT(m_state == State::Provisional);
- m_loadState = LoadStateCommitted;
+ m_state = State::Committed;
m_url = m_provisionalURL;
m_provisionalURL = String();
}
void FrameLoadState::didFinishLoad()
{
- ASSERT(m_loadState == LoadStateCommitted);
+ ASSERT(m_state == State::Committed);
ASSERT(m_provisionalURL.isEmpty());
- m_loadState = LoadStateFinished;
+ m_state = State::Finished;
}
void FrameLoadState::didFailLoad()
{
- ASSERT(m_loadState == LoadStateCommitted);
+ ASSERT(m_state == State::Committed);
ASSERT(m_provisionalURL.isEmpty());
- m_loadState = LoadStateFinished;
+ m_state = State::Finished;
}
void FrameLoadState::didSameDocumentNotification(const String& url)
Modified: trunk/Source/WebKit2/UIProcess/FrameLoadState.h (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2013-11-18 19:10:14 UTC (rev 159439)
@@ -35,10 +35,10 @@
FrameLoadState();
~FrameLoadState();
- enum LoadState {
- LoadStateProvisional,
- LoadStateCommitted,
- LoadStateFinished
+ enum class State {
+ Provisional,
+ Committed,
+ Finished
};
void didStartProvisionalLoad(const String& url);
@@ -55,7 +55,7 @@
// FIXME: These should all be private, and FrameLoadState should
// provide state transition member functions.
- LoadState m_loadState;
+ State m_state;
String m_url;
String m_provisionalURL;
String m_unreachableURL;
Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2013-11-18 19:10:14 UTC (rev 159439)
@@ -71,8 +71,6 @@
FrameLoadState& frameLoadState() { return m_frameLoadState; }
- FrameLoadState::LoadState loadState() const { return m_frameLoadState.m_loadState; }
-
void stopLoading() const;
const String& url() const { return m_frameLoadState.m_url; }
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-18 19:10:14 UTC (rev 159439)
@@ -238,7 +238,7 @@
, m_estimatedProgress(0)
, m_viewState(ViewState::NoFlags)
, m_backForwardList(WebBackForwardList::create(this))
- , m_loadStateAtProcessExit(FrameLoadState::LoadStateFinished)
+ , m_loadStateAtProcessExit(FrameLoadState::State::Finished)
, m_temporarilyClosedComposition(false)
, m_textZoomFactor(1)
, m_pageZoomFactor(1)
@@ -848,11 +848,11 @@
if (!m_mainFrame->unreachableURL().isEmpty())
return m_mainFrame->unreachableURL();
- switch (m_mainFrame->frameLoadState().m_loadState) {
- case FrameLoadState::LoadStateProvisional:
+ switch (m_mainFrame->frameLoadState().m_state) {
+ case FrameLoadState::State::Provisional:
return m_mainFrame->provisionalURL();
- case FrameLoadState::LoadStateCommitted:
- case FrameLoadState::LoadStateFinished:
+ case FrameLoadState::State::Committed:
+ case FrameLoadState::State::Finished:
return m_mainFrame->url();
}
@@ -3795,7 +3795,7 @@
if (m_mainFrame) {
m_urlAtProcessExit = m_mainFrame->url();
- m_loadStateAtProcessExit = m_mainFrame->loadState();
+ m_loadStateAtProcessExit = m_mainFrame->frameLoadState().m_state;
}
resetState();
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (159438 => 159439)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-18 19:00:59 UTC (rev 159438)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-11-18 19:10:14 UTC (rev 159439)
@@ -610,7 +610,7 @@
PassRefPtr<API::Array> relatedPages() const;
const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
- FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
+ FrameLoadState::State loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
#if ENABLE(DRAG_SUPPORT)
WebCore::DragSession dragSession() const { return m_currentDragSession; }
@@ -1090,7 +1090,7 @@
String m_toolTip;
String m_urlAtProcessExit;
- FrameLoadState::LoadState m_loadStateAtProcessExit;
+ FrameLoadState::State m_loadStateAtProcessExit;
EditorState m_editorState;
bool m_temporarilyClosedComposition; // Editor state changed from hasComposition to !hasComposition, but that was only with shouldIgnoreCompositionSelectionChange yet.
