Title: [271529] trunk/Source/WebKit
Revision
271529
Author
[email protected]
Date
2021-01-15 12:33:47 -0800 (Fri, 15 Jan 2021)

Log Message

Remove non-inclusively named WKBrowsingContextGroup SPI
https://bugs.webkit.org/show_bug.cgi?id=220604

Patch by Alex Christensen <[email protected]> on 2021-01-15
Reviewed by Anders Carlsson.

Once rdar://problem/73167624 has been integrated, we can remove the old SPI, which has been replaced in r263099

* UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
* UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
(-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Deleted.
(-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Deleted.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (271528 => 271529)


--- trunk/Source/WebKit/ChangeLog	2021-01-15 20:22:41 UTC (rev 271528)
+++ trunk/Source/WebKit/ChangeLog	2021-01-15 20:33:47 UTC (rev 271529)
@@ -1,3 +1,17 @@
+2021-01-15  Alex Christensen  <[email protected]>
+
+        Remove non-inclusively named WKBrowsingContextGroup SPI
+        https://bugs.webkit.org/show_bug.cgi?id=220604
+
+        Reviewed by Anders Carlsson.
+
+        Once rdar://problem/73167624 has been integrated, we can remove the old SPI, which has been replaced in r263099
+
+        * UIProcess/API/Cocoa/WKBrowsingContextGroup.h:
+        * UIProcess/API/Cocoa/WKBrowsingContextGroup.mm:
+        (-[WKBrowsingContextGroup addUserStyleSheet:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:mainFrameOnly:]): Deleted.
+        (-[WKBrowsingContextGroup addUserScript:baseURL:whitelistedURLPatterns:blacklistedURLPatterns:injectionTime:mainFrameOnly:]): Deleted.
+
 2021-01-15  Chris Dumez  <[email protected]>
 
         [GPUProcess] Improve the GPUProcess' memory pressure handler

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h (271528 => 271529)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h	2021-01-15 20:22:41 UTC (rev 271528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.h	2021-01-15 20:33:47 UTC (rev 271529)
@@ -35,12 +35,10 @@
 
 /* User Content */
 
-- (void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist mainFrameOnly:(BOOL)mainFrameOnly WK_API_DEPRECATED_WITH_REPLACEMENT("addUserStyleSheet:baseURL:includeMatchPatternStrings:excludeMatchPatternStrings:mainFrameOnly:", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
 - (void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings mainFrameOnly:(BOOL)mainFrameOnly;
 
 - (void)removeAllUserStyleSheets;
 
-- (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly WK_API_DEPRECATED_WITH_REPLACEMENT("addUserScript:baseURL:includeMatchPatternStrings:excludeMatchPatternStrings:injectionTime:mainFrameOnly:", macos(10.10, WK_MAC_TBA), ios(8.0, WK_IOS_TBA));
 - (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly;
 - (void)removeAllUserScripts;
 

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm (271528 => 271529)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm	2021-01-15 20:22:41 UTC (rev 271528)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKBrowsingContextGroup.mm	2021-01-15 20:33:47 UTC (rev 271529)
@@ -128,11 +128,6 @@
     return WebKit::toAPI(&API::Array::create(WTFMove(strings)).leakRef());
 }
 
--(void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist mainFrameOnly:(BOOL)mainFrameOnly
-{
-    [self addUserStyleSheet:source baseURL:baseURL includeMatchPatternStrings:whitelist excludeMatchPatternStrings:blacklist mainFrameOnly:mainFrameOnly];
-}
-
 - (void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings mainFrameOnly:(BOOL)mainFrameOnly
 {
     if (!source)
@@ -152,11 +147,6 @@
     WKPageGroupRemoveAllUserStyleSheets(WebKit::toAPI(_pageGroup.get()));
 }
 
-- (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly
-{
-    [self addUserScript:source baseURL:baseURL includeMatchPatternStrings:whitelist excludeMatchPatternStrings:blacklist injectionTime:injectionTime mainFrameOnly:mainFrameOnly];
-}
-
 - (void)addUserScript:(NSString *)source baseURL:(NSURL *)baseURL includeMatchPatternStrings:(NSArray<NSString *> *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray<NSString *> *)excludeMatchPatternStrings injectionTime:(_WKUserScriptInjectionTime)injectionTime mainFrameOnly:(BOOL)mainFrameOnly
 {
     if (!source)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to