Title: [199620] trunk/Source/WebKit2
- Revision
- 199620
- Author
- [email protected]
- Date
- 2016-04-15 21:29:32 -0700 (Fri, 15 Apr 2016)
Log Message
Need a way to specify a script name to show in the inspector for scripts injected via WKUserScript
<rdar://problem/25626662>
https://bugs.webkit.org/show_bug.cgi?id=156653
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/WKUserScript.mm:
(-[WKUserScript _initWithSource:injectionTime:forMainFrameOnly:legacyWhitelist:legacyBlacklist:associatedURL:userContentWorld:]):
* UIProcess/API/Cocoa/WKUserScriptPrivate.h:
Add a new initializer that takes an associate URL that is used to represent the user script.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (199619 => 199620)
--- trunk/Source/WebKit2/ChangeLog 2016-04-16 02:25:56 UTC (rev 199619)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-16 04:29:32 UTC (rev 199620)
@@ -1,3 +1,16 @@
+2016-04-15 Sam Weinig <[email protected]>
+
+ Need a way to specify a script name to show in the inspector for scripts injected via WKUserScript
+ <rdar://problem/25626662>
+ https://bugs.webkit.org/show_bug.cgi?id=156653
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKUserScript.mm:
+ (-[WKUserScript _initWithSource:injectionTime:forMainFrameOnly:legacyWhitelist:legacyBlacklist:associatedURL:userContentWorld:]):
+ * UIProcess/API/Cocoa/WKUserScriptPrivate.h:
+ Add a new initializer that takes an associate URL that is used to represent the user script.
+
2016-04-15 Darin Adler <[email protected]>
Reduce use of Deprecated::ScriptXXX classes
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm (199619 => 199620)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-04-16 02:25:56 UTC (rev 199619)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-04-16 04:29:32 UTC (rev 199620)
@@ -83,6 +83,16 @@
return self;
}
+- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray *)legacyWhitelist legacyBlacklist:(NSArray *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld
+{
+ if (!(self = [super init]))
+ return nil;
+
+ API::Object::constructInWrapper<API::UserScript>(self, WebCore::UserScript { WTF::String(source), WebCore::URL(associatedURL), API::toStringVector(legacyWhitelist), API::toStringVector(legacyBlacklist), API::toWebCoreUserScriptInjectionTime(injectionTime), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames }, *userContentWorld->_userContentWorld);
+
+ return self;
+}
+
- (_WKUserContentWorld *)_userContentWorld
{
return API::wrapper(_userScript->userContentWorld());
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h (199619 => 199620)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2016-04-16 02:25:56 UTC (rev 199619)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2016-04-16 04:29:32 UTC (rev 199620)
@@ -34,6 +34,7 @@
@interface WKUserScript (WKPrivate)
- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, readonly) _WKUserContentWorld *_userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
