Changeset 271475 in webkit

Timestamp:

Jan 13, 2021, 4:48:26 PM (6 years ago)

Author:

achristensen@apple.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-13  Alex Christensen  <achristensen@webkit.org>
+
+        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  <wenson_hsieh@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/InAppBrowserPrivacy.mm

@@ -387 +387 @@
     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()];