Title: [259306] trunk/Source/WebKit
- Revision
- 259306
- Author
- [email protected]
- Date
- 2020-03-31 13:08:10 -0700 (Tue, 31 Mar 2020)
Log Message
Remove call to PageConfiguration::setUserContentController added in r225765
https://bugs.webkit.org/show_bug.cgi?id=209828
<rdar://problem/61114052>
Reviewed by Brian Weinstein.
r225765 added a way for a certain Mac application to use WKWebViewConfiguration._pageGroup to set its WKUserContentController.
That Mac application has transitioned to setting the WKUserContentController manually, and this workaround needs to be removed
for that application's WKUserContentControllers to continue working as desired. I verified this fixes that application, and
it is the only user of WKWebViewConfiguration._pageGroup and all other applications will have no change in behavior.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _setupPageConfiguration:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (259305 => 259306)
--- trunk/Source/WebKit/ChangeLog 2020-03-31 19:56:26 UTC (rev 259305)
+++ trunk/Source/WebKit/ChangeLog 2020-03-31 20:08:10 UTC (rev 259306)
@@ -1,3 +1,19 @@
+2020-03-31 Alex Christensen <[email protected]>
+
+ Remove call to PageConfiguration::setUserContentController added in r225765
+ https://bugs.webkit.org/show_bug.cgi?id=209828
+ <rdar://problem/61114052>
+
+ Reviewed by Brian Weinstein.
+
+ r225765 added a way for a certain Mac application to use WKWebViewConfiguration._pageGroup to set its WKUserContentController.
+ That Mac application has transitioned to setting the WKUserContentController manually, and this workaround needs to be removed
+ for that application's WKUserContentControllers to continue working as desired. I verified this fixes that application, and
+ it is the only user of WKWebViewConfiguration._pageGroup and all other applications will have no change in behavior.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _setupPageConfiguration:]):
+
2020-03-31 Brent Fulgham <[email protected]>
[macOS] Add additional IPC permission needed by Security.framework
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (259305 => 259306)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2020-03-31 19:56:26 UTC (rev 259305)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2020-03-31 20:08:10 UTC (rev 259306)
@@ -424,10 +424,9 @@
pageConfiguration->setDefaultWebsitePolicies([_configuration defaultWebpagePreferences]->_websitePolicies.get());
#if PLATFORM(MAC)
- if (auto pageGroup = WebKit::toImpl([_configuration _pageGroup])) {
+ if (auto pageGroup = WebKit::toImpl([_configuration _pageGroup]))
pageConfiguration->setPageGroup(pageGroup);
- pageConfiguration->setUserContentController(&pageGroup->userContentController());
- } else
+ else
#endif
{
NSString *groupIdentifier = [_configuration _groupIdentifier];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
