Title: [271475] trunk/Tools
Revision
271475
Author
[email protected]
Date
2021-01-13 16:48:26 -0800 (Wed, 13 Jan 2021)

Log Message

Remove deprecated script and stylesheet SPI, replaced with more inclusively-named SPI
https://bugs.webkit.org/show_bug.cgi?id=214937

Fix iOS build after r271457.

* TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
(TEST):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (271474 => 271475)


--- trunk/Tools/ChangeLog	2021-01-14 00:48:25 UTC (rev 271474)
+++ trunk/Tools/ChangeLog	2021-01-14 00:48:26 UTC (rev 271475)
@@ -1,3 +1,13 @@
+2021-01-13  Alex Christensen  <[email protected]>
+
+        Remove deprecated script and stylesheet SPI, replaced with more inclusively-named SPI
+        https://bugs.webkit.org/show_bug.cgi?id=214937
+
+        Fix iOS build after r271457.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm:
+        (TEST):
+
 2021-01-13  Wenson Hsieh  <[email protected]>
 
         [macOS] "Correct Spelling Automatically" menu items are inconsistent when autocorrect="off"

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (271474 => 271475)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm	2021-01-14 00:48:25 UTC (rev 271474)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm	2021-01-14 00:48:26 UTC (rev 271475)
@@ -386,10 +386,11 @@
 
     auto schemeHandler = adoptNS([[InAppBrowserSchemeHandler alloc] init]);
     [configuration setURLSchemeHandler:schemeHandler.get() forURLScheme:@"in-app-browser"];
-    RetainPtr<_WKUserContentWorld> world = [_WKUserContentWorld worldWithName:@"TestWorld"];
+    RetainPtr<WKContentWorld> world = [WKContentWorld worldWithName:@"TestWorld"];
 
     auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectZero configuration:configuration.get()]);
-    RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forWKWebView:webView.get() forMainFrameOnly:YES level:_WKUserStyleUserLevel userContentWorld:world.get()]);
+    RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forWKWebView:webView.get() forMainFrameOnly:YES includeMatchPatternStrings:nil excludeMatchPatternStrings:nil baseURL:nil level:_WKUserStyleUserLevel contentWorld:world.get()]);
+
     [[configuration userContentController] _addUserStyleSheet:styleSheet.get()];
 
     auto delegate = adoptNS([AppBoundDomainDelegate new]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to