<!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>[162097] 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/162097">162097</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-15 15:26:19 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>toStringVector static function definition should not be redundant.
https://bugs.webkit.org/show_bug.cgi?id=126872.
Patch by Piotr Grad <p.grad@samsung.com> on 2014-01-15
Reviewed by Anders Carlsson.
toStringVector function was declared twice in InjectedBundle.cpp and WebPageGroup.cpp as static.
In order to remove redundant definition this function was moved into API::Array.
* Shared/APIArray.cpp:
(API::Array::toStringVector):
* Shared/APIArray.h:
* UIProcess/WebPageGroup.cpp:
(WebKit::WebPageGroup::addUserStyleSheet):
(WebKit::WebPageGroup::addUserScript):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::addUserScript):
(WebKit::InjectedBundle::addUserStyleSheet):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIArraycpp">trunk/Source/WebKit2/Shared/APIArray.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIArrayh">trunk/Source/WebKit2/Shared/APIArray.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageGroupcpp">trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162096 => 162097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-15 23:22:39 UTC (rev 162096)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-15 23:26:19 UTC (rev 162097)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-01-15 Piotr Grad <p.grad@samsung.com>
+
+ toStringVector static function definition should not be redundant.
+ https://bugs.webkit.org/show_bug.cgi?id=126872.
+
+ Reviewed by Anders Carlsson.
+
+ toStringVector function was declared twice in InjectedBundle.cpp and WebPageGroup.cpp as static.
+ In order to remove redundant definition this function was moved into API::Array.
+
+ * Shared/APIArray.cpp:
+ (API::Array::toStringVector):
+ * Shared/APIArray.h:
+ * UIProcess/WebPageGroup.cpp:
+ (WebKit::WebPageGroup::addUserStyleSheet):
+ (WebKit::WebPageGroup::addUserScript):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::addUserScript):
+ (WebKit::InjectedBundle::addUserStyleSheet):
+
</ins><span class="cx"> 2014-01-10 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r158369): Some pop-up windows open at incorrect size (affects GMail, theblaze.com)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIArraycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIArray.cpp (162096 => 162097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIArray.cpp 2014-01-15 23:22:39 UTC (rev 162096)
+++ trunk/Source/WebKit2/Shared/APIArray.cpp 2014-01-15 23:26:19 UTC (rev 162097)
</span><span class="lines">@@ -51,6 +51,20 @@
</span><span class="cx"> return create(std::move(elements));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Vector<WTF::String> Array::toStringVector()
+{
+ Vector<WTF::String> patternsVector;
+
+ size_t size = this->size();
+ if (!size)
+ return patternsVector;
+
+ patternsVector.reserveInitialCapacity(size);
+ for (const auto& entry : elementsOfType<API::String>())
+ patternsVector.uncheckedAppend(entry->string());
+ return patternsVector;
+}
+
</ins><span class="cx"> Array::Array(Vector<RefPtr<Object>> elements)
</span><span class="cx"> : m_elements(std::move(elements))
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIArray.h (162096 => 162097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIArray.h 2014-01-15 23:22:39 UTC (rev 162096)
+++ trunk/Source/WebKit2/Shared/APIArray.h 2014-01-15 23:26:19 UTC (rev 162097)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> static PassRefPtr<Array> create();
</span><span class="cx"> static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
</span><span class="cx"> static PassRefPtr<Array> createStringArray(const Vector<WTF::String>&);
</span><ins>+ Vector<WTF::String> toStringVector();
</ins><span class="cx">
</span><span class="cx"> virtual ~Array();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp (162096 => 162097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-01-15 23:22:39 UTC (rev 162096)
+++ trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp 2014-01-15 23:26:19 UTC (rev 162097)
</span><span class="lines">@@ -134,32 +134,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> toStringVector(API::Array* array)
-{
- Vector<String> patternVector;
- if (!array)
- return patternVector;
-
- size_t size = array->size();
- if (!size)
- return patternVector;
-
- patternVector.reserveInitialCapacity(size);
- for (size_t i = 0; i < size; ++i) {
- API::String* string = array->at<API::String>(i);
- ASSERT(string);
- patternVector.uncheckedAppend(string->string());
- }
-
- return patternVector;
-}
-
</del><span class="cx"> void WebPageGroup::addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserStyleLevel level)
</span><span class="cx"> {
</span><span class="cx"> if (source.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebCore::UserStyleSheet userStyleSheet = WebCore::UserStyleSheet(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), toStringVector(whitelist), toStringVector(blacklist), injectedFrames, level);
</del><ins>+ WebCore::UserStyleSheet userStyleSheet = WebCore::UserStyleSheet(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectedFrames, level);
</ins><span class="cx">
</span><span class="cx"> m_data.userStyleSheets.append(userStyleSheet);
</span><span class="cx"> sendToAllProcessesInGroup(Messages::WebPageGroupProxy::AddUserStyleSheet(userStyleSheet), m_data.pageGroupID);
</span><span class="lines">@@ -170,7 +150,7 @@
</span><span class="cx"> if (source.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- WebCore::UserScript userScript = WebCore::UserScript(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), toStringVector(whitelist), toStringVector(blacklist), injectionTime, injectedFrames);
</del><ins>+ WebCore::UserScript userScript = WebCore::UserScript(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames);
</ins><span class="cx">
</span><span class="cx"> m_data.userScripts.append(userScript);
</span><span class="cx"> sendToAllProcessesInGroup(Messages::WebPageGroupProxy::AddUserScript(userScript), m_data.pageGroupID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (162096 => 162097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-01-15 23:22:39 UTC (rev 162096)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2014-01-15 23:26:19 UTC (rev 162097)
</span><span class="lines">@@ -472,33 +472,16 @@
</span><span class="cx"> return ScriptController::processingUserGesture();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Vector<String> toStringVector(API::Array* patterns)
-{
- Vector<String> patternsVector;
-
- if (!patterns)
- return patternsVector;
-
- size_t size = patterns->size();
- if (!size)
- return patternsVector;
-
- patternsVector.reserveInitialCapacity(size);
- for (const auto& entry : patterns->elementsOfType<API::String>())
- patternsVector.uncheckedAppend(entry->string());
- return patternsVector;
-}
-
</del><span class="cx"> void InjectedBundle::addUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime injectionTime, WebCore::UserContentInjectedFrames injectedFrames)
</span><span class="cx"> {
</span><span class="cx"> // url is not from URL::string(), i.e. it has not already been parsed by URL, so we have to use the relative URL constructor for URL instead of the ParsedURLStringTag version.
</span><del>- PageGroup::pageGroup(pageGroup->identifier())->addUserScriptToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), toStringVector(whitelist), toStringVector(blacklist), injectionTime, injectedFrames);
</del><ins>+ PageGroup::pageGroup(pageGroup->identifier())->addUserScriptToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::addUserStyleSheet(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames)
</span><span class="cx"> {
</span><span class="cx"> // url is not from URL::string(), i.e. it has not already been parsed by URL, so we have to use the relative URL constructor for URL instead of the ParsedURLStringTag version.
</span><del>- PageGroup::pageGroup(pageGroup->identifier())->addUserStyleSheetToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), toStringVector(whitelist), toStringVector(blacklist), injectedFrames);
</del><ins>+ PageGroup::pageGroup(pageGroup->identifier())->addUserStyleSheetToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectedFrames);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::removeUserScript(WebPageGroupProxy* pageGroup, InjectedBundleScriptWorld* scriptWorld, const String& url)
</span></span></pre>
</div>
</div>
</body>
</html>