<!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>[182378] trunk/Source</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/182378">182378</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-06 00:21:21 -0700 (Mon, 06 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
UserScript, UserStyleSheet constructors should take in Vector<String> rvalue references
https://bugs.webkit.org/show_bug.cgi?id=143411
Reviewed by Darin Adler.
Have the UserScript and UserStyleSheet constructors take in Vector<String>
rvalue references for the whitelist and blacklist parameters. Both classes
store these Vector<String> objects, so the referenced objects can simply be
moved into the member variable.
Because the constructor is now demanding an rvalue, it's up to the caller
to move in the desired object if possible, or create an explicit copy
otherwise.
* page/UserScript.h:
(WebCore::UserScript::UserScript):
* page/UserStyleSheet.h:
(WebCore::UserStyleSheet::UserStyleSheet):
Source/WebKit2:
UserScript, UserStyleSheet constructors should take in Vector<String> rvalues
https://bugs.webkit.org/show_bug.cgi?id=143411
Reviewed by Darin Adler.
Move the whitelist and blacklist Vector<String> objects into the
UserScript and UserStyleSheet constructors in ArgumentCoder<T>::decode
functions.
* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<UserStyleSheet>::decode):
(IPC::ArgumentCoder<UserScript>::decode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageUserScripth">trunk/Source/WebCore/page/UserScript.h</a></li>
<li><a href="#trunkSourceWebCorepageUserStyleSheeth">trunk/Source/WebCore/page/UserStyleSheet.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182377 => 182378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-06 05:24:21 UTC (rev 182377)
+++ trunk/Source/WebCore/ChangeLog 2015-04-06 07:21:21 UTC (rev 182378)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-06 Žan Doberšek <zdobersek@igalia.com>
+
+ UserScript, UserStyleSheet constructors should take in Vector<String> rvalue references
+ https://bugs.webkit.org/show_bug.cgi?id=143411
+
+ Reviewed by Darin Adler.
+
+ Have the UserScript and UserStyleSheet constructors take in Vector<String>
+ rvalue references for the whitelist and blacklist parameters. Both classes
+ store these Vector<String> objects, so the referenced objects can simply be
+ moved into the member variable.
+
+ Because the constructor is now demanding an rvalue, it's up to the caller
+ to move in the desired object if possible, or create an explicit copy
+ otherwise.
+
+ * page/UserScript.h:
+ (WebCore::UserScript::UserScript):
+ * page/UserStyleSheet.h:
+ (WebCore::UserStyleSheet::UserStyleSheet):
+
</ins><span class="cx"> 2015-04-05 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [Content Filtering] Only pass http(s) requests to -[NEFilterSource willSendRequest:...]
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserScript.h (182377 => 182378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserScript.h 2015-04-06 05:24:21 UTC (rev 182377)
+++ trunk/Source/WebCore/page/UserScript.h 2015-04-06 07:21:21 UTC (rev 182378)
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UserScript(const String& source, const URL& url, const Vector<String>& whitelist, const Vector<String>& blacklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames)
</del><ins>+ UserScript(const String& source, const URL& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserScriptInjectionTime injectionTime, UserContentInjectedFrames injectedFrames)
</ins><span class="cx"> : m_source(source)
</span><span class="cx"> , m_url(url)
</span><del>- , m_whitelist(whitelist)
- , m_blacklist(blacklist)
</del><ins>+ , m_whitelist(WTF::move(whitelist))
+ , m_blacklist(WTF::move(blacklist))
</ins><span class="cx"> , m_injectionTime(injectionTime)
</span><span class="cx"> , m_injectedFrames(injectedFrames)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorepageUserStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/UserStyleSheet.h (182377 => 182378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/UserStyleSheet.h 2015-04-06 05:24:21 UTC (rev 182377)
+++ trunk/Source/WebCore/page/UserStyleSheet.h 2015-04-06 07:21:21 UTC (rev 182378)
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- UserStyleSheet(const String& source, const URL& url, const Vector<String>& whitelist, const Vector<String>& blacklist, UserContentInjectedFrames injectedFrames, UserStyleLevel level)
</del><ins>+ UserStyleSheet(const String& source, const URL& url, Vector<String>&& whitelist, Vector<String>&& blacklist, UserContentInjectedFrames injectedFrames, UserStyleLevel level)
</ins><span class="cx"> : m_source(source)
</span><span class="cx"> , m_url(url)
</span><del>- , m_whitelist(whitelist)
- , m_blacklist(blacklist)
</del><ins>+ , m_whitelist(WTF::move(whitelist))
+ , m_blacklist(WTF::move(blacklist))
</ins><span class="cx"> , m_injectedFrames(injectedFrames)
</span><span class="cx"> , m_level(level)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182377 => 182378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-06 05:24:21 UTC (rev 182377)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-06 07:21:21 UTC (rev 182378)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-04-06 Žan Doberšek <zdobersek@igalia.com>
+
+ UserScript, UserStyleSheet constructors should take in Vector<String> rvalues
+ https://bugs.webkit.org/show_bug.cgi?id=143411
+
+ Reviewed by Darin Adler.
+
+ Move the whitelist and blacklist Vector<String> objects into the
+ UserScript and UserStyleSheet constructors in ArgumentCoder<T>::decode
+ functions.
+
+ * Shared/WebCoreArgumentCoders.cpp:
+ (IPC::ArgumentCoder<UserStyleSheet>::decode):
+ (IPC::ArgumentCoder<UserScript>::decode):
+
</ins><span class="cx"> 2015-04-05 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Spins seen in WKSetApplicationInformationItem, so it should not be called on the main thread
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (182377 => 182378)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-06 05:24:21 UTC (rev 182377)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-06 07:21:21 UTC (rev 182378)
</span><span class="lines">@@ -1427,7 +1427,7 @@
</span><span class="cx"> if (!decoder.decodeEnum(level))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- userStyleSheet = UserStyleSheet(source, url, whitelist, blacklist, injectedFrames, level);
</del><ins>+ userStyleSheet = UserStyleSheet(source, url, WTF::move(whitelist), WTF::move(blacklist), injectedFrames, level);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1467,7 +1467,7 @@
</span><span class="cx"> if (!decoder.decodeEnum(injectedFrames))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- userScript = UserScript(source, url, whitelist, blacklist, injectionTime, injectedFrames);
</del><ins>+ userScript = UserScript(source, url, WTF::move(whitelist), WTF::move(blacklist), injectionTime, injectedFrames);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>