Changeset 159123 in webkit

Timestamp:

Nov 12, 2013 10:32:53 AM (10 years ago)

Author:

andersca@apple.com

Message:

Add ImmutableArray::createStringArray
​https://bugs.webkit.org/show_bug.cgi?id=124210

Reviewed by Andreas Kling.

Creating an ImmutableArray of WebStrings is a common operation, so add a
helper function to ImmutableArray that does this from a Vector of Strings.

• Shared/ImmutableArray.cpp:

(WebKit::ImmutableArray::createStringArray):

• Shared/ImmutableArray.h:
• Shared/ImmutableDictionary.cpp:

(WebKit::ImmutableDictionary::keys):

• Shared/WebOpenPanelParameters.cpp:

(WebKit::WebOpenPanelParameters::acceptMIMETypes):
(WebKit::WebOpenPanelParameters::selectedFileNames):

• UIProcess/Plugins/WebPluginSiteDataManager.cpp:

(WebKit::WebPluginSiteDataManager::didGetSitesWithData):

• UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::didGetHostnamesWithCookies):

• UIProcess/WebMediaCacheManagerProxy.cpp:

(WebKit::WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache):

• WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:

(WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/ImmutableArray.cpp (modified) (1 diff)
• Shared/ImmutableArray.h (modified) (2 diffs)
• Shared/ImmutableDictionary.cpp (modified) (1 diff)
• Shared/WebOpenPanelParameters.cpp (modified) (2 diffs)
• UIProcess/Plugins/WebPluginSiteDataManager.cpp (modified) (1 diff)
• UIProcess/WebCookieManagerProxy.cpp (modified) (1 diff)
• UIProcess/WebMediaCacheManagerProxy.cpp (modified) (1 diff)
• WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-12  Anders Carlsson  <andersca@apple.com>
+
+        Add ImmutableArray::createStringArray
+        https://bugs.webkit.org/show_bug.cgi?id=124210
+
+        Reviewed by Andreas Kling.
+
+        Creating an ImmutableArray of WebStrings is a common operation, so add a 
+        helper function to ImmutableArray that does this from a Vector of Strings.
+
+        * Shared/ImmutableArray.cpp:
+        (WebKit::ImmutableArray::createStringArray):
+        * Shared/ImmutableArray.h:
+        * Shared/ImmutableDictionary.cpp:
+        (WebKit::ImmutableDictionary::keys):
+        * Shared/WebOpenPanelParameters.cpp:
+        (WebKit::WebOpenPanelParameters::acceptMIMETypes):
+        (WebKit::WebOpenPanelParameters::selectedFileNames):
+        * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+        (WebKit::WebPluginSiteDataManager::didGetSitesWithData):
+        * UIProcess/WebCookieManagerProxy.cpp:
+        (WebKit::WebCookieManagerProxy::didGetHostnamesWithCookies):
+        * UIProcess/WebMediaCacheManagerProxy.cpp:
+        (WebKit::WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache):
+        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+        (WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage):
+
 2013-11-12  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/Shared/ImmutableArray.cpp

@@ -27 +27 @@
 #include "ImmutableArray.h"
 
+#include "WebString.h"
+
 namespace WebKit {
+
+PassRefPtr<ImmutableArray> ImmutableArray::createStringArray(const Vector<String>& strings)
+{
+    Vector<RefPtr<APIObject>> elements;
+    elements.reserveInitialCapacity(strings.size());
+
+    for (const auto& string : strings)
+        elements.uncheckedAppend(WebString::create(string));
+
+    return adopt(elements);
+}
 
 ImmutableArray::ImmutableArray()

trunk/Source/WebKit2/Shared/ImmutableArray.h

@@ -28 +28 @@
 
 #include "APIObject.h"
+#include <wtf/Forward.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/Vector.h>
@@ -55 +56 @@
         return adoptRef(new ImmutableArray(entries));
     }
+
+    static PassRefPtr<ImmutableArray> createStringArray(const Vector<String>&);
 
     virtual ~ImmutableArray();

trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp

@@ -50 +50 @@
         return ImmutableArray::create();
 
-    Vector<RefPtr<APIObject>> vector;
-    vector.reserveInitialCapacity(m_map.size());
+    Vector<RefPtr<APIObject>> keys;
+    keys.reserveInitialCapacity(m_map.size());
 
-    MapType::const_iterator::Keys it = m_map.begin().keys();
-    MapType::const_iterator::Keys end = m_map.end().keys();
-    for (; it != end; ++it)
-        vector.uncheckedAppend(WebString::create(*it));
+    for (const auto& key : m_map.keys())
+        keys.uncheckedAppend(WebString::create(key));
 
-    return ImmutableArray::adopt(vector);
+    return ImmutableArray::adopt(keys);
 }
 

trunk/Source/WebKit2/Shared/WebOpenPanelParameters.cpp

@@ -52 +52 @@
 PassRefPtr<ImmutableArray> WebOpenPanelParameters::acceptMIMETypes() const
 {
-    Vector<RefPtr<APIObject>> vector;
-    vector.reserveInitialCapacity(m_settings.acceptMIMETypes.size());
-
-    for (const auto& mimeType : m_settings.acceptMIMETypes)
-        vector.uncheckedAppend(WebString::create(mimeType));
-
-    return ImmutableArray::adopt(vector);
+    return ImmutableArray::createStringArray(m_settings.acceptMIMETypes);
 }
 
@@ -69 +63 @@
 
 PassRefPtr<ImmutableArray> WebOpenPanelParameters::selectedFileNames() const
-{    
-    Vector<RefPtr<APIObject>> vector;
-    vector.reserveInitialCapacity(m_settings.selectedFiles.size());
-
-    for (const auto& selectedFile : m_settings.selectedFiles)
-        vector.uncheckedAppend(WebString::create(selectedFile));
-
-    return ImmutableArray::adopt(vector);
+{
+    return ImmutableArray::createStringArray(m_settings.selectedFiles);
 }
 

trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp

@@ -166 +166 @@
     }
 
-    Vector<RefPtr<APIObject>> sitesArray;
-    sitesArray.reserveInitialCapacity(sites.size());
-
-    for (const auto& site : sites)
-        sitesArray.uncheckedAppend(WebString::create(site));
-
-    callback->performCallbackWithReturnValue(ImmutableArray::adopt(sitesArray).get());
+    callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(sites).get());
 }
 

trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp

@@ -116 +116 @@
     }
 
-    Vector<RefPtr<APIObject>> hostnameStrings;
-    hostnameStrings.reserveInitialCapacity(hostnames.size());
-
-    for (const auto& hostname : hostnames)
-        hostnameStrings.uncheckedAppend(WebString::create(hostname));
-
-    callback->performCallbackWithReturnValue(ImmutableArray::adopt(hostnameStrings).get());
+    callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(hostnames).get());
 }
 

trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp

@@ -99 +99 @@
     }
 
-    Vector<RefPtr<APIObject>> hostnamesArray;
-    hostnamesArray.reserveInitialCapacity(hostnames.size());
-
-    for (const auto& hostname : hostnames)
-        hostnamesArray.uncheckedAppend(WebString::create(hostname));
-
-    callback->performCallbackWithReturnValue(ImmutableArray::adopt(hostnamesArray).get());
+    callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(hostnames).get());
 }
 

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

@@ -342 +342 @@
         return;
 
-    Vector<RefPtr<APIObject>> featureStrings;
-    featureStrings.reserveInitialCapacity(features.size());
-
-    for (const auto& feature : features)
-        featureStrings.uncheckedAppend(WebString::create(feature));
-
-    return m_client.featuresUsedInPage(toAPI(page), toAPI(ImmutableArray::adopt(featureStrings).get()), m_client.clientInfo);
+    return m_client.featuresUsedInPage(toAPI(page), toAPI(ImmutableArray::createStringArray(features).get()), m_client.clientInfo);
 }