Title: [159209] trunk/Source/WebKit2
- Revision
- 159209
- Author
- [email protected]
- Date
- 2013-11-13 10:51:54 -0800 (Wed, 13 Nov 2013)
Log Message
Move provisional load state handling to FrameLoadState
https://bugs.webkit.org/show_bug.cgi?id=124291
Reviewed by Dan Bernstein.
* UIProcess/FrameLoadState.cpp:
(WebKit::FrameLoadState::didStartProvisionalLoad):
(WebKit::FrameLoadState::didReceiveServerRedirectForProvisionalLoad):
(WebKit::FrameLoadState::didFailProvisionalLoad):
* UIProcess/FrameLoadState.h:
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::didStartProvisionalLoad):
(WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
(WebKit::WebFrameProxy::didFailProvisionalLoad):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159208 => 159209)
--- trunk/Source/WebKit2/ChangeLog 2013-11-13 18:30:03 UTC (rev 159208)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-13 18:51:54 UTC (rev 159209)
@@ -1,3 +1,20 @@
+2013-11-13 Anders Carlsson <[email protected]>
+
+ Move provisional load state handling to FrameLoadState
+ https://bugs.webkit.org/show_bug.cgi?id=124291
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/FrameLoadState.cpp:
+ (WebKit::FrameLoadState::didStartProvisionalLoad):
+ (WebKit::FrameLoadState::didReceiveServerRedirectForProvisionalLoad):
+ (WebKit::FrameLoadState::didFailProvisionalLoad):
+ * UIProcess/FrameLoadState.h:
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::didStartProvisionalLoad):
+ (WebKit::WebFrameProxy::didReceiveServerRedirectForProvisionalLoad):
+ (WebKit::WebFrameProxy::didFailProvisionalLoad):
+
2013-11-13 Csaba Osztrogonác <[email protected]>
One more fix after r159197.
Modified: trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp (159208 => 159209)
--- trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp 2013-11-13 18:30:03 UTC (rev 159208)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.cpp 2013-11-13 18:51:54 UTC (rev 159209)
@@ -37,4 +37,25 @@
{
}
+void FrameLoadState::didStartProvisionalLoad(const String& url)
+{
+ ASSERT(m_provisionalURL.isEmpty());
+ m_loadState = LoadStateProvisional;
+ m_provisionalURL = url;
+}
+
+void FrameLoadState::didReceiveServerRedirectForProvisionalLoad(const String& url)
+{
+ ASSERT(m_loadState == LoadStateProvisional);
+ m_provisionalURL = url;
+}
+
+void FrameLoadState::didFailProvisionalLoad()
+{
+ ASSERT(m_loadState == LoadStateProvisional);
+ m_loadState = LoadStateFinished;
+ m_provisionalURL = String();
+ m_unreachableURL = m_lastUnreachableURL;
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/FrameLoadState.h (159208 => 159209)
--- trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2013-11-13 18:30:03 UTC (rev 159208)
+++ trunk/Source/WebKit2/UIProcess/FrameLoadState.h 2013-11-13 18:51:54 UTC (rev 159209)
@@ -41,6 +41,10 @@
LoadStateFinished
};
+ void didStartProvisionalLoad(const String& url);
+ void didReceiveServerRedirectForProvisionalLoad(const String& url);
+ void didFailProvisionalLoad();
+
// FIXME: These should all be private, and FrameLoadState should
// provide state transition member functions.
LoadState m_loadState;
Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (159208 => 159209)
--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-11-13 18:30:03 UTC (rev 159208)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2013-11-13 18:51:54 UTC (rev 159209)
@@ -118,23 +118,17 @@
void WebFrameProxy::didStartProvisionalLoad(const String& url)
{
- ASSERT(m_frameLoadState.m_provisionalURL.isEmpty());
- m_frameLoadState.m_loadState = FrameLoadState::LoadStateProvisional;
- m_frameLoadState.m_provisionalURL = url;
+ m_frameLoadState.didStartProvisionalLoad(url);
}
void WebFrameProxy::didReceiveServerRedirectForProvisionalLoad(const String& url)
{
- ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
- m_frameLoadState.m_provisionalURL = url;
+ m_frameLoadState.didReceiveServerRedirectForProvisionalLoad(url);
}
void WebFrameProxy::didFailProvisionalLoad()
{
- ASSERT(m_frameLoadState.m_loadState == FrameLoadState::LoadStateProvisional);
- m_frameLoadState.m_loadState = FrameLoadState::LoadStateFinished;
- m_frameLoadState.m_provisionalURL = String();
- m_frameLoadState.m_unreachableURL = m_frameLoadState.m_lastUnreachableURL;
+ m_frameLoadState.didFailProvisionalLoad();
}
void WebFrameProxy::didCommitLoad(const String& contentType, const PlatformCertificateInfo& certificateInfo)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
