Title: [267397] trunk/Source/WebKitLegacy/mac
- Revision
- 267397
- Author
- [email protected]
- Date
- 2020-09-21 22:07:13 -0700 (Mon, 21 Sep 2020)
Log Message
Remove deprecated script and stylesheet injection SPI, replaced with more inclusively-named SPI
https://bugs.webkit.org/show_bug.cgi?id=214936
Patch by Alex Christensen <[email protected]> on 2020-09-21
Reviewed by Youenn Fablet.
rdar://64376341 tracks the adoption of the replacement. Once that is done, we can remove the old SPI.
* WebView/WebView.mm:
(+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:]): Deleted.
(+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]): Deleted.
(+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:]): Deleted.
(+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]): Deleted.
* WebView/WebViewPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (267396 => 267397)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-22 05:03:08 UTC (rev 267396)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-09-22 05:07:13 UTC (rev 267397)
@@ -1,3 +1,19 @@
+2020-09-21 Alex Christensen <[email protected]>
+
+ Remove deprecated script and stylesheet injection SPI, replaced with more inclusively-named SPI
+ https://bugs.webkit.org/show_bug.cgi?id=214936
+
+ Reviewed by Youenn Fablet.
+
+ rdar://64376341 tracks the adoption of the replacement. Once that is done, we can remove the old SPI.
+
+ * WebView/WebView.mm:
+ (+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:]): Deleted.
+ (+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]): Deleted.
+ (+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:]): Deleted.
+ (+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]): Deleted.
+ * WebView/WebViewPrivate.h:
+
2020-09-20 Darin Adler <[email protected]>
Next step towards eliminating deprecated legacy positions
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebView.mm (267396 => 267397)
--- trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-09-22 05:03:08 UTC (rev 267396)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebView.mm 2020-09-22 05:07:13 UTC (rev 267397)
@@ -4793,21 +4793,6 @@
#endif
}
-+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
- whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist
- injectionTime:(WebUserScriptInjectionTime)injectionTime
-{
- [WebView _addUserScriptToGroup:groupName world:world source:source url:url whitelist:whitelist blacklist:blacklist injectionTime:injectionTime injectedFrames:WebInjectInAllFrames];
-}
-
-+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
- whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist
- injectionTime:(WebUserScriptInjectionTime)injectionTime
- injectedFrames:(WebUserContentInjectedFrames)injectedFrames
-{
- [WebView _addUserScriptToGroup:groupName world:world source:source url:url includeMatchPatternStrings:whitelist excludeMatchPatternStrings:blacklist injectionTime:injectionTime injectedFrames:injectedFrames];
-}
-
+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url includeMatchPatternStrings:(NSArray *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray *)excludeMatchPatternStrings injectionTime:(WebUserScriptInjectionTime)injectionTime injectedFrames:(WebUserContentInjectedFrames)injectedFrames
{
String group(groupName);
@@ -4823,19 +4808,6 @@
viewGroup->userContentController().addUserScript(*core(world), WTFMove(userScript));
}
-+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
- whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist
-{
- [WebView _addUserStyleSheetToGroup:groupName world:world source:source url:url whitelist:whitelist blacklist:blacklist injectedFrames:WebInjectInAllFrames];
-}
-
-+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
- whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist
- injectedFrames:(WebUserContentInjectedFrames)injectedFrames
-{
- [WebView _addUserStyleSheetToGroup:groupName world:world source:source url:url includeMatchPatternStrings:whitelist excludeMatchPatternStrings:blacklist injectedFrames:injectedFrames];
-}
-
+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url includeMatchPatternStrings:(NSArray *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray *)excludeMatchPatternStrings injectedFrames:(WebUserContentInjectedFrames)injectedFrames
{
String group(groupName);
Modified: trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h (267396 => 267397)
--- trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2020-09-22 05:03:08 UTC (rev 267396)
+++ trunk/Source/WebKitLegacy/mac/WebView/WebViewPrivate.h 2020-09-22 05:07:13 UTC (rev 267397)
@@ -803,13 +803,6 @@
// Removes all allow list entries created with _addOriginAccessAllowListEntryWithSourceOrigin.
+ (void)_resetOriginAccessAllowLists;
-// FIXME: The following two methods are deprecated in favor of the overloads below that take the WebUserContentInjectedFrames argument. https://bugs.webkit.org/show_bug.cgi?id=41800.
-+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectionTime:(WebUserScriptInjectionTime)injectionTime __attribute__((deprecated("use _addUserScriptToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectionTime:injectedFrames:")));
-+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist __attribute__((deprecated("use _addUserStyleSheetToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectedFrames:")));
-
-+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectionTime:(WebUserScriptInjectionTime)injectionTime injectedFrames:(WebUserContentInjectedFrames)injectedFrames __attribute__((deprecated("use _addUserScriptToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectionTime:injectedFrames:")));
-+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url whitelist:(NSArray *)whitelist blacklist:(NSArray *)blacklist injectedFrames:(WebUserContentInjectedFrames)injectedFrames __attribute__((deprecated("use _addUserStyleSheetToGroup:world:source:url:includeMatchPatternStrings:excludeMatchPatternStrings:injectedFrames:")));
-
+ (void)_addUserScriptToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url includeMatchPatternStrings:(NSArray *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray *)excludeMatchPatternStrings injectionTime:(WebUserScriptInjectionTime)injectionTime injectedFrames:(WebUserContentInjectedFrames)injectedFrames;
+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url includeMatchPatternStrings:(NSArray *)includeMatchPatternStrings excludeMatchPatternStrings:(NSArray *)excludeMatchPatternStrings injectedFrames:(WebUserContentInjectedFrames)injectedFrames;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
