Title: [242390] tags/Safari-608.1.7.1.1/Source/WebKit
- Revision
- 242390
- Author
- alanc...@apple.com
- Date
- 2019-03-04 13:59:09 -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: tags/Safari-608.1.7.1.1/Source/WebKit/ChangeLog (242389 => 242390)
--- tags/Safari-608.1.7.1.1/Source/WebKit/ChangeLog 2019-03-04 21:57:52 UTC (rev 242389)
+++ tags/Safari-608.1.7.1.1/Source/WebKit/ChangeLog 2019-03-04 21:59:09 UTC (rev 242390)
@@ -1,3 +1,29 @@
+2019-03-04 Alan Coon <alanc...@apple.com>
+
+ 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 <beid...@apple.com>
+
+ 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-26 Philippe Normand <pnorm...@igalia.com> and Carlos Garcia Campos <cgar...@igalia.com>
[WPE] Add API for webview background color configuration
Modified: tags/Safari-608.1.7.1.1/Source/WebKit/WebProcess/WebPage/WebPage.cpp (242389 => 242390)
--- tags/Safari-608.1.7.1.1/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-04 21:57:52 UTC (rev 242389)
+++ tags/Safari-608.1.7.1.1/Source/WebKit/WebProcess/WebPage/WebPage.cpp 2019-03-04 21:59:09 UTC (rev 242390)
@@ -4415,7 +4415,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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
