[webkit-changes] [264875] trunk/Tools

Fri, 24 Jul 2020 19:01:30 -0700

Title: [264875] trunk/Tools
Revision
264875
Author
[email protected]
Date
2020-07-24 19:00:24 -0700 (Fri, 24 Jul 2020)

Log Message

Adopt inclusive WKBrowsingContextGroup SPI in the API tests
https://bugs.webkit.org/show_bug.cgi?id=214766

Reviewed by Darin Adler.

Adopt the newer version of this SPI, added in https://trac.webkit.org/changeset/263099/webkit
* TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm:
(TEST_F):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (264874 => 264875)


--- trunk/Tools/ChangeLog	2020-07-25 01:28:03 UTC (rev 264874)
+++ trunk/Tools/ChangeLog	2020-07-25 02:00:24 UTC (rev 264875)
@@ -1,3 +1,14 @@
+2020-07-24  Beth Dakin  <[email protected]>
+
+        Adopt inclusive WKBrowsingContextGroup SPI in the API tests
+        https://bugs.webkit.org/show_bug.cgi?id=214766
+
+        Reviewed by Darin Adler.
+
+        Adopt the newer version of this SPI, added in https://trac.webkit.org/changeset/263099/webkit
+        * TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm:
+        (TEST_F):
+
 2020-07-24  Brady Eidson  <[email protected]>
 
         Hard code some MFi controller devices instead of dynamically managing HID vs GameController.framework.

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm (264874 => 264875)


--- trunk/Tools/TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm	2020-07-25 01:28:03 UTC (rev 264874)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitObjC/UserContentTest.mm	2020-07-25 02:00:24 UTC (rev 264875)
@@ -121,7 +121,7 @@
 TEST_F(WebKit2UserContentTest, AddUserStyleSheetBeforeCreatingView)
 {
     testFinished = false;
-    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil mainFrameOnly:YES];
+    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil mainFrameOnly:YES];
     
     WKView *wkView = [[WKView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) processGroup:processGroup browsingContextGroup:browsingContextGroup];
     WKStringRef backgroundColorQuery = WKStringCreateWithUTF8CString(backgroundColorScript);
@@ -151,9 +151,9 @@
             WKRelease(backgroundColorQuery);
         });
     }];
+
+    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil mainFrameOnly:YES];
     
-    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil mainFrameOnly:YES];
-    
     [wkView.browsingContextController loadHTMLString:htmlString baseURL:nil];
 
     TestWebKitAPI::Util::run(&testFinished);
@@ -162,7 +162,7 @@
 TEST_F(WebKit2UserContentTest, RemoveAllUserStyleSheets)
 {
     testFinished = false;
-    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil mainFrameOnly:YES];
+    [browsingContextGroup addUserStyleSheet:userStyleSheet baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil mainFrameOnly:YES];
     
     WKView *wkView = [[WKView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) processGroup:processGroup browsingContextGroup:browsingContextGroup];
     WKStringRef backgroundColorQuery = WKStringCreateWithUTF8CString(backgroundColorScript);
@@ -184,7 +184,7 @@
 TEST_F(WebKit2UserContentTest, AddUserScriptBeforeCreatingView)
 {
     testFinished = false;
-    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
+    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
     
     WKView *wkView = [[WKView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) processGroup:processGroup browsingContextGroup:browsingContextGroup];
     WKStringRef userScriptTestPropertyString = WKStringCreateWithUTF8CString(userScriptTestProperty);
@@ -215,7 +215,7 @@
         });
     }];
     
-    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
+    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
     
     [wkView.browsingContextController loadHTMLString:@"" baseURL:nil];
     
@@ -225,7 +225,7 @@
 TEST_F(WebKit2UserContentTest, RemoveAllUserScripts)
 {
     testFinished = false;
-    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil whitelistedURLPatterns:nil blacklistedURLPatterns:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
+    [browsingContextGroup addUserScript:[NSString stringWithFormat:@"%s = true;", userScriptTestProperty] baseURL:nil includeMatchPatternStrings:nil excludeMatchPatternStrings:nil injectionTime:kWKInjectAtDocumentStart mainFrameOnly:YES];
     
     WKView *wkView = [[WKView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) processGroup:processGroup browsingContextGroup:browsingContextGroup];
     WKStringRef userScriptTestPropertyString = WKStringCreateWithUTF8CString(userScriptTestProperty);

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to