Changeset 169057 in webkit

Timestamp:

May 19, 2014, 1:05:16 PM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r169000.

Location:

branches/safari-538.34.5-branch/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKUserContentController.mm (modified) (2 diffs)
• UIProcess/API/Cocoa/WKUserScript.h (modified) (2 diffs)

branches/safari-538.34.5-branch/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-05-19  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r169000
+
+    2014-05-17  Anders Carlsson  <andersca@apple.com>
+
+            Give user scripts custom URLs
+            https://bugs.webkit.org/show_bug.cgi?id=133035
+
+            Reviewed by Beth Dakin.
+
+            * UIProcess/API/Cocoa/WKUserContentController.mm:
+            (-[WKUserContentController addUserScript:]):
+            Create a user-script:<number> URL for user scripts.
+
+            * UIProcess/API/Cocoa/WKUserScript.h:
+            Move the init method after the properties.
+
 2014-05-19  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm

@@ -33 +33 @@
 #import "_WKScriptWorld.h"
 #import <WebCore/UserScript.h>
+#import <wtf/text/StringBuilder.h>
 
 @implementation WKUserContentController {
@@ -72 +73 @@
     [_userScripts addObject:userScript];
 
-    _userContentControllerProxy->addUserScript(WebCore::UserScript { userScript->_source.get(), WebCore::blankURL(), { }, { }, toWebCoreUserScriptInjectionTime(userScript->_injectionTime), userScript->_forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames });
+    StringBuilder urlStringBuilder;
+    urlStringBuilder.append("user-script:");
+    urlStringBuilder.appendNumber([_userScripts count]);
+
+    WebCore::URL url { WebCore::URL { }, urlStringBuilder.toString() };
+    _userContentControllerProxy->addUserScript(WebCore::UserScript { userScript->_source.get(), url, { }, { }, toWebCoreUserScriptInjectionTime(userScript->_injectionTime), userScript->_forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames });
 }
 

branches/safari-538.34.5-branch/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h

@@ -45 +45 @@
 @interface WKUserScript : NSObject <NSCopying>
 
-/*! @abstract Returns an initialized user script that can be added to a @link WKUserContentController @/link.
- @param source The script source.
- @param injectionTime When the script should be injected.
- @param forMainFrameOnly Whether the script should be injected into all frames or just the main frame.
- */
-- (instancetype)initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly;
-
 /* @abstract The script source code. */
 @property (nonatomic, readonly) NSString *source;
@@ -61 +54 @@
 @property (nonatomic, readonly, getter=isForMainFrameOnly) BOOL forMainFrameOnly;
 
+/*! @abstract Returns an initialized user script that can be added to a @link WKUserContentController @/link.
+ @param source The script source.
+ @param injectionTime When the script should be injected.
+ @param forMainFrameOnly Whether the script should be injected into all frames or just the main frame.
+ */
+- (instancetype)initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly;
+
 @end