Title: [242393] branches/safari-608.1.5.1-branch/Source/WebKit
- Revision
- 242393
- Author
- [email protected]
- Date
- 2019-03-04 14:09:57 -0800 (Mon, 04 Mar 2019)
Log Message
Cherry-pick r242376. rdar://problem/47820581
Correctly handle sandbox extensions when the same WKWebView loads multiple file:// URLs.
<rdar://problem/47820581> and https://bugs.webkit.org/show_bug.cgi?id=195291
Reviewed by Andy Estes.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL
we're currently loading is functionally equivalent to the previous one.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog (242392 => 242393)
--- branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog 2019-03-04 22:08:36 UTC (rev 242392)
+++ branches/safari-608.1.5.1-branch/Source/WebKit/ChangeLog 2019-03-04 22:09:57 UTC (rev 242393)
@@ -1,3 +1,29 @@
+2019-03-04 Alan Coon <[email protected]>
+
+ Cherry-pick r242376. rdar://problem/47820581
+
+ Correctly handle sandbox extensions when the same WKWebView loads multiple file:// URLs.
+ <rdar://problem/47820581> and https://bugs.webkit.org/show_bug.cgi?id=195291
+
+ Reviewed by Andy Estes.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL
+ we're currently loading is functionally equivalent to the previous one.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-03-04 Brady Eidson <[email protected]>
+
+ Correctly handle sandbox extensions when the same WKWebView loads multiple file:// URLs.
+ <rdar://problem/47820581> and https://bugs.webkit.org/show_bug.cgi?id=195291
+
+ Reviewed by Andy Estes.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::shouldReuseCommittedSandboxExtension): Only retain the previous sandbox extension if the file URL
+ we're currently loading is functionally equivalent to the previous one.
+
2019-02-22 Babak Shafiei <[email protected]>
Revert r241606. rdar://problem/47884404
Modified: branches/safari-608.1.5.1-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242392 => 242393)
--- branches/safari-608.1.5.1-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-04 22:08:36 UTC (rev 242392)
+++ branches/safari-608.1.5.1-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-04 22:09:57 UTC (rev 242393)
@@ -4403,7 +4403,7 @@
if (!documentLoader || !provisionalDocumentLoader)
return false;
- if (documentLoader->url().isLocalFile() && provisionalDocumentLoader->url().isLocalFile())
+ if (documentLoader->url().isLocalFile() && provisionalDocumentLoader->url().isLocalFile() && equalIgnoringQueryAndFragment(documentLoader->url(), provisionalDocumentLoader->url()))
return true;
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
