Title: [258300] branches/safari-610.1.7-branch/Source/WebKit
- Revision
- 258300
- Author
- repst...@apple.com
- Date
- 2020-03-11 17:33:47 -0700 (Wed, 11 Mar 2020)
Log Message
Cherry-pick r258296. rdar://problem/60348995
Add a parameter to allow ignoring app-bound domain categorization
https://bugs.webkit.org/show_bug.cgi?id=208949
<rdar://problem/60239187>
Reviewed by Brent Fulgham.
Introduce a new parameter to ignore app-bound domain categorization
for specific WebViews.
* UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::ignoresAppBoundDomains const):
(API::PageConfiguration::setIgnoresAppBoundDomains):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration _ignoresAppBoundDomains]):
(-[WKWebViewConfiguration _setIgnoresAppBoundDomains:]):
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258296 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-12 00:33:47 UTC (rev 258300)
@@ -1,5 +1,52 @@
2020-03-11 Alan Coon <alanc...@apple.com>
+ Cherry-pick r258296. rdar://problem/60348995
+
+ Add a parameter to allow ignoring app-bound domain categorization
+ https://bugs.webkit.org/show_bug.cgi?id=208949
+ <rdar://problem/60239187>
+
+ Reviewed by Brent Fulgham.
+
+ Introduce a new parameter to ignore app-bound domain categorization
+ for specific WebViews.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::ignoresAppBoundDomains const):
+ (API::PageConfiguration::setIgnoresAppBoundDomains):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _ignoresAppBoundDomains]):
+ (-[WKWebViewConfiguration _setIgnoresAppBoundDomains:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258296 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-11 Kate Cheney <katherine_che...@apple.com>
+
+ Add a parameter to allow ignoring app-bound domain categorization
+ https://bugs.webkit.org/show_bug.cgi?id=208949
+ <rdar://problem/60239187>
+
+ Reviewed by Brent Fulgham.
+
+ Introduce a new parameter to ignore app-bound domain categorization
+ for specific WebViews.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::ignoresAppBoundDomains const):
+ (API::PageConfiguration::setIgnoresAppBoundDomains):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration _ignoresAppBoundDomains]):
+ (-[WKWebViewConfiguration _setIgnoresAppBoundDomains:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::setIsNavigatingToAppBoundDomain):
+
+2020-03-11 Alan Coon <alanc...@apple.com>
+
Cherry-pick r258289. rdar://problem/60341123
[macOS] Crash under WebKit::WebProcessPool::platformInitialize()
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.cpp 2020-03-12 00:33:47 UTC (rev 258300)
@@ -94,6 +94,7 @@
copy->m_webViewCategory = this->m_webViewCategory;
copy->m_processDisplayName = this->m_processDisplayName;
+ copy->m_ignoresAppBoundDomains = this->m_ignoresAppBoundDomains;
return copy;
}
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.h (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.h 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/APIPageConfiguration.h 2020-03-12 00:33:47 UTC (rev 258300)
@@ -147,6 +147,9 @@
WebKit::WebViewCategory webViewCategory() const { return m_webViewCategory; }
void setWebViewCategory(WebKit::WebViewCategory category) { m_webViewCategory = category; }
+ bool ignoresAppBoundDomains() const { return m_ignoresAppBoundDomains; }
+ void setIgnoresAppBoundDomains(bool shouldIgnore) { m_ignoresAppBoundDomains = shouldIgnore; }
+
private:
RefPtr<WebKit::WebProcessPool> m_processPool;
@@ -187,6 +190,7 @@
bool m_crossOriginAccessControlCheckEnabled { true };
WTF::String m_processDisplayName;
WebKit::WebViewCategory m_webViewCategory { WebKit::WebViewCategory::AppBoundDomain };
+ bool m_ignoresAppBoundDomains { false };
};
} // namespace API
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2020-03-12 00:33:47 UTC (rev 258300)
@@ -1210,6 +1210,16 @@
_pageConfiguration->setWebViewCategory(toWebKitWebViewCategory(category));
}
+- (BOOL)_ignoresAppBoundDomains
+{
+ return _pageConfiguration->ignoresAppBoundDomains();
+}
+
+- (void)_setIgnoresAppBoundDomains:(BOOL)ignoresAppBoundDomains
+{
+ _pageConfiguration->setIgnoresAppBoundDomains(ignoresAppBoundDomains);
+}
+
- (NSString *)_processDisplayName
{
return _pageConfiguration->processDisplayName();
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2020-03-12 00:33:47 UTC (rev 258300)
@@ -122,6 +122,7 @@
@property (nonatomic, setter=_setEditableImagesEnabled:) BOOL _editableImagesEnabled WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic, setter=_setUndoManagerAPIEnabled:) BOOL _undoManagerAPIEnabled WK_API_AVAILABLE(macos(10.15), ios(13.0));
@property (nonatomic, setter=_setWebViewCategory:) _WKWebViewCategory _webViewCategory WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic, setter=_setIgnoresAppBoundDomains:) BOOL _ignoresAppBoundDomains WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setProcessDisplayName:) NSString *_processDisplayName WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (258299 => 258300)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-12 00:30:58 UTC (rev 258299)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-03-12 00:33:47 UTC (rev 258300)
@@ -3103,6 +3103,8 @@
void WebPageProxy::setIsNavigatingToAppBoundDomain(bool isMainFrame, const URL& requestURL, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain)
{
if (isMainFrame && (m_preferences->isInAppBrowserPrivacyEnabled() || WEB_PAGE_PROXY_ADDITIONS_SETISNAVIGATINGTOAPPBOUNDDOMAIN_2)) {
+ if (m_configuration->ignoresAppBoundDomains())
+ return;
WEB_PAGE_PROXY_ADDITIONS_SETISNAVIGATINGTOAPPBOUNDDOMAIN
if (isNavigatingToAppBoundDomain == NavigatingToAppBoundDomain::No && shouldBeTreatedAsAppBound(requestURL))
isNavigatingToAppBoundDomain = NavigatingToAppBoundDomain::Yes;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
