Title: [258264] branches/safari-610.1.7-branch/Source/WebKit
- Revision
- 258264
- Author
- alanc...@apple.com
- Date
- 2020-03-11 09:41:00 -0700 (Wed, 11 Mar 2020)
Log Message
Cherry-pick r258247. rdar://problem/60305091
Some common domains should always be App-bound domains
https://bugs.webkit.org/show_bug.cgi?id=208893
<rdar://problem/60280943>
Reviewed by Brent Fulgham.
Some domains, like about:blank and pages loaded from files should
always be considered app-bound.
* UIProcess/WebPageProxy.cpp:
(WebKit::shouldBeTreatedAsAppBound):
(WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (258263 => 258264)
--- branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 15:46:53 UTC (rev 258263)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 16:41:00 UTC (rev 258264)
@@ -1,3 +1,38 @@
+2020-03-11 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r258247. rdar://problem/60305091
+
+ Some common domains should always be App-bound domains
+ https://bugs.webkit.org/show_bug.cgi?id=208893
+ <rdar://problem/60280943>
+
+ Reviewed by Brent Fulgham.
+
+ Some domains, like about:blank and pages loaded from files should
+ always be considered app-bound.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::shouldBeTreatedAsAppBound):
+ (WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-10 Kate Cheney <katherine_che...@apple.com>
+
+ Some common domains should always be App-bound domains
+ https://bugs.webkit.org/show_bug.cgi?id=208893
+ <rdar://problem/60280943>
+
+ Reviewed by Brent Fulgham.
+
+ Some domains, like about:blank and pages loaded from files should
+ always be considered app-bound.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::shouldBeTreatedAsAppBound):
+ (WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
+
2020-03-09 Russell Epstein <repst...@apple.com>
Cherry-pick r258174. rdar://problem/60250780
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (258263 => 258264)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-11 15:46:53 UTC (rev 258263)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-11 16:41:00 UTC (rev 258264)
@@ -3095,10 +3095,18 @@
PolicyCheckIdentifier m_identifier;
};
+static bool shouldBeTreatedAsAppBound(const URL& requestURL)
+{
+ return requestURL.protocolIsAbout() || requestURL.protocolIsData() || requestURL.protocolIsBlob() || requestURL.isLocalFile();
+}
+
void WebPageProxy::setIsNavigatingToAppBoundDomain(bool isMainFrame, const URL& requestURL, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain)
{
if (isMainFrame && (m_preferences->isInAppBrowserPrivacyEnabled() || WEB_PAGE_PROXY_ADDITIONS_SETISNAVIGATINGTOAPPBOUNDDOMAIN_2)) {
WEB_PAGE_PROXY_ADDITIONS_SETISNAVIGATINGTOAPPBOUNDDOMAIN
+ if (isNavigatingToAppBoundDomain == NavigatingToAppBoundDomain::No && shouldBeTreatedAsAppBound(requestURL))
+ isNavigatingToAppBoundDomain = NavigatingToAppBoundDomain::Yes;
+
if (isNavigatingToAppBoundDomain == NavigatingToAppBoundDomain::No) {
m_configuration->setWebViewCategory(WebViewCategory::InAppBrowser);
m_isNavigatingToAppBoundDomain = NavigatingToAppBoundDomain::No;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
