Title: [159456] trunk/Source/WebKit2
- Revision
- 159456
- Author
- ander...@apple.com
- Date
- 2013-11-18 14:14:41 -0800 (Mon, 18 Nov 2013)
Log Message
The PageLoadState object should keep track of the current URL
https://bugs.webkit.org/show_bug.cgi?id=124536
Reviewed by Dan Bernstein.
* UIProcess/PageLoadState.cpp:
(WebKit::PageLoadState::didCommitLoad):
(WebKit::PageLoadState::didFinishLoad):
(WebKit::PageLoadState::didFailLoad):
(WebKit::PageLoadState::didSameDocumentNavigation):
* UIProcess/PageLoadState.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFinishLoadForFrame):
(WebKit::WebPageProxy::didFailLoadForFrame):
(WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (159455 => 159456)
--- trunk/Source/WebKit2/ChangeLog 2013-11-18 22:10:33 UTC (rev 159455)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-18 22:14:41 UTC (rev 159456)
@@ -1,3 +1,21 @@
+2013-11-18 Anders Carlsson <ander...@apple.com>
+
+ The PageLoadState object should keep track of the current URL
+ https://bugs.webkit.org/show_bug.cgi?id=124536
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/PageLoadState.cpp:
+ (WebKit::PageLoadState::didCommitLoad):
+ (WebKit::PageLoadState::didFinishLoad):
+ (WebKit::PageLoadState::didFailLoad):
+ (WebKit::PageLoadState::didSameDocumentNavigation):
+ * UIProcess/PageLoadState.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFinishLoadForFrame):
+ (WebKit::WebPageProxy::didFailLoadForFrame):
+ (WebKit::WebPageProxy::didSameDocumentNavigationForFrame):
+
2013-11-18 Csaba Osztrogonác <o...@webkit.org>
URTBF after r159444.
Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.cpp (159455 => 159456)
--- trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-11-18 22:10:33 UTC (rev 159455)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.cpp 2013-11-18 22:14:41 UTC (rev 159456)
@@ -74,8 +74,28 @@
{
ASSERT(!m_provisionalURL.isEmpty());
+ m_url = m_provisionalURL;
m_provisionalURL = String();
}
+void PageLoadState::didFinishLoad()
+{
+ ASSERT(m_provisionalURL.isEmpty());
+ ASSERT(!m_url.isEmpty());
+}
+void PageLoadState::didFailLoad()
+{
+ ASSERT(m_provisionalURL.isEmpty());
+ ASSERT(!m_url.isEmpty());
+}
+
+void PageLoadState::didSameDocumentNavigation(const String& url)
+{
+ ASSERT(m_provisionalURL.isEmpty());
+ ASSERT(!m_url.isEmpty());
+
+ m_url = url;
+}
+
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/PageLoadState.h (159455 => 159456)
--- trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-11-18 22:10:33 UTC (rev 159455)
+++ trunk/Source/WebKit2/UIProcess/PageLoadState.h 2013-11-18 22:14:41 UTC (rev 159456)
@@ -42,12 +42,18 @@
void didStartProvisionalLoad(const String& url, const String& unreachableURL);
void didReceiveServerRedirectForProvisionalLoad(const String& url);
void didFailProvisionalLoad();
+
void didCommitLoad();
+ void didFinishLoad();
+ void didFailLoad();
+ void didSameDocumentNavigation(const String& url);
+
private:
String m_pendingAPIRequestURL;
String m_provisionalURL;
+ String m_url;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (159455 => 159456)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-18 22:10:33 UTC (rev 159455)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-11-18 22:14:41 UTC (rev 159456)
@@ -2263,6 +2263,9 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
+ if (frame->isMainFrame())
+ m_pageLoadState.didFinishLoad();
+
frame->didFinishLoad();
m_loaderClient.didFinishLoadForFrame(this, frame, userData.get());
@@ -2280,6 +2283,9 @@
clearLoadDependentCallbacks();
+ if (frame->isMainFrame())
+ m_pageLoadState.didFailLoad();
+
frame->didFailLoad();
m_loaderClient.didFailLoadWithErrorForFrame(this, frame, error, userData.get());
@@ -2296,6 +2302,9 @@
MESSAGE_CHECK(frame);
MESSAGE_CHECK_URL(url);
+ if (frame->isMainFrame())
+ m_pageLoadState.didSameDocumentNavigation(url);
+
m_pageLoadState.clearPendingAPIRequestURL();
frame->didSameDocumentNavigation(url);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
