URTBF after r159234.
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 23:11:59 +0000 (23:11 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Nov 2013 23:11:59 +0000 (23:11 +0000)
* CMakeLists.txt:
* GNUmakefile.list.am:
* Shared/efl/WebEventFactory.cpp:
(WebKit::WebEventFactory::createWebTouchEvent):
* UIProcess/API/C/WKGrammarDetail.cpp:
* UIProcess/API/C/efl/WKEventEfl.cpp:
* UIProcess/API/gtk/WebKitBackForwardList.cpp:
(webkitBackForwardListCreateList):
(webkitBackForwardListChanged):
(webkit_back_forward_list_get_back_list_with_limit):
(webkit_back_forward_list_get_forward_list_with_limit):
* UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
* UIProcess/API/gtk/WebKitContextMenu.cpp:
(webkitContextMenuCreate):
* UIProcess/API/gtk/WebKitContextMenuItem.cpp:
(webkitContextMenuItemCreate):
* UIProcess/API/gtk/WebKitContextMenuPrivate.h:
* UIProcess/API/gtk/WebKitCookieManager.cpp:
(webkitCookieManagerGetDomainsWithCookiesCallback):
* UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
(webkit_file_chooser_request_get_mime_types):
(webkit_file_chooser_request_get_mime_types_filter):
(webkit_file_chooser_request_select_files):
(webkit_file_chooser_request_get_selected_files):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewPopulateContextMenu):
* UIProcess/API/gtk/WebKitWebViewGroup.cpp:
(toImmutableArray):
(webkit_web_view_group_add_user_style_sheet):
* UIProcess/API/gtk/WebKitWebViewPrivate.h:
* UIProcess/WebGrammarDetail.cpp:
(WebKit::WebGrammarDetail::create):
(WebKit::WebGrammarDetail::WebGrammarDetail):
(WebKit::WebGrammarDetail::guesses):
* UIProcess/WebGrammarDetail.h:
* UIProcess/WebTextCheckerClient.cpp:
(WebKit::WebTextCheckerClient::checkGrammarOfString):
(WebKit::WebTextCheckerClient::guessesForWord):
* UIProcess/efl/WebUIPopupMenuClient.cpp:
(WebUIPopupMenuClient::showPopupMenu):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159247 268f45cc-cd09-0410-ab3c-d52691b4dbfc

20 files changed:
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.list.am
Source/WebKit2/Shared/efl/WebEventFactory.cpp
Source/WebKit2/UIProcess/API/C/WKGrammarDetail.cpp
Source/WebKit2/UIProcess/API/C/efl/WKEventEfl.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardList.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitBackForwardListPrivate.h
Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuItem.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuPrivate.h
Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp
Source/WebKit2/UIProcess/API/gtk/WebKitWebViewPrivate.h
Source/WebKit2/UIProcess/WebGrammarDetail.cpp
Source/WebKit2/UIProcess/WebGrammarDetail.h
Source/WebKit2/UIProcess/WebTextCheckerClient.cpp
Source/WebKit2/UIProcess/efl/WebUIPopupMenuClient.cpp

index 4b612e7..9a9a740 100644 (file)
@@ -177,6 +177,7 @@ set(WebKit2_SOURCES
     PluginProcess/PluginProcess.cpp
     PluginProcess/WebProcessConnection.cpp
 
+    Shared/APIArray.cpp
     Shared/APIClientTraits.cpp
     Shared/APIObject.cpp
     Shared/ActivityAssertion.cpp
@@ -187,7 +188,6 @@ set(WebKit2_SOURCES
     Shared/DictionaryPopupInfo.cpp
     Shared/EditorState.cpp
     Shared/FontInfo.cpp
-    Shared/ImmutableArray.cpp
     Shared/ImmutableDictionary.cpp
     Shared/MutableDictionary.cpp
     Shared/OriginAndDatabases.cpp
index 99827fa..74b732e 100644 (file)
@@ -1,3 +1,48 @@
+2013-11-13  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        URTBF after r159234.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Shared/efl/WebEventFactory.cpp:
+        (WebKit::WebEventFactory::createWebTouchEvent):
+        * UIProcess/API/C/WKGrammarDetail.cpp:
+        * UIProcess/API/C/efl/WKEventEfl.cpp:
+        * UIProcess/API/gtk/WebKitBackForwardList.cpp:
+        (webkitBackForwardListCreateList):
+        (webkitBackForwardListChanged):
+        (webkit_back_forward_list_get_back_list_with_limit):
+        (webkit_back_forward_list_get_forward_list_with_limit):
+        * UIProcess/API/gtk/WebKitBackForwardListPrivate.h:
+        * UIProcess/API/gtk/WebKitContextMenu.cpp:
+        (webkitContextMenuCreate):
+        * UIProcess/API/gtk/WebKitContextMenuItem.cpp:
+        (webkitContextMenuItemCreate):
+        * UIProcess/API/gtk/WebKitContextMenuPrivate.h:
+        * UIProcess/API/gtk/WebKitCookieManager.cpp:
+        (webkitCookieManagerGetDomainsWithCookiesCallback):
+        * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+        (webkit_file_chooser_request_get_mime_types):
+        (webkit_file_chooser_request_get_mime_types_filter):
+        (webkit_file_chooser_request_select_files):
+        (webkit_file_chooser_request_get_selected_files):
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewPopulateContextMenu):
+        * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+        (toImmutableArray):
+        (webkit_web_view_group_add_user_style_sheet):
+        * UIProcess/API/gtk/WebKitWebViewPrivate.h:
+        * UIProcess/WebGrammarDetail.cpp:
+        (WebKit::WebGrammarDetail::create):
+        (WebKit::WebGrammarDetail::WebGrammarDetail):
+        (WebKit::WebGrammarDetail::guesses):
+        * UIProcess/WebGrammarDetail.h:
+        * UIProcess/WebTextCheckerClient.cpp:
+        (WebKit::WebTextCheckerClient::checkGrammarOfString):
+        (WebKit::WebTextCheckerClient::guessesForWord):
+        * UIProcess/efl/WebUIPopupMenuClient.cpp:
+        (WebUIPopupMenuClient::showPopupMenu):
+
 2013-11-13  Anders Carlsson  <andersca@apple.com>
 
         Fix build.
index 5abe9c6..512aa48 100644 (file)
@@ -322,6 +322,8 @@ webkit2_sources += \
        Source/WebKit2/Shared/ResourceCachesToClear.h \
        Source/WebKit2/Shared/ViewState.h \
        Source/WebKit2/Shared/WebMemorySampler.h \
+       Source/WebKit2/Shared/APIArray.cpp \
+       Source/WebKit2/Shared/APIArray.h \
        Source/WebKit2/Shared/APIClient.h \
        Source/WebKit2/Shared/APIClientTraits.cpp \
        Source/WebKit2/Shared/APIClientTraits.h \
@@ -434,8 +436,6 @@ webkit2_sources += \
        Source/WebKit2/Shared/gtk/WebEventFactory.cpp \
        Source/WebKit2/Shared/gtk/WebEventFactory.h \
        Source/WebKit2/Shared/ImageOptions.h \
-       Source/WebKit2/Shared/ImmutableArray.cpp \
-       Source/WebKit2/Shared/ImmutableArray.h \
        Source/WebKit2/Shared/ImmutableDictionary.cpp \
        Source/WebKit2/Shared/ImmutableDictionary.h \
        Source/WebKit2/Shared/LayerTreeContext.h \
index 7f5b3ee..a51e420 100644 (file)
@@ -32,9 +32,9 @@
 #include <WebCore/Scrollbar.h>
 
 #if ENABLE(TOUCH_EVENTS)
+#include "APIArray.h"
 #include "EwkTouchEvent.h"
 #include "EwkTouchPoint.h"
-#include "ImmutableArray.h"
 #include "WKAPICast.h"
 #endif
 
@@ -264,7 +264,7 @@ static inline WebEvent::Modifiers toWebEventModifiers(unsigned modifiers)
 
 WebTouchEvent WebEventFactory::createWebTouchEvent(const EwkTouchEvent* event, const AffineTransform& toWebContent)
 {
-    ImmutableArray* touchPointsArray = toImpl(event->touchPoints());
+    API::Array* touchPointsArray = toImpl(event->touchPoints());
     size_t size = touchPointsArray->size();
 
     Vector<WebPlatformTouchPoint> touchPoints;
index 22b7bd7..193af2e 100644 (file)
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "WKGrammarDetail.h"
 
+#include "APIArray.h"
 #include "APIObject.h"
-#include "ImmutableArray.h"
 #include "WKAPICast.h"
 #include "WebGrammarDetail.h"
 
index 843aeb0..7a0c5a5 100644 (file)
@@ -26,9 +26,9 @@
 #include "config.h"
 #include "WKEventEfl.h"
 
+#include "APIArray.h"
 #include "EwkTouchEvent.h"
 #include "EwkTouchPoint.h"
-#include "ImmutableArray.h"
 #include "WKAPICast.h"
 #include "WebEvent.h"
 
index 47aaa4c..93e1709 100644 (file)
@@ -106,7 +106,7 @@ static WebKitBackForwardListItem* webkitBackForwardListGetOrCreateItem(WebKitBac
     return listItem.get();
 }
 
-static GList* webkitBackForwardListCreateList(WebKitBackForwardList* list, ImmutableArray* backForwardItems)
+static GList* webkitBackForwardListCreateList(WebKitBackForwardList* list, API::Array* backForwardItems)
 {
     if (!backForwardItems)
         return 0;
@@ -128,7 +128,7 @@ WebKitBackForwardList* webkitBackForwardListCreate(WebBackForwardList* backForwa
     return list;
 }
 
-void webkitBackForwardListChanged(WebKitBackForwardList* backForwardList, WebBackForwardListItem* webAddedItem, ImmutableArray* webRemovedItems)
+void webkitBackForwardListChanged(WebKitBackForwardList* backForwardList, WebBackForwardListItem* webAddedItem, API::Array* webRemovedItems)
 {
     WebKitBackForwardListItem* addedItem = webkitBackForwardListGetOrCreateItem(backForwardList, webAddedItem);
     GList* removedItems = 0;
@@ -252,7 +252,7 @@ GList* webkit_back_forward_list_get_back_list_with_limit(WebKitBackForwardList*
     g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
 
     WebKitBackForwardListPrivate* priv = backForwardList->priv;
-    RefPtr<ImmutableArray> immutableArray = priv->backForwardItems->backListAsImmutableArrayWithLimit(limit);
+    RefPtr<API::Array> immutableArray = priv->backForwardItems->backListAsImmutableArrayWithLimit(limit);
     return webkitBackForwardListCreateList(backForwardList, immutableArray.get());
 }
 
@@ -283,6 +283,6 @@ GList* webkit_back_forward_list_get_forward_list_with_limit(WebKitBackForwardLis
     g_return_val_if_fail(WEBKIT_IS_BACK_FORWARD_LIST(backForwardList), 0);
 
     WebKitBackForwardListPrivate* priv = backForwardList->priv;
-    RefPtr<ImmutableArray> immutableArray = priv->backForwardItems->forwardListAsImmutableArrayWithLimit(limit);
+    RefPtr<API::Array> immutableArray = priv->backForwardItems->forwardListAsImmutableArrayWithLimit(limit);
     return webkitBackForwardListCreateList(backForwardList, immutableArray.get());
 }
index 540f665..e5f84cf 100644 (file)
@@ -32,6 +32,6 @@
 WebKitBackForwardList* webkitBackForwardListCreate(WebKit::WebBackForwardList*);
 WebKitBackForwardListItem* webkitBackForwardListItemGetOrCreate(WebKit::WebBackForwardListItem*);
 WebKit::WebBackForwardListItem* webkitBackForwardListItemGetItem(WebKitBackForwardListItem*);
-void webkitBackForwardListChanged(WebKitBackForwardList*, WebKit::WebBackForwardListItem* webAddedItem, WebKit::ImmutableArray* webRemovedItems);
+void webkitBackForwardListChanged(WebKitBackForwardList*, WebKit::WebBackForwardListItem* webAddedItem, WebKit::API::Array* webRemovedItems);
 
 #endif // WebKitBackForwardListPrivate_h
index 0ab6edb..bbbed0d 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitContextMenu.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WebContextMenuItem.h"
 #include "WebKitContextMenuItemPrivate.h"
 #include "WebKitContextMenuPrivate.h"
@@ -74,7 +74,7 @@ void webkitContextMenuPopulate(WebKitContextMenu* menu, Vector<ContextMenuItem>&
     }
 }
 
-WebKitContextMenu* webkitContextMenuCreate(ImmutableArray* items)
+WebKitContextMenu* webkitContextMenuCreate(API::Array* items)
 {
     WebKitContextMenu* menu = webkit_context_menu_new();
     for (size_t i = 0; i < items->size(); ++i) {
index cee41fb..e752b6a 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitContextMenuItem.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WebContextMenuItem.h"
 #include "WebContextMenuItemData.h"
 #include "WebKitContextMenuActionsPrivate.h"
@@ -104,7 +104,7 @@ WebKitContextMenuItem* webkitContextMenuItemCreate(WebContextMenuItem* webItem)
     subMenuItems.reserveInitialCapacity(subMenu.size());
     for (size_t i = 0; i < subMenu.size(); ++i)
         subMenuItems.uncheckedAppend(WebContextMenuItem::create(subMenu[i]).get());
-    webkitContextMenuItemSetSubMenu(item, adoptGRef(webkitContextMenuCreate(ImmutableArray::create(std::move(subMenuItems)).get())));
+    webkitContextMenuItemSetSubMenu(item, adoptGRef(webkitContextMenuCreate(API::Array::create(std::move(subMenuItems)).get())));
 
     return item;
 }
index 5556e9f..a473e7c 100644 (file)
@@ -23,7 +23,7 @@
 #include "WebKitContextMenu.h"
 #include "WebKitPrivate.h"
 
-WebKitContextMenu* webkitContextMenuCreate(WebKit::ImmutableArray* items);
+WebKitContextMenu* webkitContextMenuCreate(WebKit::API::Array* items);
 void webkitContextMenuPopulate(WebKitContextMenu*, Vector<WebCore::ContextMenuItem>&);
 void webkitContextMenuSetParentItem(WebKitContextMenu*, WebKitContextMenuItem*);
 WebKitContextMenuItem* webkitContextMenuGetParentItem(WebKitContextMenu*);
index daf79fe..cd539bc 100644 (file)
@@ -200,7 +200,7 @@ static void webkitCookieManagerGetDomainsWithCookiesCallback(WKArrayRef wkDomain
     if (g_task_return_error_if_cancelled(task.get()))
         return;
 
-    ImmutableArray* domains = toImpl(wkDomains);
+    API::Array* domains = toImpl(wkDomains);
     GPtrArray* returnValue = g_ptr_array_sized_new(domains->size());
     for (size_t i = 0; i < domains->size(); ++i) {
         WebString* domainString = static_cast<WebString*>(domains->at(i));
index 37d4701..2525625 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitFileChooserRequest.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WebKitFileChooserRequestPrivate.h"
 #include "WebOpenPanelParameters.h"
 #include "WebOpenPanelResultListenerProxy.h"
@@ -205,7 +205,7 @@ const gchar* const* webkit_file_chooser_request_get_mime_types(WebKitFileChooser
     if (request->priv->mimeTypes)
         return reinterpret_cast<gchar**>(request->priv->mimeTypes->pdata);
 
-    RefPtr<ImmutableArray> mimeTypes = request->priv->parameters->acceptMIMETypes();
+    RefPtr<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
     size_t numOfMimeTypes = mimeTypes->size();
     if (!numOfMimeTypes)
         return 0;
@@ -246,7 +246,7 @@ GtkFileFilter* webkit_file_chooser_request_get_mime_types_filter(WebKitFileChoos
     if (request->priv->filter)
         return request->priv->filter.get();
 
-    RefPtr<ImmutableArray> mimeTypes = request->priv->parameters->acceptMIMETypes();
+    RefPtr<API::Array> mimeTypes = request->priv->parameters->acceptMIMETypes();
     size_t numOfMimeTypes = mimeTypes->size();
     if (!numOfMimeTypes)
         return 0;
@@ -314,7 +314,7 @@ void webkit_file_chooser_request_select_files(WebKitFileChooserRequest* request,
     g_ptr_array_add(selectedFiles.get(), 0);
 
     // Select the files in WebCore and update local private attributes.
-    request->priv->listener->chooseFiles(ImmutableArray::create(std::move(choosenFiles)).get());
+    request->priv->listener->chooseFiles(API::Array::create(std::move(choosenFiles)).get());
     request->priv->selectedFiles = selectedFiles;
     request->priv->handledRequest = true;
 }
@@ -345,7 +345,7 @@ const gchar* const* webkit_file_chooser_request_get_selected_files(WebKitFileCho
     if (request->priv->selectedFiles)
         return reinterpret_cast<gchar**>(request->priv->selectedFiles->pdata);
 
-    RefPtr<ImmutableArray> selectedFileNames = request->priv->parameters->selectedFileNames();
+    RefPtr<API::Array> selectedFileNames = request->priv->parameters->selectedFileNames();
     size_t numOfFiles = selectedFileNames->size();
     if (!numOfFiles)
         return 0;
index 5d52a9d..9810d87 100644 (file)
@@ -1804,7 +1804,7 @@ static void contextMenuDismissed(GtkMenuShell*, WebKitWebView* webView)
     g_signal_emit(webView, signals[CONTEXT_MENU_DISMISSED], 0, NULL);
 }
 
-void webkitWebViewPopulateContextMenu(WebKitWebView* webView, ImmutableArray* proposedMenu, WebHitTestResult* webHitTestResult)
+void webkitWebViewPopulateContextMenu(WebKitWebView* webView, API::Array* proposedMenu, WebHitTestResult* webHitTestResult)
 {
     WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(webView);
     WebContextMenuProxyGtk* contextMenuProxy = webkitWebViewBaseGetActiveContextMenuProxy(webViewBase);
index e917855..559edaa 100644 (file)
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "WebKitWebViewGroup.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
 #include "WebKitWebViewGroupPrivate.h"
@@ -226,7 +226,7 @@ void webkit_web_view_group_set_settings(WebKitWebViewGroup* group, WebKitSetting
 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_ALL, WebCore::InjectInAllFrames);
 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY, WebCore::InjectInTopFrameOnly);
 
-static PassRefPtr<ImmutableArray> toImmutableArray(const char* const* list)
+static PassRefPtr<API::Array> toImmutableArray(const char* const* list)
 {
     if (!list)
         return 0;
@@ -236,7 +236,7 @@ static PassRefPtr<ImmutableArray> toImmutableArray(const char* const* list)
         entries.append(WebString::createFromUTF8String(*list));
         list++;
     }
-    return ImmutableArray::create(std::move(entries));
+    return API::Array::create(std::move(entries));
 }
 
 /**
@@ -260,8 +260,8 @@ void webkit_web_view_group_add_user_style_sheet(WebKitWebViewGroup* group, const
     g_return_if_fail(WEBKIT_IS_WEB_VIEW_GROUP(group));
     g_return_if_fail(source);
 
-    RefPtr<ImmutableArray> webWhitelist = toImmutableArray(whitelist);
-    RefPtr<ImmutableArray> webBlacklist = toImmutableArray(blacklist);
+    RefPtr<API::Array> webWhitelist = toImmutableArray(whitelist);
+    RefPtr<API::Array> webBlacklist = toImmutableArray(blacklist);
 
     // We always use UserStyleUserLevel to match the behavior of WKPageGroupAddUserStyleSheet.
     group->priv->pageGroup->addUserStyleSheet(
index fd0aed2..347a9a7 100644 (file)
@@ -55,7 +55,7 @@ void webKitWebViewDidReceiveSnapshot(WebKitWebView*, uint64_t callbackID, WebKit
 void webkitWebViewRemoveLoadingWebResource(WebKitWebView*, uint64_t resourceIdentifier);
 bool webkitWebViewEnterFullScreen(WebKitWebView*);
 bool webkitWebViewLeaveFullScreen(WebKitWebView*);
-void webkitWebViewPopulateContextMenu(WebKitWebView*, WebKit::ImmutableArray* proposedMenu, WebKit::WebHitTestResult*);
+void webkitWebViewPopulateContextMenu(WebKitWebView*, WebKit::API::Array* proposedMenu, WebKit::WebHitTestResult*);
 void webkitWebViewSubmitFormRequest(WebKitWebView*, WebKitFormSubmissionRequest*);
 void webkitWebViewHandleAuthenticationChallenge(WebKitWebView*, WebKit::AuthenticationChallengeProxy*);
 void webkitWebViewInsecureContentDetected(WebKitWebView*, WebKitInsecureContentEvent);
index a073f6d..3c8c112 100644 (file)
 #include "config.h"
 #include "WebGrammarDetail.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WKGrammarDetail.h"
 #include "WebString.h"
 
 namespace WebKit {
 
-PassRefPtr<WebGrammarDetail> WebGrammarDetail::create(int location, int length, ImmutableArray* guesses, const String& userDescription)
+PassRefPtr<WebGrammarDetail> WebGrammarDetail::create(int location, int length, API::Array* guesses, const String& userDescription)
 {
     return adoptRef(new WebGrammarDetail(location, length, guesses, userDescription));
 }
@@ -42,7 +42,7 @@ PassRefPtr<WebGrammarDetail> WebGrammarDetail::create(const WebCore::GrammarDeta
     return adoptRef(new WebGrammarDetail(grammarDetail));
 }
 
-WebGrammarDetail::WebGrammarDetail(int location, int length, ImmutableArray* guesses, const String& userDescription)
+WebGrammarDetail::WebGrammarDetail(int location, int length, API::Array* guesses, const String& userDescription)
 {
     m_grammarDetail.location = location;
     m_grammarDetail.length = length;
@@ -55,13 +55,13 @@ WebGrammarDetail::WebGrammarDetail(int location, int length, ImmutableArray* gue
     m_grammarDetail.userDescription = userDescription;
 }
 
-PassRefPtr<ImmutableArray> WebGrammarDetail::guesses() const
+PassRefPtr<API::Array> WebGrammarDetail::guesses() const
 {
     size_t numGuesses = m_grammarDetail.guesses.size();
     Vector<RefPtr<API::Object> > wkGuesses(numGuesses);
     for (unsigned i = 0; i < numGuesses; ++i)
         wkGuesses[i] = WebString::create(m_grammarDetail.guesses[i]);
-    return ImmutableArray::create(std::move(wkGuesses));
+    return API::Array::create(std::move(wkGuesses));
 }
 
 WebGrammarDetail::WebGrammarDetail(const WebCore::GrammarDetail& grammarDetail)
index 5ca1f95..52fe868 100644 (file)
@@ -26,6 +26,7 @@
 #ifndef WebGrammarDetail_h
 #define WebGrammarDetail_h
 
+#include "APIArray.h"
 #include "APIObject.h"
 #include <WebCore/TextCheckerClient.h>
 #include <wtf/Forward.h>
 
 namespace WebKit {
 
-class ImmutableArray;
-
 class WebGrammarDetail : public API::TypedObject<API::Object::Type::GrammarDetail> {
 public:
-    static PassRefPtr<WebGrammarDetail> create(int location, int length, ImmutableArray* guesses, const String& userDescription);
+    static PassRefPtr<WebGrammarDetail> create(int location, int length, API::Array* guesses, const String& userDescription);
     static PassRefPtr<WebGrammarDetail> create(const WebCore::GrammarDetail&);
 
     int location() const { return m_grammarDetail.location; }
     int length() const { return m_grammarDetail.length; }
-    PassRefPtr<ImmutableArray> guesses() const;
+    PassRefPtr<API::Array> guesses() const;
     const String& userDescription() const { return m_grammarDetail.userDescription; }
 
     const WebCore::GrammarDetail& grammarDetail() { return m_grammarDetail; }
 
 private:
-    WebGrammarDetail(int location, int length, ImmutableArray* guesses, const String& userDescription);
+    WebGrammarDetail(int location, int length, API::Array* guesses, const String& userDescription);
     explicit WebGrammarDetail(const WebCore::GrammarDetail&);
 
     WebCore::GrammarDetail m_grammarDetail;
index cc69d5e..cdb8820 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "WebTextCheckerClient.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WKAPICast.h"
 #include "WKSharedAPICast.h"
 #include "WebGrammarDetail.h"
@@ -113,7 +113,7 @@ void WebTextCheckerClient::checkGrammarOfString(uint64_t tag, const String& text
     WKArrayRef wkGrammarDetailsRef = 0;
     m_client.checkGrammarOfString(tag, toAPI(text.impl()), &wkGrammarDetailsRef, &badGrammarLocation, &badGrammarLength, m_client.clientInfo);
 
-    RefPtr<ImmutableArray> wkGrammarDetails = adoptRef(toImpl(wkGrammarDetailsRef));
+    RefPtr<API::Array> wkGrammarDetails = adoptRef(toImpl(wkGrammarDetailsRef));
     size_t numGrammarDetails = wkGrammarDetails->size();
     for (size_t i = 0; i < numGrammarDetails; ++i)
         grammarDetails.append(wkGrammarDetails->at<WebGrammarDetail>(i)->grammarDetail());
@@ -156,7 +156,7 @@ void WebTextCheckerClient::guessesForWord(uint64_t tag, const String& word, Vect
     if (!m_client.guessesForWord)
         return;
 
-    RefPtr<ImmutableArray> wkGuesses = adoptRef(toImpl(m_client.guessesForWord(tag, toAPI(word.impl()), m_client.clientInfo)));
+    RefPtr<API::Array> wkGuesses = adoptRef(toImpl(m_client.guessesForWord(tag, toAPI(word.impl()), m_client.clientInfo)));
     size_t numGuesses = wkGuesses->size();
     for (size_t i = 0; i < numGuesses; ++i)
         guesses.append(wkGuesses->at<WebString>(i)->string());
index 9d85e7b..0fe7f79 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "WebUIPopupMenuClient.h"
 
-#include "ImmutableArray.h"
+#include "APIArray.h"
 #include "WKAPICast.h"
 #include "WebPopupItemEfl.h"
 #include "WebPopupMenuListenerEfl.h"
@@ -44,9 +44,9 @@ void WebUIPopupMenuClient::showPopupMenu(WebPageProxy* pageProxy, WebPopupMenuPr
     for (size_t i = 0; i < size; ++i)
         webPopupItems.append(WebPopupItemEfl::create(items[i]));
 
-    RefPtr<ImmutableArray> ItemsArray;
+    RefPtr<API::Array> ItemsArray;
     if (!webPopupItems.isEmpty())
-        ItemsArray = ImmutableArray::create(std::move(webPopupItems));
+        ItemsArray = API::Array::create(std::move(webPopupItems));
 
     m_client.showPopupMenu(toAPI(pageProxy), toAPI(static_cast<WebPopupMenuListenerEfl*>(popupMenuProxy)), toAPI(rect), toAPI(textDirection), pageScaleFactor, toAPI(ItemsArray.get()), selectedIndex, m_client.clientInfo);
 }