Title: [231070] branches/safari-605-branch/Source/WebKit
- Revision
- 231070
- Author
- [email protected]
- Date
- 2018-04-26 13:47:17 -0700 (Thu, 26 Apr 2018)
Log Message
Apply patch. rdar://problem/39532926
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (231069 => 231070)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-04-26 20:47:13 UTC (rev 231069)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-04-26 20:47:17 UTC (rev 231070)
@@ -1,3 +1,26 @@
+2018-04-26 Jason Marcell <[email protected]>
+
+ Apply patch. rdar://problem/39532926
+
+ 2018-04-26 Chris Dumez <[email protected]>
+
+ Regression(r230733): imported/w3c/web-platform-tests/html/semantics/text-level-semantics/the-a-element/a-download-click-404.html is failing
+ <rdar://problem/39532926>
+
+ Reviewed by Ryosuke Niwa.
+
+ Update r230733 to do a more conservative roll out of r222468, since the download attribute code is relying
+ on some of the code.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::decidePolicyForNavigationAction):
+ Revert changes made to this method in r230733 as the download attribute code relies on
+ it.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::documentLoaderDetached):
+ Reintroduce null check that was dropped in r230733.
+
2018-04-17 Kocsen Chung <[email protected]>
Apply patch. rdar://problem/39305046
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (231069 => 231070)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-04-26 20:47:13 UTC (rev 231069)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2018-04-26 20:47:17 UTC (rev 231070)
@@ -3743,11 +3743,15 @@
MESSAGE_CHECK_URL(originalRequest.url());
Ref<WebFramePolicyListenerProxy> listener = frame->setUpPolicyListenerProxy(listenerID);
- if (!navigationID && frame->isMainFrame()) {
+ if (!navigationID) {
auto navigation = m_navigationState->createLoadRequestNavigation(ResourceRequest(request));
newNavigationID = navigation->navigationID();
navigation->setShouldForceDownload(!navigationActionData.downloadAttribute.isNull());
listener->setNavigation(WTFMove(navigation));
+ } else {
+ auto& navigation = m_navigationState->navigation(navigationID);
+ navigation.setShouldForceDownload(!navigationActionData.downloadAttribute.isNull());
+ listener->setNavigation(navigation);
}
#if ENABLE(CONTENT_FILTERING)
Modified: branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp (231069 => 231070)
--- branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp 2018-04-26 20:47:13 UTC (rev 231069)
+++ branches/safari-605-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp 2018-04-26 20:47:17 UTC (rev 231070)
@@ -814,7 +814,8 @@
void WebFrame::documentLoaderDetached(uint64_t navigationID)
{
- page()->send(Messages::WebPageProxy::DidDestroyNavigation(navigationID));
+ if (auto* page = this->page())
+ page->send(Messages::WebPageProxy::DidDestroyNavigation(navigationID));
}
#if PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
