Title: [229016] releases/WebKitGTK/webkit-2.20/Source/WebKit
- Revision
- 229016
- Author
- [email protected]
- Date
- 2018-02-26 05:57:11 -0800 (Mon, 26 Feb 2018)
Log Message
Merge r228887 - Web Automation: failed provisional loads cause "Navigate To" command to hang
https://bugs.webkit.org/show_bug.cgi?id=183007
<rdar://problem/37751819>
Reviewed by Andy Estes.
This hang was revealed by WPT test current_url.py::get_current_url_file_protocol. Now the
test simply fails because Safari chooses a policy of 'Ignore' for externally-opened files.
I filed an upstream issue with the test here: https://github.com/w3c/webdriver/issues/1232
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
Notify the session that the load failed in the frame, just like we do
for non-provisional failed loads and successful loads.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog (229015 => 229016)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-02-26 13:57:04 UTC (rev 229015)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog 2018-02-26 13:57:11 UTC (rev 229016)
@@ -1,3 +1,20 @@
+2018-02-21 Brian Burg <[email protected]>
+
+ Web Automation: failed provisional loads cause "Navigate To" command to hang
+ https://bugs.webkit.org/show_bug.cgi?id=183007
+ <rdar://problem/37751819>
+
+ Reviewed by Andy Estes.
+
+ This hang was revealed by WPT test current_url.py::get_current_url_file_protocol. Now the
+ test simply fails because Safari chooses a policy of 'Ignore' for externally-opened files.
+ I filed an upstream issue with the test here: https://github.com/w3c/webdriver/issues/1232
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailProvisionalLoadForFrame):
+ Notify the session that the load failed in the frame, just like we do
+ for non-provisional failed loads and successful loads.
+
2018-02-14 Brian Burg <[email protected]>
Web Automation: combine session commands to resize and move top-level browsing contexts
Modified: releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/WebPageProxy.cpp (229015 => 229016)
--- releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-26 13:57:04 UTC (rev 229015)
+++ releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-02-26 13:57:11 UTC (rev 229016)
@@ -3320,6 +3320,11 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
+ if (m_controlledByAutomation) {
+ if (auto* automationSession = process().processPool().automationSession())
+ automationSession->navigationOccurredForFrame(*frame);
+ }
+
// FIXME: We should message check that navigationID is not zero here, but it's currently zero for some navigations through the page cache.
RefPtr<API::Navigation> navigation;
if (frame->isMainFrame() && navigationID)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
