Title: [245356] branches/safari-607-branch/Source/WebKit
- Revision
- 245356
- Author
- [email protected]
- Date
- 2019-05-15 14:45:04 -0700 (Wed, 15 May 2019)
Log Message
Apply patch. rdar://problem/50753918
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (245355 => 245356)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-05-15 21:45:02 UTC (rev 245355)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-05-15 21:45:04 UTC (rev 245356)
@@ -1,5 +1,24 @@
2019-05-14 Kocsen Chung <[email protected]>
+ Apply patch. rdar://problem/50753918
+
+ 2019-05-14 Chris Dumez <[email protected]>
+
+ MobileSafari crash at WebKit: WebKit::WebPageProxy::didCommitLoadForFrame
+ <rdar://problem/49908163>
+
+ Reviewed by Alex Christensen.
+
+ Partial cherry-pick of r243767 to fix the crash on the branch. The rest of
+ r243767 introduced a regression which got fixed later in r244493 so I think
+ this partial cherry-pick is the safest way to resolve the crash while
+ avoiding any potential regressions.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didCommitLoadForFrame):
+
+2019-05-14 Kocsen Chung <[email protected]>
+
Cherry-pick r245196. rdar://problem/50753938
Streamline test-and-clear operation for ContextMenu
Modified: branches/safari-607-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (245355 => 245356)
--- branches/safari-607-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-05-15 21:45:02 UTC (rev 245355)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2019-05-15 21:45:04 UTC (rev 245356)
@@ -4047,8 +4047,7 @@
// 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) {
- navigation = navigationState().navigation(navigationID);
+ if (frame->isMainFrame() && navigationID && (navigation = navigationState().navigation(navigationID))) {
#if ENABLE(RESOURCE_LOAD_STATISTICS)
auto requesterOrigin = navigation->lastNavigationAction().requesterOrigin;
auto currentURL = navigation->currentRequest().url();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes