Changeset 162097 in webkit

Timestamp:

Jan 15, 2014 3:26:19 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

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):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/APIArray.cpp (modified) (1 diff)
• Shared/APIArray.h (modified) (1 diff)
• UIProcess/WebPageGroup.cpp (modified) (3 diffs)
• WebProcess/InjectedBundle/InjectedBundle.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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):
+
 2014-01-10  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/WebKit2/Shared/APIArray.cpp

@@ -52 +52 @@
 }
 
+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;
+}
+
 Array::Array(Vector<RefPtr<Object>> elements)
     : m_elements(std::move(elements))

trunk/Source/WebKit2/Shared/APIArray.h

@@ -55 +55 @@
     static PassRefPtr<Array> create(Vector<RefPtr<Object>> elements);
     static PassRefPtr<Array> createStringArray(const Vector<WTF::String>&);
+    Vector<WTF::String> toStringVector();
 
     virtual ~Array();

trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp

@@ -135 +135 @@
 }
 
-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;
-}
-
 void WebPageGroup::addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserStyleLevel level)
 {
@@ -160 +140 @@
         return;
 
-    WebCore::UserStyleSheet userStyleSheet = WebCore::UserStyleSheet(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), toStringVector(whitelist), toStringVector(blacklist), injectedFrames, level);
+    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);
 
     m_data.userStyleSheets.append(userStyleSheet);
@@ -171 +151 @@
         return;
 
-    WebCore::UserScript userScript = WebCore::UserScript(source, (baseURL.isEmpty() ? WebCore::blankURL() : WebCore::URL(WebCore::URL(), baseURL)), toStringVector(whitelist), toStringVector(blacklist), injectionTime, injectedFrames);
+    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);
 
     m_data.userScripts.append(userScript);

trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp

@@ -473 +473 @@
 }
 
-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;
-}
-
 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)
 {
     // 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.
-    PageGroup::pageGroup(pageGroup->identifier())->addUserScriptToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), toStringVector(whitelist), toStringVector(blacklist), injectionTime, injectedFrames);
+    PageGroup::pageGroup(pageGroup->identifier())->addUserScriptToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectionTime, injectedFrames);
 }
 
@@ -499 +482 @@
 {
     // 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.
-    PageGroup::pageGroup(pageGroup->identifier())->addUserStyleSheetToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), toStringVector(whitelist), toStringVector(blacklist), injectedFrames);
+    PageGroup::pageGroup(pageGroup->identifier())->addUserStyleSheetToWorld(scriptWorld->coreWorld(), source, URL(URL(), url), whitelist ? whitelist->toStringVector() : Vector<String>(), blacklist ? blacklist->toStringVector() : Vector<String>(), injectedFrames);
 }