<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169000] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169000">169000</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-17 16:24:34 -0700 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserScripth">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168999 => 169000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-17 22:31:02 UTC (rev 168999)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-17 23:24:34 UTC (rev 169000)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-05-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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-17 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133033
</span><span class="cx"> <rdar://problem/16830143>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (168999 => 169000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-05-17 22:31:02 UTC (rev 168999)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2014-05-17 23:24:34 UTC (rev 169000)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "WebUserContentControllerProxy.h"
</span><span class="cx"> #import "_WKScriptWorld.h"
</span><span class="cx"> #import <WebCore/UserScript.h>
</span><ins>+#import <wtf/text/StringBuilder.h>
</ins><span class="cx">
</span><span class="cx"> @implementation WKUserContentController {
</span><span class="cx"> RetainPtr<NSMutableArray> _userScripts;
</span><span class="lines">@@ -71,7 +72,12 @@
</span><span class="cx"> {
</span><span class="cx"> [_userScripts addObject:userScript];
</span><span class="cx">
</span><del>- _userContentControllerProxy->addUserScript(WebCore::UserScript { userScript->_source.get(), WebCore::blankURL(), { }, { }, toWebCoreUserScriptInjectionTime(userScript->_injectionTime), userScript->_forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames });
</del><ins>+ 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 });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeAllUserScripts
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h (168999 => 169000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h 2014-05-17 22:31:02 UTC (rev 168999)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.h 2014-05-17 23:24:34 UTC (rev 169000)
</span><span class="lines">@@ -44,13 +44,6 @@
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><span class="cx"> @interface WKUserScript : NSObject <NSCopying>
</span><span class="cx">
</span><del>-/*! @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;
-
</del><span class="cx"> /* @abstract The script source code. */
</span><span class="cx"> @property (nonatomic, readonly) NSString *source;
</span><span class="cx">
</span><span class="lines">@@ -60,6 +53,13 @@
</span><span class="cx"> /* @abstract Whether the script should be injected into all frames or just the main frame. */
</span><span class="cx"> @property (nonatomic, readonly, getter=isForMainFrameOnly) BOOL forMainFrameOnly;
</span><span class="cx">
</span><ins>+/*! @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;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>