[GTK] can't build from trunk: WebKitCookieManager: 'WebString' was no…

…t declared in this scope

https://bugs.webkit.org/show_bug.cgi?id=125759

Reviewed by Carlos Garcia Campos.

Renamed WebString to API::String after r160608.

* 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_get_selected_files):
* UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
(webkit_form_submission_request_get_text_fields):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_set_web_extensions_directory):
(webkit_web_context_prefetch_dns):
* UIProcess/API/gtk/WebKitWebViewGroup.cpp:
(toAPIArray):
* WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
(webkitWebExtensionDidReceiveMessage):

Canonical link: https://commits.webkit.org/143794@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160632 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog

@@ -1,3 +1,28 @@
+2013-12-16  Sergio Villar Senin  <svillar@igalia.com>
+
+        [GTK] can't build from trunk: WebKitCookieManager: 'WebString' was not declared in this scope
+        https://bugs.webkit.org/show_bug.cgi?id=125759
+
+        Reviewed by Carlos Garcia Campos.
+
+        Renamed WebString to API::String after r160608.
+
+        * 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_get_selected_files):
+        * UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp:
+        (webkit_form_submission_request_get_text_fields):
+        * UIProcess/API/gtk/WebKitWebContext.cpp:
+        (webkit_web_context_set_web_extensions_directory):
+        (webkit_web_context_prefetch_dns):
+        * UIProcess/API/gtk/WebKitWebViewGroup.cpp:
+        (toAPIArray):
+        * WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp:
+        (webkitWebExtensionDidReceiveMessage):
+
 2013-12-15  Tim Horton  <timothy_horton@apple.com>
 
         WebKit2 View Gestures: Can't pinch in past the maximum scale

Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "WebKitCookieManager.h"
 
+#include "APIString.h"
 #include "SoupCookiePersistentStorageType.h"
 #include "WebCookieManagerProxy.h"
 #include "WebKitCookieManagerPrivate.h"
@@ -205,7 +206,7 @@ static void webkitCookieManagerGetDomainsWithCookiesCallback(WKArrayRef wkDomain
     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));
+        API::String* domainString = static_cast<API::String*>(domains->at(i));
         String domain = domainString->string();
         if (domain.isEmpty())
             continue;

Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp

@@ -21,6 +21,7 @@
 #include "WebKitFileChooserRequest.h"
 
 #include "APIArray.h"
+#include "APIString.h"
 #include "WebKitFileChooserRequestPrivate.h"
 #include "WebOpenPanelParameters.h"
 #include "WebOpenPanelResultListenerProxy.h"
@@ -212,7 +213,7 @@ const gchar* const* webkit_file_chooser_request_get_mime_types(WebKitFileChooser
 
     request->priv->mimeTypes = adoptGRef(g_ptr_array_new_with_free_func(g_free));
     for (size_t i = 0; i < numOfMimeTypes; ++i) {
-        WebString* webMimeType = static_cast<WebString*>(mimeTypes->at(i));
+        API::String* webMimeType = static_cast<API::String*>(mimeTypes->at(i));
         String mimeTypeString = webMimeType->string();
         if (mimeTypeString.isEmpty())
             continue;
@@ -256,7 +257,7 @@ GtkFileFilter* webkit_file_chooser_request_get_mime_types_filter(WebKitFileChoos
     // sure we keep the ownership during the lifetime of the request.
     request->priv->filter = gtk_file_filter_new();
     for (size_t i = 0; i < numOfMimeTypes; ++i) {
-        WebString* webMimeType = static_cast<WebString*>(mimeTypes->at(i));
+        API::String* webMimeType = static_cast<API::String*>(mimeTypes->at(i));
         String mimeTypeString = webMimeType->string();
         if (mimeTypeString.isEmpty())
             continue;
@@ -352,7 +353,7 @@ const gchar* const* webkit_file_chooser_request_get_selected_files(WebKitFileCho
 
     request->priv->selectedFiles = adoptGRef(g_ptr_array_new_with_free_func(g_free));
     for (size_t i = 0; i < numOfFiles; ++i) {
-        WebString* webFileName = static_cast<WebString*>(selectedFileNames->at(i));
+        API::String* webFileName = static_cast<API::String*>(selectedFileNames->at(i));
         if (webFileName->isEmpty())
             continue;
         CString filename = fileSystemRepresentation(webFileName->string());

Source/WebKit2/UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "WebKitFormSubmissionRequest.h"
 
+#include "APIString.h"
 #include "ImmutableDictionary.h"
 #include "WebFormSubmissionListenerProxy.h"
 #include "WebKitFormSubmissionRequestPrivate.h"
@@ -102,7 +103,7 @@ GHashTable* webkit_form_submission_request_get_text_fields(WebKitFormSubmissionR
     const ImmutableDictionary::MapType& map = request->priv->webValues->map();
     ImmutableDictionary::MapType::const_iterator end = map.end();
     for (ImmutableDictionary::MapType::const_iterator it = map.begin(); it != end; ++it) {
-        WebString* value = static_cast<WebString*>(it->value.get());
+        API::String* value = static_cast<API::String*>(it->value.get());
         g_hash_table_insert(request->priv->values.get(), g_strdup(it->key.utf8().data()), g_strdup(value->string().utf8().data()));
     }
 

Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "WebKitWebContext.h"
 
+#include "APIString.h"
 #include "WebBatteryManagerProxy.h"
 #include "WebCertificateInfo.h"
 #include "WebCookieManagerProxy.h"
@@ -782,7 +783,7 @@ void webkit_web_context_set_web_extensions_directory(WebKitWebContext* context,
     g_return_if_fail(directory);
 
     // We pass the additional web extensions directory to the injected bundle as initialization user data.
-    context->priv->context->setInjectedBundleInitializationUserData(WebString::create(WebCore::filenameToString(directory)));
+    context->priv->context->setInjectedBundleInitializationUserData(API::String::create(WebCore::filenameToString(directory)));
 }
 
 /**
@@ -816,7 +817,7 @@ void webkit_web_context_prefetch_dns(WebKitWebContext* context, const char* host
     g_return_if_fail(hostname);
 
     ImmutableDictionary::MapType message;
-    message.set(String::fromUTF8("Hostname"), WebString::create(String::fromUTF8(hostname)));
+    message.set(String::fromUTF8("Hostname"), API::String::create(String::fromUTF8(hostname)));
     context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), ImmutableDictionary::create(std::move(message)).get());
 }
 

Source/WebKit2/UIProcess/API/gtk/WebKitWebViewGroup.cpp

@@ -21,6 +21,7 @@
 #include "WebKitWebViewGroup.h"
 
 #include "APIArray.h"
+#include "APIString.h"
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
 #include "WebKitWebViewGroupPrivate.h"
@@ -233,7 +234,7 @@ static PassRefPtr<API::Array> toAPIArray(const char* const* list)
 
     Vector<RefPtr<API::Object> > entries;
     while (*list) {
-        entries.append(WebString::createFromUTF8String(*list));
+        entries.append(API::String::createFromUTF8String(*list));
         list++;
     }
     return API::Array::create(std::move(entries));

Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp

@@ -20,6 +20,7 @@
 #include "config.h"
 #include "WebKitWebExtension.h"
 
+#include "APIString.h"
 #include "ImmutableDictionary.h"
 #include "WKBundleAPICast.h"
 #include "WKBundlePage.h"
@@ -83,7 +84,7 @@ static void webkitWebExtensionPageDestroy(WebKitWebExtension* extension, WebPage
 static void webkitWebExtensionDidReceiveMessage(WebKitWebExtension* extension, const String& messageName, ImmutableDictionary& message)
 {
     if (messageName == String::fromUTF8("PrefetchDNS")) {
-        WebString* hostname = static_cast<WebString*>(message.get(String::fromUTF8("Hostname")));
+        API::String* hostname = static_cast<API::String*>(message.get(String::fromUTF8("Hostname")));
         WebCore::prefetchDNS(hostname->string());
     } else
         ASSERT_NOT_REACHED();