Title: [187067] branches/safari-601.1-branch/Source/WebKit2
- Revision
- 187067
- Author
- matthew_han...@apple.com
- Date
- 2015-07-20 21:37:17 -0700 (Mon, 20 Jul 2015)
Log Message
Merge r186969. rdar://problem/21803781
Modified Paths
Diff
Modified: branches/safari-601.1-branch/Source/WebKit2/ChangeLog (187066 => 187067)
--- branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 04:37:14 UTC (rev 187066)
+++ branches/safari-601.1-branch/Source/WebKit2/ChangeLog 2015-07-21 04:37:17 UTC (rev 187067)
@@ -1,5 +1,20 @@
2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r186969. rdar://problem/21803781
+
+ 2015-07-17 Dan Bernstein <m...@apple.com>
+
+ REGRESSION (r186964): Crash in WebKit2.CloseFromWithinCreatePage
+ https://bugs.webkit.org/show_bug.cgi?id=147055
+
+ Reviewed by Alex Christensen.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::createNewPage): Grab the main frame’s URL before calling out to the
+ client, who may destroy the frame.
+
+2015-07-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r186964. rdar://problem/21803781
2015-07-17 Dan Bernstein <m...@apple.com>
Modified: branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (187066 => 187067)
--- branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-21 04:37:14 UTC (rev 187066)
+++ branches/safari-601.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-21 04:37:17 UTC (rev 187067)
@@ -3526,6 +3526,8 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
+ auto mainFrameURL = m_mainFrame->url();
+
RefPtr<WebPageProxy> newPage = m_uiClient->createNewPage(this, frame, securityOriginData, request, windowFeatures, navigationActionData);
if (!newPage) {
newPageID = 0;
@@ -3536,7 +3538,7 @@
newPageParameters = newPage->creationParameters();
WebsiteDataStore::cloneSessionData(*this, *newPage);
- newPage->m_shouldSuppressAppLinksInNextNavigationPolicyDecision = protocolHostAndPortAreEqual(URL(ParsedURLString, m_mainFrame->url()), request.url());
+ newPage->m_shouldSuppressAppLinksInNextNavigationPolicyDecision = protocolHostAndPortAreEqual(URL(ParsedURLString, mainFrameURL), request.url());
}
void WebPageProxy::showPage()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
