Rename ImmutableArray to API::Array
https://bugs.webkit.org/show_bug.cgi?id=124307
Reviewed by Andreas Kling.
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(ensureObjectStream):
(-[WKRemoteObjectDecoder initWithInterface:rootObjectDictionary:WebKit::]):
* Shared/API/c/WKArray.cpp:
(WKArrayGetTypeID):
(WKArrayCreate):
(WKArrayCreateAdoptingValues):
* Shared/API/c/WKContextMenuItem.cpp:
* Shared/API/c/WKDictionary.cpp:
(WKDictionaryCopyKeys):
* Shared/API/c/WKMutableArray.cpp:
(WKMutableArrayCreate):
* Shared/API/c/WKRenderObject.cpp:
(WKRenderObjectGetChildren):
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toImpl):
* Shared/API/c/mac/WKWebArchive.cpp:
(WKWebArchiveCopySubresources):
(WKWebArchiveCopySubframeArchives):
* Shared/APIArray.cpp: Renamed from Source/WebKit2/Shared/ImmutableArray.cpp.
(API::Array::create):
(API::Array::createStringArray):
(API::Array::Array):
(API::Array::~Array):
* Shared/APIArray.h: Renamed from Source/WebKit2/Shared/ImmutableArray.h.
* Shared/Cocoa/WKNSArray.h:
(wrapper):
* Shared/Cocoa/WKNSArray.mm:
(-[WKNSArray dealloc]):
(-[WKNSArray count]):
(-[WKNSArray objectAtIndex:]):
(-[WKNSArray API::]):
* Shared/ImmutableDictionary.cpp:
(WebKit::ImmutableDictionary::keys):
* Shared/ImmutableDictionary.h:
* Shared/SecurityOriginData.cpp:
(WebKit::performAPICallbackWithSecurityOriginDataVector):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebArchive.cpp:
(WebKit::WebArchive::create):
(WebKit::WebArchive::WebArchive):
(WebKit::WebArchive::subresources):
(WebKit::WebArchive::subframeArchives):
* Shared/WebArchive.h:
* Shared/WebContextMenuItem.cpp:
(WebKit::WebContextMenuItem::create):
(WebKit::WebContextMenuItem::submenuItemsAsImmutableArray):
* Shared/WebContextMenuItem.h:
* Shared/WebOpenPanelParameters.cpp:
(WebKit::WebOpenPanelParameters::acceptMIMETypes):
(WebKit::WebOpenPanelParameters::selectedFileNames):
* Shared/WebOpenPanelParameters.h:
* Shared/WebRenderLayer.cpp:
(WebKit::WebRenderLayer::create):
(WebKit::WebRenderLayer::createArrayFromLayerList):
(WebKit::WebRenderLayer::WebRenderLayer):
* Shared/WebRenderLayer.h:
(WebKit::WebRenderLayer::negativeZOrderList):
(WebKit::WebRenderLayer::normalFlowList):
(WebKit::WebRenderLayer::positiveZOrderList):
* Shared/WebRenderObject.cpp:
(WebKit::WebRenderObject::create):
(WebKit::WebRenderObject::WebRenderObject):
(WebKit::WebRenderObject::~WebRenderObject):
* Shared/WebRenderObject.h:
(WebKit::WebRenderObject::children):
(WebKit::WebRenderObject::elementClassNames):
* UIProcess/API/C/WKBackForwardListRef.cpp:
* UIProcess/API/C/WKOpenPanelParameters.cpp:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextGetInfoForInstalledPlugIns):
* UIProcess/API/Cocoa/WKBackForwardList.mm:
(-[WKBackForwardList backListWithLimit:]):
(-[WKBackForwardList forwardListWithLimit:]):
* UIProcess/API/mac/WKBrowsingContextGroup.mm:
(createWKArray):
* UIProcess/Notifications/WebNotificationManagerProxy.cpp:
(WebKit::WebNotificationManagerProxy::populateCopyOfNotificationPermissions):
(WebKit::WebNotificationManagerProxy::providerDidCloseNotifications):
(WebKit::WebNotificationManagerProxy::providerDidRemoveNotificationPolicies):
* UIProcess/Notifications/WebNotificationManagerProxy.h:
* UIProcess/Notifications/WebNotificationProvider.cpp:
(WebKit::WebNotificationProvider::clearNotifications):
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
(WebKit::PlugInAutoStartProvider::setAutoStartOriginsArray):
* UIProcess/Plugins/PlugInAutoStartProvider.h:
* UIProcess/Plugins/WebPluginSiteDataManager.cpp:
(WebKit::WebPluginSiteDataManager::didGetSitesWithData):
(WebKit::WebPluginSiteDataManager::clearSiteData):
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/StatisticsRequest.cpp:
(WebKit::StatisticsRequest::completedRequest):
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
(WebKit::WebBackForwardList::forwardListAsImmutableArrayWithLimit):
* UIProcess/WebBackForwardList.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::setPlugInAutoStartOrigins):
(WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
* UIProcess/WebContext.h:
* UIProcess/WebContextClient.cpp:
(WebKit::WebContextClient::plugInInformationBecameAvailable):
* UIProcess/WebContextClient.h:
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::didGetHostnamesWithCookies):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.cpp:
(WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
(WebKit::WebDatabaseManagerProxy::didGetDatabaseOrigins):
* UIProcess/WebFindClient.cpp:
(WebKit::WebFindMatchesClient::didFindStringMatches):
* UIProcess/WebFindClient.h:
* UIProcess/WebFrameProxy.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::didGetKeyValueStorageOrigins):
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebLoaderClient.cpp:
(WebKit::WebLoaderClient::didChangeBackForwardList):
* UIProcess/WebMediaCacheManagerProxy.cpp:
(WebKit::WebMediaCacheManagerProxy::didGetHostnamesWithMediaCache):
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebOpenPanelResultListenerProxy.cpp:
(WebKit::WebOpenPanelResultListenerProxy::chooseFiles):
* UIProcess/WebOpenPanelResultListenerProxy.h:
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageContextMenuClient.cpp:
(WebKit::WebPageContextMenuClient::getContextMenuFromProposedMenu):
(WebKit::WebPageContextMenuClient::showContextMenu):
* UIProcess/WebPageGroup.cpp:
(WebKit::toStringVector):
(WebKit::WebPageGroup::addUserStyleSheet):
(WebKit::WebPageGroup::addUserScript):
* UIProcess/WebPageGroup.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::relatedPages):
(WebKit::WebPageProxy::didFindStringMatches):
* UIProcess/WebPageProxy.h:
* UIProcess/WebResourceCacheManagerProxy.cpp:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleCopyOriginsWithApplicationCache):
* WebProcess/InjectedBundle/API/c/WKBundleBackForwardListItem.cpp:
* WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp:
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(contextMenuItems):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::originsWithApplicationCache):
(WebKit::toStringVector):
(WebKit::InjectedBundle::addUserScript):
(WebKit::InjectedBundle::addUserStyleSheet):
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.cpp:
(WebKit::InjectedBundleBackForwardListItem::children):
* WebProcess/InjectedBundle/InjectedBundleBackForwardListItem.h:
* WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp:
(WebKit::InjectedBundlePageContextMenuClient::getCustomMenuFromDefaultItems):
* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
(WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):
* WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
(WebKit::InjectedBundlePageFormClient::didAssociateFormControls):
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::featuresUsedInPage):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::findLargestFrameInFrameSet):
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::childFrames):
* WebProcess/WebPage/WebFrame.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::trackedRepaintRects):
* WebProcess/WebPage/WebPage.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159234 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp b/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp
index 3e061c1..f5e99d6 100644
--- a/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKBackForwardListRef.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WKBackForwardListRef.h"
+#include "APIArray.h"
#include "WebBackForwardList.h"
#include "WKAPICast.h"
diff --git a/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp b/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp
index 29ecf54..6013300 100644
--- a/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKOpenPanelParameters.cpp
@@ -27,7 +27,7 @@
#include "config.h"
#include "WKOpenPanelParameters.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "WKAPICast.h"
#include "WebOpenPanelParameters.h"
diff --git a/Source/WebKit2/UIProcess/API/C/WKPage.cpp b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
index 1e9dd71..a7ccaf1 100644
--- a/Source/WebKit2/UIProcess/API/C/WKPage.cpp
+++ b/Source/WebKit2/UIProcess/API/C/WKPage.cpp
@@ -27,6 +27,7 @@
#include "WKPage.h"
#include "WKPagePrivate.h"
+#include "APIArray.h"
#include "PrintInfo.h"
#include "WKAPICast.h"
#include "WKPluginInformation.h"
diff --git a/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm b/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
index 1c8857c0..98bd1a0 100644
--- a/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
+++ b/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
@@ -26,7 +26,7 @@
#import "config.h"
#import "WKContextPrivateMac.h"
-#import "ImmutableArray.h"
+#import "APIArray.h"
#import "ImmutableDictionary.h"
#import "PluginInfoStore.h"
#import "PluginInformation.h"
@@ -79,7 +79,7 @@
for (const auto& plugin: plugins)
pluginInfoDictionaries.uncheckedAppend(createPluginInformationDictionary(plugin));
- RefPtr<ImmutableArray> array = ImmutableArray::create(std::move(pluginInfoDictionaries));
+ RefPtr<API::Array> array = API::Array::create(std::move(pluginInfoDictionaries));
toImpl(contextRef)->ref();
dispatch_async(dispatch_get_main_queue(), ^() {
diff --git a/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm b/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm
index af6d332..eae8a71 100644
--- a/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm
+++ b/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.mm
@@ -84,7 +84,7 @@
- (NSArray *)backListWithLimit:(NSUInteger)limit
{
- RefPtr<ImmutableArray> list = reinterpret_cast<WebBackForwardList*>(&_list)->backListAsImmutableArrayWithLimit(limit);
+ RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->backListAsImmutableArrayWithLimit(limit);
if (!list)
return nil;
@@ -93,7 +93,7 @@
- (NSArray *)forwardListWithLimit:(NSUInteger)limit
{
- RefPtr<ImmutableArray> list = reinterpret_cast<WebBackForwardList*>(&_list)->forwardListAsImmutableArrayWithLimit(limit);
+ RefPtr<API::Array> list = reinterpret_cast<WebBackForwardList*>(&_list)->forwardListAsImmutableArrayWithLimit(limit);
if (!list)
return nil;
diff --git a/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm b/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm
index 15a4eb0..7e66312 100644
--- a/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm
+++ b/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextGroup.mm
@@ -27,7 +27,7 @@
#import "WKBrowsingContextGroup.h"
#import "WKBrowsingContextGroupPrivate.h"
-#import "ImmutableArray.h"
+#import "APIArray.h"
#import "WKArray.h"
#import "WKPageGroup.h"
#import "WKPreferences.h"
@@ -121,7 +121,7 @@
strings.uncheckedAppend(adoptRef(toImpl(WKStringCreateWithCFString((CFStringRef)entry))));
}
- return toAPI(ImmutableArray::create(std::move(strings)).leakRef());
+ return toAPI(API::Array::create(std::move(strings)).leakRef());
}
-(void)addUserStyleSheet:(NSString *)source baseURL:(NSURL *)baseURL whitelistedURLPatterns:(NSArray *)whitelist blacklistedURLPatterns:(NSArray *)blacklist mainFrameOnly:(BOOL)mainFrameOnly
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
index ec905a9..7f7d0d2 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "WebNotificationManagerProxy.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "ImmutableDictionary.h"
#include "WebContext.h"
#include "WebNotification.h"
@@ -93,7 +93,7 @@
return;
permissions.clear();
- RefPtr<ImmutableArray> knownOrigins = knownPermissions->keys();
+ RefPtr<API::Array> knownOrigins = knownPermissions->keys();
for (size_t i = 0; i < knownOrigins->size(); ++i) {
WebString* origin = knownOrigins->at<WebString>(i);
permissions.set(origin->string(), knownPermissions->get<WebBoolean>(origin->string())->value());
@@ -202,7 +202,7 @@
}
-void WebNotificationManagerProxy::providerDidCloseNotifications(ImmutableArray* globalNotificationIDs)
+void WebNotificationManagerProxy::providerDidCloseNotifications(API::Array* globalNotificationIDs)
{
HashMap<WebPageProxy*, Vector<uint64_t>> pageNotificationIDs;
@@ -240,7 +240,7 @@
context()->sendToAllProcesses(Messages::WebNotificationManager::DidUpdateNotificationDecision(origin->toString(), allowed));
}
-void WebNotificationManagerProxy::providerDidRemoveNotificationPolicies(ImmutableArray* origins)
+void WebNotificationManagerProxy::providerDidRemoveNotificationPolicies(API::Array* origins)
{
if (!context())
return;
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
index d800a50..8bda83e 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationManagerProxy.h
@@ -36,9 +36,12 @@
#include <wtf/PassRefPtr.h>
#include <wtf/text/StringHash.h>
+namespace API {
+class Array;
+}
+
namespace WebKit {
-class ImmutableArray;
class WebContext;
class WebPageProxy;
class WebSecurityOrigin;
@@ -61,9 +64,9 @@
void providerDidShowNotification(uint64_t notificationID);
void providerDidClickNotification(uint64_t notificationID);
- void providerDidCloseNotifications(ImmutableArray* notificationIDs);
+ void providerDidCloseNotifications(API::Array* notificationIDs);
void providerDidUpdateNotificationPolicy(const WebSecurityOrigin*, bool allowed);
- void providerDidRemoveNotificationPolicies(ImmutableArray* origins);
+ void providerDidRemoveNotificationPolicies(API::Array* origins);
using API::Object::ref;
using API::Object::deref;
diff --git a/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp b/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp
index 4c13d2d..cea7469 100644
--- a/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp
+++ b/Source/WebKit2/UIProcess/Notifications/WebNotificationProvider.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "WebNotificationProvider.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "ImmutableDictionary.h"
#include "WKAPICast.h"
#include "WebNotification.h"
@@ -71,7 +71,7 @@
for (const auto& notificationID : notificationIDs)
arrayIDs.uncheckedAppend(WebUInt64::create(notificationID));
- m_client.clearNotifications(toAPI(ImmutableArray::create(std::move(arrayIDs)).get()), m_client.clientInfo);
+ m_client.clearNotifications(toAPI(API::Array::create(std::move(arrayIDs)).get()), m_client.clientInfo);
}
void WebNotificationProvider::addNotificationManager(WebNotificationManagerProxy* manager)
diff --git a/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp b/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp
index fd0e1d9..1d1aba5 100644
--- a/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "PlugInAutoStartProvider.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "ImmutableDictionary.h"
#include "WebContext.h"
#include "WebContextClient.h"
@@ -131,7 +131,7 @@
m_context->sendToAllProcesses(Messages::WebProcess::ResetPlugInAutoStartOriginHashes(hashMap));
}
-void PlugInAutoStartProvider::setAutoStartOriginsArray(ImmutableArray& originList)
+void PlugInAutoStartProvider::setAutoStartOriginsArray(API::Array& originList)
{
m_autoStartOrigins.clear();
for (size_t i = 0, length = originList.size(); i < length; ++i) {
diff --git a/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h b/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h
index 87c81fe..a4b93ea 100644
--- a/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h
+++ b/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h
@@ -33,9 +33,12 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
+namespace API {
+class Array;
+}
+
namespace WebKit {
-class ImmutableArray;
class ImmutableDictionary;
class WebContext;
@@ -52,7 +55,7 @@
PassRefPtr<ImmutableDictionary> autoStartOriginsTableCopy() const;
void setAutoStartOriginsTable(ImmutableDictionary&);
- void setAutoStartOriginsArray(ImmutableArray&);
+ void setAutoStartOriginsArray(API::Array&);
PlugInAutoStartOriginHash autoStartOriginHashesCopy() const;
const PlugInAutoStartOrigins& autoStartOrigins() const { return m_autoStartOrigins; }
diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
index b946f79..9abcc74 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp
@@ -28,7 +28,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "PluginProcessManager.h"
#include "WebContext.h"
#include "WebProcessMessages.h"
@@ -165,10 +165,10 @@
return;
}
- callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(sites).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(sites).get());
}
-void WebPluginSiteDataManager::clearSiteData(ImmutableArray* sites, uint64_t flags, uint64_t maxAgeInSeconds, PassRefPtr<VoidCallback> prpCallback)
+void WebPluginSiteDataManager::clearSiteData(API::Array* sites, uint64_t flags, uint64_t maxAgeInSeconds, PassRefPtr<VoidCallback> prpCallback)
{
RefPtr<VoidCallback> callback = prpCallback;
if (!m_webContext) {
diff --git a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
index 068740a..8cb4d36 100644
--- a/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
+++ b/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h
@@ -52,7 +52,7 @@
void getSitesWithData(PassRefPtr<ArrayCallback>);
void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
- void clearSiteData(ImmutableArray* sites, uint64_t flags, uint64_t maxAgeInSeconds, PassRefPtr<VoidCallback>);
+ void clearSiteData(API::Array* sites, uint64_t flags, uint64_t maxAgeInSeconds, PassRefPtr<VoidCallback>);
void didClearSiteData(uint64_t callbackID);
void didGetSitesWithDataForSinglePlugin(const Vector<String>& sites, uint64_t callbackID);
diff --git a/Source/WebKit2/UIProcess/StatisticsRequest.cpp b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
index 9b474bc..8eaacfd 100644
--- a/Source/WebKit2/UIProcess/StatisticsRequest.cpp
+++ b/Source/WebKit2/UIProcess/StatisticsRequest.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "StatisticsRequest.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "MutableDictionary.h"
#include <wtf/Atomics.h>
@@ -91,7 +91,7 @@
for (const auto& statistic : data.webCoreCacheStatistics)
cacheStatistics.uncheckedAppend(createDictionaryFromHashMap(statistic));
- m_responseDictionary->set("WebCoreCacheStatistics", ImmutableArray::create(std::move(cacheStatistics)).get());
+ m_responseDictionary->set("WebCoreCacheStatistics", API::Array::create(std::move(cacheStatistics)).get());
}
if (m_outstandingRequests.isEmpty()) {
diff --git a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
index 04bd2b9..c97305d 100644
--- a/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "MessageReceiver.h"
#include "WebContextSupplement.h"
#include <wtf/PassRefPtr.h>
diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.cpp b/Source/WebKit2/UIProcess/WebBackForwardList.cpp
index e457cdc..95062a7 100644
--- a/Source/WebKit2/UIProcess/WebBackForwardList.cpp
+++ b/Source/WebKit2/UIProcess/WebBackForwardList.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebBackForwardList.h"
+#include "APIArray.h"
#include "WebPageProxy.h"
namespace WebKit {
@@ -200,17 +201,17 @@
return m_page && m_hasCurrentIndex ? m_entries.size() - (m_currentIndex + 1) : 0;
}
-PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit) const
+PassRefPtr<API::Array> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
if (!m_page || !m_hasCurrentIndex)
- return ImmutableArray::create();
+ return API::Array::create();
unsigned backListSize = static_cast<unsigned>(backListCount());
unsigned size = std::min(backListSize, limit);
if (!size)
- return ImmutableArray::create();
+ return API::Array::create();
Vector<RefPtr<API::Object>> vector;
vector.reserveInitialCapacity(size);
@@ -221,19 +222,19 @@
vector.uncheckedAppend(m_entries[i].get());
}
- return ImmutableArray::create(std::move(vector));
+ return API::Array::create(std::move(vector));
}
-PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit) const
+PassRefPtr<API::Array> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit) const
{
ASSERT(!m_hasCurrentIndex || m_currentIndex < m_entries.size());
if (!m_page || !m_hasCurrentIndex)
- return ImmutableArray::create();
+ return API::Array::create();
unsigned size = std::min(static_cast<unsigned>(forwardListCount()), limit);
if (!size)
- return ImmutableArray::create();
+ return API::Array::create();
Vector<RefPtr<API::Object>> vector;
vector.reserveInitialCapacity(size);
@@ -245,7 +246,7 @@
vector.uncheckedAppend(m_entries[i].get());
}
- return ImmutableArray::create(std::move(vector));
+ return API::Array::create(std::move(vector));
}
void WebBackForwardList::clear()
diff --git a/Source/WebKit2/UIProcess/WebBackForwardList.h b/Source/WebKit2/UIProcess/WebBackForwardList.h
index 10826d9..80c7333 100644
--- a/Source/WebKit2/UIProcess/WebBackForwardList.h
+++ b/Source/WebKit2/UIProcess/WebBackForwardList.h
@@ -27,7 +27,6 @@
#define WebBackForwardList_h
#include "APIObject.h"
-#include "ImmutableArray.h"
#include "WebBackForwardListItem.h"
#include "WebPageProxy.h"
#include <wtf/PassRefPtr.h>
@@ -70,8 +69,8 @@
int backListCount() const;
int forwardListCount() const;
- PassRefPtr<ImmutableArray> backListAsImmutableArrayWithLimit(unsigned limit) const;
- PassRefPtr<ImmutableArray> forwardListAsImmutableArrayWithLimit(unsigned limit) const;
+ PassRefPtr<API::Array> backListAsImmutableArrayWithLimit(unsigned limit) const;
+ PassRefPtr<API::Array> forwardListAsImmutableArrayWithLimit(unsigned limit) const;
#if USE(CF)
CFDictionaryRef createCFDictionaryRepresentation(WebPageProxy::WebPageProxySessionStateFilterCallback, void* context) const;
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 93ecccb..dcd7a16 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -26,9 +26,9 @@
#include "config.h"
#include "WebContext.h"
+#include "APIArray.h"
#include "DownloadProxy.h"
#include "DownloadProxyMessages.h"
-#include "ImmutableArray.h"
#include "Logging.h"
#include "MutableDictionary.h"
#include "SandboxExtension.h"
@@ -1231,7 +1231,7 @@
m_plugInAutoStartProvider.setAutoStartOriginsTable(dictionary);
}
-void WebContext::setPlugInAutoStartOrigins(ImmutableArray& array)
+void WebContext::setPlugInAutoStartOrigins(API::Array& array)
{
m_plugInAutoStartProvider.setAutoStartOriginsArray(array);
}
@@ -1272,7 +1272,7 @@
mimeTypes.reserveInitialCapacity(pluginModule.info.mimes.size());
for (const auto& mimeClassInfo : pluginModule.info.mimes)
mimeTypes.uncheckedAppend(WebString::create(mimeClassInfo.type));
- map.set(ASCIILiteral("mimes"), ImmutableArray::create(std::move(mimeTypes)));
+ map.set(ASCIILiteral("mimes"), API::Array::create(std::move(mimeTypes)));
#if PLATFORM(MAC)
map.set(ASCIILiteral("bundleId"), WebString::create(pluginModule.bundleIdentifier));
@@ -1282,7 +1282,7 @@
plugins.uncheckedAppend(ImmutableDictionary::adopt(map));
}
- m_client.plugInInformationBecameAvailable(this, ImmutableArray::create(std::move(plugins)).get());
+ m_client.plugInInformationBecameAvailable(this, API::Array::create(std::move(plugins)).get());
}
#endif
diff --git a/Source/WebKit2/UIProcess/WebContext.h b/Source/WebKit2/UIProcess/WebContext.h
index 6c1fb0c..748590f 100644
--- a/Source/WebKit2/UIProcess/WebContext.h
+++ b/Source/WebKit2/UIProcess/WebContext.h
@@ -29,7 +29,6 @@
#include "APIObject.h"
#include "DownloadProxyMap.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "ImmutableDictionary.h"
#include "MessageReceiver.h"
#include "MessageReceiverMap.h"
@@ -265,7 +264,7 @@
PassRefPtr<ImmutableDictionary> plugInAutoStartOriginHashes() const;
void setPlugInAutoStartOriginHashes(ImmutableDictionary&);
- void setPlugInAutoStartOrigins(ImmutableArray&);
+ void setPlugInAutoStartOrigins(API::Array&);
// Network Process Management
diff --git a/Source/WebKit2/UIProcess/WebContextClient.cpp b/Source/WebKit2/UIProcess/WebContextClient.cpp
index df13e87..03f1c64 100644
--- a/Source/WebKit2/UIProcess/WebContextClient.cpp
+++ b/Source/WebKit2/UIProcess/WebContextClient.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebContextClient.h"
+#include "APIArray.h"
#include "WebContext.h"
namespace WebKit {
@@ -46,7 +47,7 @@
m_client.networkProcessDidCrash(toAPI(context), m_client.clientInfo);
}
-void WebContextClient::plugInInformationBecameAvailable(WebContext* context, ImmutableArray* plugInInfo)
+void WebContextClient::plugInInformationBecameAvailable(WebContext* context, API::Array* plugInInfo)
{
if (!m_client.plugInInformationBecameAvailable)
return;
diff --git a/Source/WebKit2/UIProcess/WebContextClient.h b/Source/WebKit2/UIProcess/WebContextClient.h
index 698607c..47f010b 100644
--- a/Source/WebKit2/UIProcess/WebContextClient.h
+++ b/Source/WebKit2/UIProcess/WebContextClient.h
@@ -29,16 +29,19 @@
#include "APIClient.h"
#include "WKContext.h"
+namespace API {
+class Array;
+}
+
namespace WebKit {
-class ImmutableArray;
class WebContext;
class WebContextClient : public APIClient<WKContextClient, kWKContextClientCurrentVersion> {
public:
void plugInAutoStartOriginHashesChanged(WebContext*);
void networkProcessDidCrash(WebContext*);
- void plugInInformationBecameAvailable(WebContext*, ImmutableArray*);
+ void plugInInformationBecameAvailable(WebContext*, API::Array*);
};
} // namespace WebKit
diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
index f48c5d2..620fec2 100644
--- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebCookieManagerProxy.h"
+#include "APIArray.h"
#include "SecurityOriginData.h"
#include "WebContext.h"
#include "WebCookieManagerMessages.h"
@@ -115,7 +116,7 @@
return;
}
- callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(hostnames).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).get());
}
void WebCookieManagerProxy::deleteCookiesForHostname(const String& hostname)
diff --git a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
index ee5bbcb..b732d34 100644
--- a/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebCookieManagerProxy.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "MessageReceiver.h"
#include "WebContextSupplement.h"
#include "WebCookieManagerProxyClient.h"
@@ -40,6 +39,10 @@
#include "SoupCookiePersistentStorageType.h"
#endif
+namespace API {
+class Array;
+}
+
namespace WebKit {
class WebContext;
diff --git a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
index 495a77c..1f1c83f 100644
--- a/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp
@@ -28,7 +28,7 @@
#if ENABLE(SQL_DATABASE)
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "ImmutableDictionary.h"
#include "WebContext.h"
#include "WebDatabaseManagerMessages.h"
@@ -180,12 +180,12 @@
originAndDatabasesMap.set(originKey(), origin);
originAndDatabasesMap.set(originQuotaKey(), WebUInt64::create(originAndDatabases.originQuota));
originAndDatabasesMap.set(originUsageKey(), WebUInt64::create(originAndDatabases.originUsage));
- originAndDatabasesMap.set(databaseDetailsKey(), ImmutableArray::create(std::move(databases)));
+ originAndDatabasesMap.set(databaseDetailsKey(), API::Array::create(std::move(databases)));
result.uncheckedAppend(ImmutableDictionary::adopt(originAndDatabasesMap));
}
- callback->performCallbackWithReturnValue(ImmutableArray::create(std::move(result)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(std::move(result)).get());
}
void WebDatabaseManagerProxy::getDatabaseOrigins(PassRefPtr<ArrayCallback> prpCallback)
@@ -211,7 +211,7 @@
for (const auto& originIdentifier : originIdentifiers)
securityOrigins.uncheckedAppend(WebSecurityOrigin::createFromDatabaseIdentifier(originIdentifier));
- callback->performCallbackWithReturnValue(ImmutableArray::create(std::move(securityOrigins)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(std::move(securityOrigins)).get());
}
void WebDatabaseManagerProxy::deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, WebSecurityOrigin* origin)
diff --git a/Source/WebKit2/UIProcess/WebFindClient.cpp b/Source/WebKit2/UIProcess/WebFindClient.cpp
index 702d187..02659b4 100644
--- a/Source/WebKit2/UIProcess/WebFindClient.cpp
+++ b/Source/WebKit2/UIProcess/WebFindClient.cpp
@@ -55,7 +55,7 @@
m_client.didCountStringMatches(toAPI(page), toAPI(string.impl()), matchCount, m_client.clientInfo);
}
-void WebFindMatchesClient::didFindStringMatches(WebPageProxy* page, const String& string, ImmutableArray* matches, int firstIndex)
+void WebFindMatchesClient::didFindStringMatches(WebPageProxy* page, const String& string, API::Array* matches, int firstIndex)
{
if (!m_client.didFindStringMatches)
return;
diff --git a/Source/WebKit2/UIProcess/WebFindClient.h b/Source/WebKit2/UIProcess/WebFindClient.h
index 605f3d50..dd6b1d6 100644
--- a/Source/WebKit2/UIProcess/WebFindClient.h
+++ b/Source/WebKit2/UIProcess/WebFindClient.h
@@ -30,9 +30,12 @@
#include "WKPage.h"
#include <wtf/Forward.h>
+namespace API {
+class Array;
+}
+
namespace WebKit {
-class ImmutableArray;
class WebPageProxy;
class WebImage;
@@ -45,7 +48,7 @@
class WebFindMatchesClient : public APIClient<WKPageFindMatchesClient, kWKPageFindMatchesClientCurrentVersion> {
public:
- void didFindStringMatches(WebPageProxy*, const String&, ImmutableArray*, int);
+ void didFindStringMatches(WebPageProxy*, const String&, API::Array*, int);
void didGetImageForMatchResult(WebPageProxy*, WebImage*, uint32_t);
};
diff --git a/Source/WebKit2/UIProcess/WebFrameProxy.h b/Source/WebKit2/UIProcess/WebFrameProxy.h
index 7d0c99a..58d699b 100644
--- a/Source/WebKit2/UIProcess/WebFrameProxy.h
+++ b/Source/WebKit2/UIProcess/WebFrameProxy.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "FrameLoadState.h"
-#include "ImmutableArray.h"
#include "GenericCallback.h"
#include "WebFrameListenerProxy.h"
#include <WebCore/FrameLoaderTypes.h>
@@ -43,7 +42,6 @@
namespace WebKit {
-class ImmutableArray;
class PlatformCertificateInfo;
class WebCertificateInfo;
class WebFormSubmissionListenerProxy;
diff --git a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
index 7bf6404..b478ad1 100644
--- a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
+++ b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebKeyValueStorageManager.h"
+#include "APIArray.h"
#include "SecurityOriginData.h"
#include "WebContext.h"
#include "WebSecurityOrigin.h"
@@ -75,7 +76,7 @@
for (unsigned i = 0; i < securityOrigins.size(); ++i)
webSecurityOrigins.uncheckedAppend(WebSecurityOrigin::create(securityOrigins[i]));
- callback->performCallbackWithReturnValue(ImmutableArray::create(std::move(webSecurityOrigins)).get());
+ callback->performCallbackWithReturnValue(API::Array::create(std::move(webSecurityOrigins)).get());
}
void WebKeyValueStorageManager::getKeyValueStorageOrigins(PassRefPtr<ArrayCallback> prpCallback)
diff --git a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h
index 31d3434..0d18aac 100644
--- a/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h
+++ b/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "MessageReceiver.h"
#include "WebContextSupplement.h"
#include <wtf/PassRefPtr.h>
diff --git a/Source/WebKit2/UIProcess/WebLoaderClient.cpp b/Source/WebKit2/UIProcess/WebLoaderClient.cpp
index 216ceb5..a585dfd 100644
--- a/Source/WebKit2/UIProcess/WebLoaderClient.cpp
+++ b/Source/WebKit2/UIProcess/WebLoaderClient.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "WebLoaderClient.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "ImmutableDictionary.h"
#include "PluginInformation.h"
#include "WKAPICast.h"
@@ -243,9 +243,9 @@
if (!m_client.didChangeBackForwardList)
return;
- RefPtr<ImmutableArray> removedItemsArray;
+ RefPtr<API::Array> removedItemsArray;
if (removedItems && !removedItems->isEmpty())
- removedItemsArray = ImmutableArray::create(std::move(*removedItems));
+ removedItemsArray = API::Array::create(std::move(*removedItems));
m_client.didChangeBackForwardList(toAPI(page), toAPI(addedItem), toAPI(removedItemsArray.get()), m_client.clientInfo);
}
diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
index 8dbc2c9..162679c 100644
--- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebMediaCacheManagerProxy.h"
+#include "APIArray.h"
#include "WebContext.h"
#include "WebMediaCacheManagerMessages.h"
#include "WebMediaCacheManagerProxyMessages.h"
@@ -98,7 +99,7 @@
return;
}
- callback->performCallbackWithReturnValue(ImmutableArray::createStringArray(hostnames).get());
+ callback->performCallbackWithReturnValue(API::Array::createStringArray(hostnames).get());
}
void WebMediaCacheManagerProxy::clearCacheForHostname(const String& hostname)
diff --git a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
index 233b2b4..d350b4d 100644
--- a/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "MessageReceiver.h"
#include "WebContextSupplement.h"
#include <wtf/PassRefPtr.h>
diff --git a/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp b/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp
index 56d201a..2acc9a3 100644
--- a/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "WebOpenPanelResultListenerProxy.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "WebPageProxy.h"
#include <WebCore/URL.h>
#include <wtf/Vector.h>
@@ -44,7 +44,7 @@
{
}
-void WebOpenPanelResultListenerProxy::chooseFiles(ImmutableArray* fileURLsArray)
+void WebOpenPanelResultListenerProxy::chooseFiles(API::Array* fileURLsArray)
{
if (!m_page)
return;
diff --git a/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h b/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
index 238363d..02cbdb7 100644
--- a/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
+++ b/Source/WebKit2/UIProcess/WebOpenPanelResultListenerProxy.h
@@ -30,9 +30,12 @@
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
+namespace API {
+class Array;
+}
+
namespace WebKit {
-class ImmutableArray;
class WebPageProxy;
class WebOpenPanelResultListenerProxy : public API::TypedObject<API::Object::Type::FramePolicyListener> {
@@ -44,7 +47,7 @@
virtual ~WebOpenPanelResultListenerProxy();
- void chooseFiles(ImmutableArray*);
+ void chooseFiles(API::Array*);
void cancel();
void invalidate();
diff --git a/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h b/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
index c630ab3..623fe1e 100644
--- a/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
+++ b/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h
@@ -28,7 +28,6 @@
#include "APIObject.h"
#include "GenericCallback.h"
-#include "ImmutableArray.h"
#include "MessageReceiver.h"
#include "WKOriginDataManager.h"
#include "WebContextSupplement.h"
diff --git a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
index 844a4ac..c10f56e 100644
--- a/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
+++ b/Source/WebKit2/UIProcess/WebPageContextMenuClient.cpp
@@ -29,7 +29,7 @@
#include "WebPageContextMenuClient.h"
-#include "ImmutableArray.h"
+#include "APIArray.h"
#include "Logging.h"
#include "WebContextMenuItem.h"
#include "WKAPICast.h"
@@ -54,11 +54,11 @@
WKArrayRef newMenu = nullptr;
if (m_client.version >= 2) {
RefPtr<WebHitTestResult> webHitTestResult = WebHitTestResult::create(hitTestResultData);
- m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(ImmutableArray::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.clientInfo);
+ m_client.getContextMenuFromProposedMenu(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(webHitTestResult.get()), toAPI(userData), m_client.clientInfo);
} else
- m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(ImmutableArray::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.clientInfo);
+ m_client.getContextMenuFromProposedMenu_deprecatedForUseWithV0(toAPI(page), toAPI(API::Array::create(std::move(proposedMenuItems)).get()), &newMenu, toAPI(userData), m_client.clientInfo);
- RefPtr<ImmutableArray> array = adoptRef(toImpl(newMenu));
+ RefPtr<API::Array> array = adoptRef(toImpl(newMenu));
customMenu.clear();
@@ -104,7 +104,7 @@
for (const auto& menuItem : menuItemsVector)
menuItems.uncheckedAppend(WebContextMenuItem::create(menuItem));
- m_client.showContextMenu(toAPI(page), toAPI(menuLocation), toAPI(ImmutableArray::create(std::move(menuItems)).get()), m_client.clientInfo);
+ m_client.showContextMenu(toAPI(page), toAPI(menuLocation), toAPI(API::Array::create(std::move(menuItems)).get()), m_client.clientInfo);
return true;
}
diff --git a/Source/WebKit2/UIProcess/WebPageGroup.cpp b/Source/WebKit2/UIProcess/WebPageGroup.cpp
index 06b0c77..e64073d 100644
--- a/Source/WebKit2/UIProcess/WebPageGroup.cpp
+++ b/Source/WebKit2/UIProcess/WebPageGroup.cpp
@@ -26,6 +26,7 @@
#include "config.h"
#include "WebPageGroup.h"
+#include "APIArray.h"
#include "WebPageGroupProxyMessages.h"
#include "WebPageProxy.h"
#include "WebPreferences.h"
@@ -129,7 +130,7 @@
}
}
-static Vector<String> toStringVector(ImmutableArray* array)
+static Vector<String> toStringVector(API::Array* array)
{
Vector<String> patternVector;
if (!array)
@@ -149,7 +150,7 @@
return patternVector;
}
-void WebPageGroup::addUserStyleSheet(const String& source, const String& baseURL, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserStyleLevel level)
+void WebPageGroup::addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserStyleLevel level)
{
if (source.isEmpty())
return;
@@ -160,7 +161,7 @@
sendToAllProcessesInGroup(Messages::WebPageGroupProxy::AddUserStyleSheet(userStyleSheet), m_data.pageGroupID);
}
-void WebPageGroup::addUserScript(const String& source, const String& baseURL, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserScriptInjectionTime injectionTime)
+void WebPageGroup::addUserScript(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames injectedFrames, WebCore::UserScriptInjectionTime injectionTime)
{
if (source.isEmpty())
return;
diff --git a/Source/WebKit2/UIProcess/WebPageGroup.h b/Source/WebKit2/UIProcess/WebPageGroup.h
index 5e9bf46..24ccd09 100644
--- a/Source/WebKit2/UIProcess/WebPageGroup.h
+++ b/Source/WebKit2/UIProcess/WebPageGroup.h
@@ -57,8 +57,8 @@
WebPreferences* preferences() const;
void preferencesDidChange();
- void addUserStyleSheet(const String& source, const String& baseURL, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserStyleLevel);
- void addUserScript(const String& source, const String& baseURL, ImmutableArray* whitelist, ImmutableArray* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime);
+ void addUserStyleSheet(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserStyleLevel);
+ void addUserScript(const String& source, const String& baseURL, API::Array* whitelist, API::Array* blacklist, WebCore::UserContentInjectedFrames, WebCore::UserScriptInjectionTime);
void removeAllUserStyleSheets();
void removeAllUserScripts();
void removeAllUserContent();
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 58a55db..03e505a 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -27,6 +27,7 @@
#include "config.h"
#include "WebPageProxy.h"
+#include "APIArray.h"
#include "AuthenticationChallengeProxy.h"
#include "AuthenticationDecisionListener.h"
#include "DataReference.h"
@@ -35,7 +36,6 @@
#include "DrawingAreaProxyMessages.h"
#include "EventDispatcherMessages.h"
#include "FindIndicator.h"
-#include "ImmutableArray.h"
#include "Logging.h"
#include "NativeWebKeyboardEvent.h"
#include "NativeWebMouseEvent.h"
@@ -387,7 +387,7 @@
return m_isValid;
}
-PassRefPtr<ImmutableArray> WebPageProxy::relatedPages() const
+PassRefPtr<API::Array> WebPageProxy::relatedPages() const
{
// pages() returns a list of pages in WebProcess, so this page may or may not be among them - a client can use a reference to WebPageProxy after the page has closed.
Vector<WebPageProxy*> pages = m_process->pages();
@@ -400,7 +400,7 @@
result.uncheckedAppend(page);
}
- return ImmutableArray::create(std::move(result));
+ return API::Array::create(std::move(result));
}
void WebPageProxy::initializeLoaderClient(const WKPageLoaderClient* loadClient)
@@ -3047,10 +3047,10 @@
for (const auto& rect : rects)
apiRects.uncheckedAppend(WebRect::create(toAPI(rect)));
- matches.uncheckedAppend(ImmutableArray::create(std::move(apiRects)));
+ matches.uncheckedAppend(API::Array::create(std::move(apiRects)));
}
- m_findMatchesClient.didFindStringMatches(this, string, ImmutableArray::create(std::move(matches)).get(), firstIndexAfterSelection);
+ m_findMatchesClient.didFindStringMatches(this, string, API::Array::create(std::move(matches)).get(), firstIndexAfterSelection);
}
void WebPageProxy::didFailToFindString(const String& string)
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 94532ac..33e1e0a 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -607,7 +607,7 @@
bool isValid() const;
- PassRefPtr<ImmutableArray> relatedPages() const;
+ PassRefPtr<API::Array> relatedPages() const;
const String& urlAtProcessExit() const { return m_urlAtProcessExit; }
FrameLoadState::LoadState loadStateAtProcessExit() const { return m_loadStateAtProcessExit; }
diff --git a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp
index 478eaf0..41b0ec6 100644
--- a/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp
@@ -26,7 +26,6 @@
#include "config.h"
#include "WebResourceCacheManagerProxy.h"
-#include "ImmutableArray.h"
#include "ImmutableDictionary.h"
#include "SecurityOriginData.h"
#include "WebContext.h"
