Changeset 95521 in webkit

Timestamp:

Sep 20, 2011 1:58:54 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebProcess shouldn't use the GTK+ API
​https://bugs.webkit.org/show_bug.cgi?id=68062

Reviewed by Martin Robinson.

Source/WebCore:

Move errors code that is common between webki1 and webkit2 to
WebCore so that it can be shared.

• GNUmakefile.list.am: Add new files to compilation.
• platform/gtk/ErrorsGtk.cpp: Added.

(WebCore::cancelledError):
(WebCore::blockedError):
(WebCore::cannotShowURLError):
(WebCore::interruptedForPolicyChangeError):
(WebCore::cannotShowMIMETypeError):
(WebCore::fileDoesNotExistError):
(WebCore::pluginWillHandleLoadError):

• platform/gtk/ErrorsGtk.h: Added.

Source/WebKit/gtk:

Use WebCore API to create errors in frame loader.

• WebCoreSupport/AssertMatchingEnums.cpp:
• WebCoreSupport/FrameLoaderClientGtk.cpp:

(WebKit::FrameLoaderClient::cancelledError):
(WebKit::FrameLoaderClient::blockedError):
(WebKit::FrameLoaderClient::cannotShowURLError):
(WebKit::FrameLoaderClient::interruptedForPolicyChangeError):
(WebKit::FrameLoaderClient::cannotShowMIMETypeError):
(WebKit::FrameLoaderClient::fileDoesNotExistError):
(WebKit::FrameLoaderClient::pluginWillHandleLoadError):

• webkit/webkiterror.cpp:

(webkit_network_error_quark):
(webkit_policy_error_quark):
(webkit_plugin_error_quark):

Source/WebKit/gtk/po:

• POTFILES: Remove FrameLoaderGtk.cpp and add ErrorsGtk.cpp.

Source/WebKit2:

Use WebCore API to create errors in WebProcess.

• GNUmakefile.am: Don't use webkit/webkierror.h.
• WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:

(WebKit::cancelledError):
(WebKit::blockedError):
(WebKit::cannotShowURLError):
(WebKit::interruptedForPolicyChangeError):
(WebKit::cannotShowMIMETypeError):
(WebKit::fileDoesNotExistError):
(WebKit::pluginWillHandleLoadError):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.list.am (modified) (1 diff)
• WebCore/platform/gtk/ErrorsGtk.cpp (added)
• WebCore/platform/gtk/ErrorsGtk.h (added)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp (modified) (2 diffs)
• WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp (modified) (2 diffs)
• WebKit/gtk/po/ChangeLog (modified) (1 diff)
• WebKit/gtk/po/POTFILES (modified) (2 diffs)
• WebKit/gtk/webkit/webkiterror.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/GNUmakefile.am (modified) (1 diff)
• WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebProcess shouldn't use the GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=68062
+
+        Reviewed by Martin Robinson.
+
+        Move errors code that is common between webki1 and webkit2 to
+        WebCore so that it can be shared.
+
+        * GNUmakefile.list.am: Add new files to compilation.
+        * platform/gtk/ErrorsGtk.cpp: Added.
+        (WebCore::cancelledError):
+        (WebCore::blockedError):
+        (WebCore::cannotShowURLError):
+        (WebCore::interruptedForPolicyChangeError):
+        (WebCore::cannotShowMIMETypeError):
+        (WebCore::fileDoesNotExistError):
+        (WebCore::pluginWillHandleLoadError):
+        * platform/gtk/ErrorsGtk.h: Added.
+
 2011-09-19  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -2620 +2620 @@
         Source/WebCore/platform/graphics/WOFFFileFormat.cpp \
         Source/WebCore/platform/graphics/WOFFFileFormat.h \
+        Source/WebCore/platform/gtk/ErrorsGtk.cpp \
+        Source/WebCore/platform/gtk/ErrorsGtk.h \
         Source/WebCore/platform/gtk/KURLGtk.cpp \
         Source/WebCore/platform/gtk/LanguageGtk.cpp \

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebProcess shouldn't use the GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=68062
+
+        Reviewed by Martin Robinson.
+
+        Use WebCore API to create errors in frame loader.
+
+        * WebCoreSupport/AssertMatchingEnums.cpp:
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::cancelledError):
+        (WebKit::FrameLoaderClient::blockedError):
+        (WebKit::FrameLoaderClient::cannotShowURLError):
+        (WebKit::FrameLoaderClient::interruptedForPolicyChangeError):
+        (WebKit::FrameLoaderClient::cannotShowMIMETypeError):
+        (WebKit::FrameLoaderClient::fileDoesNotExistError):
+        (WebKit::FrameLoaderClient::pluginWillHandleLoadError):
+        * webkit/webkiterror.cpp:
+        (webkit_network_error_quark):
+        (webkit_policy_error_quark):
+        (webkit_plugin_error_quark):
+
 2011-09-20  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebKit/gtk/WebCoreSupport/AssertMatchingEnums.cpp

@@ -24 +24 @@
 #include "DumpRenderTreeSupportGtk.h"
 #include "EditingBehaviorTypes.h"
+#include "ErrorsGtk.h"
 #include "FindOptions.h"
 #include "FrameLoaderTypes.h"
 #include "PasteboardHelper.h"
+#include "webkiterror.h"
 #include "webkitwebnavigationaction.h"
 #include "webkitwebsettings.h"
@@ -57 +59 @@
 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_URI_LIST, PasteboardHelper::TargetTypeURIList);
 COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_WEB_VIEW_TARGET_INFO_NETSCAPE_URL, PasteboardHelper::TargetTypeNetscapeURL);
+
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FAILED, NetworkErrorFailed);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_TRANSPORT, NetworkErrorTransport);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_UNKNOWN_PROTOCOL, NetworkErrorUnknownProtocol);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_CANCELLED, NetworkErrorCancelled);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST, NetworkErrorFileDoesNotExist);
+
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FAILED, PolicyErrorFailed);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE, PolicyErrorCannotShowMimeType);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL, PolicyErrorCannotShowURL);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE, PolicyErrorFrameLoadInterruptedByPolicyChange);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT, PolicyErrorCannotUseRestrictedPort);
+
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_FAILED, PluginErrorFailed);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_FIND_PLUGIN, PluginErrorCannotFindPlugin);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CANNOT_LOAD_PLUGIN, PluginErrorCannotLoadPlugin);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_JAVA_UNAVAILABLE, PluginErrorJavaUnavailable);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_CONNECTION_CANCELLED, PluginErrorConnectionCancelled);
+COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD, PluginErrorWillHandleLoad);

trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

@@ -35 +35 @@
 #include "DocumentLoader.h"
 #include "DocumentLoaderGtk.h"
+#include "ErrorsGtk.h"
 #include "FormState.h"
 #include "FrameLoader.h"
@@ -1133 +1134 @@
 ResourceError FrameLoaderClient::cancelledError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_NETWORK_ERROR), WEBKIT_NETWORK_ERROR_CANCELLED,
-                         request.url().string(), _("Load request cancelled"));
+    return WebCore::cancelledError(request);
 }
 
 ResourceError FrameLoaderClient::blockedError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT,
-                         request.url().string(), _("Not allowed to use restricted network port"));
+    return WebCore::blockedError(request);
 }
 
 ResourceError FrameLoaderClient::cannotShowURLError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL,
-                         request.url().string(), _("URL cannot be shown"));
+    return WebCore::cannotShowURLError(request);
 }
 
 ResourceError FrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,
-                         request.url().string(), _("Frame load was interrupted"));
+    return WebCore::interruptedForPolicyChangeError(request);
 }
 
 ResourceError FrameLoaderClient::cannotShowMIMETypeError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE,
-                         response.url().string(), _("Content with the specified MIME type cannot be shown"));
+    return WebCore::cannotShowMIMETypeError(response);
 }
 
 ResourceError FrameLoaderClient::fileDoesNotExistError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_NETWORK_ERROR), WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST,
-                         response.url().string(), _("File does not exist"));
+    return WebCore::fileDoesNotExistError(response);
 }
 
 ResourceError FrameLoaderClient::pluginWillHandleLoadError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_PLUGIN_ERROR), WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD,
-                         response.url().string(), _("Plugin will handle load"));
+    return WebCore::pluginWillHandleLoadError(response);
 }
 

trunk/Source/WebKit/gtk/po/ChangeLog

@@ +1 @@
+2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebProcess shouldn't use the GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=68062
+
+        Reviewed by Martin Robinson.
+
+        * POTFILES: Remove FrameLoaderGtk.cpp and add ErrorsGtk.cpp.
+
 2011-09-19  Gustavo Noronha Silva  <gns@gnome.org>
 

trunk/Source/WebKit/gtk/po/POTFILES

@@ -2 +2 @@
 Source/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
 Source/WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp
-Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
 Source/WebKit/gtk/WebCoreSupport/FullscreenVideoController.cpp
 Source/WebKit/gtk/webkit/webkitdownload.cpp
@@ -12 +11 @@
 Source/WebKit/gtk/webkit/webkitwebsettings.cpp
 Source/WebKit/gtk/webkit/webkitwebview.cpp
+Source/WebCore/platform/gtk/ErrorsGtk.cpp
 Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp

trunk/Source/WebKit/gtk/webkit/webkiterror.cpp

@@ -19 +19 @@
 
 #include "config.h"
+#include "webkiterror.h"
 
-#include "webkiterror.h"
+#include "ErrorsGtk.h"
 
 GQuark webkit_network_error_quark(void)
 {
-    return g_quark_from_static_string("webkit-network-error-quark");
+    return g_quark_from_static_string(WebCore::errorDomainNetwork);
 }
 
 GQuark webkit_policy_error_quark(void)
 {
-    return g_quark_from_static_string("webkit-policy-error-quark");
+    return g_quark_from_static_string(WebCore::errorDomainPolicy);
 }
 
 GQuark webkit_plugin_error_quark(void)
 {
-    return g_quark_from_static_string("webkit-plugin-error-quark");
+    return g_quark_from_static_string(WebCore::errorDomainPlugin);
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-09-20  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebProcess shouldn't use the GTK+ API
+        https://bugs.webkit.org/show_bug.cgi?id=68062
+
+        Reviewed by Martin Robinson.
+
+        Use WebCore API to create errors in WebProcess.
+
+        * GNUmakefile.am: Don't use webkit/webkierror.h.
+        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
+        (WebKit::cancelledError):
+        (WebKit::blockedError):
+        (WebKit::cannotShowURLError):
+        (WebKit::interruptedForPolicyChangeError):
+        (WebKit::cannotShowMIMETypeError):
+        (WebKit::fileDoesNotExistError):
+        (WebKit::pluginWillHandleLoadError):
+
 2011-09-19  Mark Rowe  <mrowe@apple.com>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -147 +147 @@
 
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \
-        Source/WebKit/gtk/webkit/webkiterror.h \
-        Source/WebKit/gtk/webkit/webkiterror.cpp \
         Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
         Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \

trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp

@@ -29 +29 @@
 #include "WebErrors.h"
 
+#include <WebCore/ErrorsGtk.h>
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
-#include <glib/gi18n-lib.h>
-#include <webkit/webkiterror.h>
 
 using namespace WebCore;
@@ -41 +40 @@
 ResourceError cancelledError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_NETWORK_ERROR), WEBKIT_NETWORK_ERROR_CANCELLED,
-                         request.url().string(), _("Load request cancelled"));
+    return WebCore::cancelledError(request);
 }
 
 ResourceError blockedError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_USE_RESTRICTED_PORT,
-                         request.url().string(), _("Not allowed to use restricted network port"));
+    return WebCore::blockedError(request);
 }
 
 ResourceError cannotShowURLError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_SHOW_URL,
-                         request.url().string(), _("URL cannot be shown"));
+    return WebCore::cannotShowURLError(request);
 }
 
 ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,
-                         request.url().string(), _("Frame load was interrupted"));
+    return WebCore::interruptedForPolicyChangeError(request);
 }
 
 ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_CANNOT_SHOW_MIME_TYPE,
-                         response.url().string(), _("Content with the specified MIME type cannot be shown"));
+    return WebCore::cannotShowMIMETypeError(response);
 }
 
 ResourceError fileDoesNotExistError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_NETWORK_ERROR), WEBKIT_NETWORK_ERROR_FILE_DOES_NOT_EXIST,
-                         response.url().string(), _("File does not exist"));
+    return WebCore::fileDoesNotExistError(response);
 }
 
 ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
 {
-    return ResourceError(g_quark_to_string(WEBKIT_PLUGIN_ERROR), WEBKIT_PLUGIN_ERROR_WILL_HANDLE_LOAD,
-                         response.url().string(), _("Plugin will handle load"));
+    return WebCore::pluginWillHandleLoadError(response);
 }