Changeset 160632 in webkit

Timestamp:

Dec 16, 2013 3:15:54 AM (10 years ago)

Author:

svillar@igalia.com

Message:

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitCookieManager.cpp (modified) (2 diffs)
• UIProcess/API/gtk/WebKitFileChooserRequest.cpp (modified) (4 diffs)
• UIProcess/API/gtk/WebKitFormSubmissionRequest.cpp (modified) (2 diffs)
• UIProcess/API/gtk/WebKitWebContext.cpp (modified) (3 diffs)
• UIProcess/API/gtk/WebKitWebViewGroup.cpp (modified) (2 diffs)
• WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

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

@@ -21 +21 @@
 #include "WebKitCookieManager.h"
 
+#include "APIString.h"
 #include "SoupCookiePersistentStorageType.h"
 #include "WebCookieManagerProxy.h"
@@ -206 +207 @@
     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())

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

@@ -22 +22 @@
 
 #include "APIArray.h"
+#include "APIString.h"
 #include "WebKitFileChooserRequestPrivate.h"
 #include "WebOpenPanelParameters.h"
@@ -213 +214 @@
     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())
@@ -257 +258 @@
     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())
@@ -353 +354 @@
     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;

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

@@ -21 +21 @@
 #include "WebKitFormSubmissionRequest.h"
 
+#include "APIString.h"
 #include "ImmutableDictionary.h"
 #include "WebFormSubmissionListenerProxy.h"
@@ -103 +104 @@
     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()));
     }

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

@@ -21 +21 @@
 #include "WebKitWebContext.h"
 
+#include "APIString.h"
 #include "WebBatteryManagerProxy.h"
 #include "WebCertificateInfo.h"
@@ -783 +784 @@
 
     // 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)));
 }
 
@@ -817 +818 @@
 
     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());
 }

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

@@ -22 +22 @@
 
 #include "APIArray.h"
+#include "APIString.h"
 #include "WebKitPrivate.h"
 #include "WebKitSettingsPrivate.h"
@@ -234 +235 @@
     Vector<RefPtr<API::Object> > entries;
     while (*list) {
-        entries.append(WebString::createFromUTF8String(*list));
+        entries.append(API::String::createFromUTF8String(*list));
         list++;
     }

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

@@ -21 +21 @@
 #include "WebKitWebExtension.h"
 
+#include "APIString.h"
 #include "ImmutableDictionary.h"
 #include "WKBundleAPICast.h"
@@ -84 +85 @@
 {
     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