Diff
Modified: trunk/Source/WebKit2/ChangeLog (160973 => 160974)
--- trunk/Source/WebKit2/ChangeLog 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-22 09:09:01 UTC (rev 160974)
@@ -1,3 +1,21 @@
+2013-12-22 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build after r160971 and r160969.
+
+ * GNUmakefile.list.am:
+ * UIProcess/API/gtk/WebKitFileChooserRequest.cpp:
+ (webkit_file_chooser_request_select_files):
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ (didReceiveWebViewMessageFromInjectedBundle):
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ (webkitURISchemeRequestCreate):
+ * UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h:
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ (webkit_web_resource_get_data):
+ * UIProcess/soup/WebSoupRequestManagerClient.h:
+ * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
+ (WebKit::internalError):
+
2013-12-21 Ryuan Choi <[email protected]>
Unreviewed build fix attempt on EFL port after r160971 and r160969
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (160973 => 160974)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-22 09:09:01 UTC (rev 160974)
@@ -370,6 +370,8 @@
Source/WebKit2/Shared/APIArray.h \
Source/WebKit2/Shared/APIData.cpp \
Source/WebKit2/Shared/APIData.h \
+ Source/WebKit2/Shared/APIError.cpp \
+ Source/WebKit2/Shared/APIError.h \
Source/WebKit2/Shared/APIFrameHandle.cpp \
Source/WebKit2/Shared/APIFrameHandle.h \
Source/WebKit2/Shared/APIGeometry.cpp \
@@ -379,6 +381,7 @@
Source/WebKit2/Shared/APIPageHandle.h \
Source/WebKit2/Shared/APIClient.h \
Source/WebKit2/Shared/APIString.h \
+ Source/WebKit2/Shared/APIURL.h \
Source/WebKit2/Shared/APIURLResponse.cpp \
Source/WebKit2/Shared/APIURLResponse.h \
Source/WebKit2/Shared/API/c/cairo/WKImageCairo.cpp \
@@ -572,8 +575,6 @@
Source/WebKit2/Shared/WebContextMenuItem.h \
Source/WebKit2/Shared/WebCoreArgumentCoders.cpp \
Source/WebKit2/Shared/WebCoreArgumentCoders.h \
- Source/WebKit2/Shared/WebError.cpp \
- Source/WebKit2/Shared/WebError.h \
Source/WebKit2/Shared/WebEventConversion.cpp \
Source/WebKit2/Shared/WebEventConversion.h \
Source/WebKit2/Shared/WebEvent.cpp \
@@ -613,7 +614,6 @@
Source/WebKit2/Shared/WebSecurityOrigin.h \
Source/WebKit2/Shared/WebSerializedScriptValue.h \
Source/WebKit2/Shared/WebTouchEvent.cpp \
- Source/WebKit2/Shared/WebURL.h \
Source/WebKit2/Shared/WebUserContentURLPattern.h \
Source/WebKit2/Shared/WebWheelEvent.cpp \
Source/WebKit2/UIProcess/API/C/gtk/WKAPICastGtk.h \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitFileChooserRequest.cpp 2013-12-22 09:09:01 UTC (rev 160974)
@@ -307,7 +307,7 @@
// string, with the 'file://' prefix) to WebCore otherwise the
// FileChooser won't actually choose it.
GOwnPtr<char> uri(g_file_get_uri(filename.get()));
- choosenFiles.append(WebURL::create(String::fromUTF8(uri.get())));
+ choosenFiles.append(API::URL::create(String::fromUTF8(uri.get())));
// Do not use the URI here because this won't reach WebCore.
g_ptr_array_add(selectedFiles.get(), g_strdup(files[i]));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-22 09:09:01 UTC (rev 160974)
@@ -84,7 +84,7 @@
if (!resource)
return;
- WebError* webError = static_cast<WebError*>(message.get(String::fromUTF8("Error")));
+ API::Error* webError = static_cast<API::Error*>(message.get(String::fromUTF8("Error")));
const ResourceError& platformError = webError->platformError();
GOwnPtr<GError> resourceError(g_error_new_literal(g_quark_from_string(platformError.domain().utf8().data()),
platformError.errorCode(), platformError.localizedDescription().utf8().data()));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2013-12-22 09:09:01 UTC (rev 160974)
@@ -74,7 +74,7 @@
{
}
-WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext* webContext, WebSoupRequestManagerProxy* webRequestManager, WebURL* webURL, WebPageProxy* initiatingPage, uint64_t requestID)
+WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext* webContext, WebSoupRequestManagerProxy* webRequestManager, API::URL* webURL, WebPageProxy* initiatingPage, uint64_t requestID)
{
WebKitURISchemeRequest* request = WEBKIT_URI_SCHEME_REQUEST(g_object_new(WEBKIT_TYPE_URI_SCHEME_REQUEST, NULL));
request->priv->webContext = webContext;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h 2013-12-22 09:09:01 UTC (rev 160974)
@@ -24,7 +24,7 @@
#include "WebKitURISchemeRequest.h"
#include "WebKitWebContext.h"
-WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext*, WebKit::WebSoupRequestManagerProxy*, WebKit::WebURL*, WebKit::WebPageProxy*, uint64_t requestID);
+WebKitURISchemeRequest* webkitURISchemeRequestCreate(WebKitWebContext*, WebKit::WebSoupRequestManagerProxy*, API::URL*, WebKit::WebPageProxy*, uint64_t requestID);
uint64_t webkitURISchemeRequestGetID(WebKitURISchemeRequest*);
void webkitURISchemeRequestCancel(WebKitURISchemeRequest*);
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2013-12-22 09:09:01 UTC (rev 160974)
@@ -344,7 +344,7 @@
resource->priv->frame->getMainResourceData(DataCallback::create(task, resourceDataCallback));
else {
String url = ""
- resource->priv->frame->getResourceData(WebURL::create(url).get(), DataCallback::create(task, resourceDataCallback));
+ resource->priv->frame->getResourceData(API::URL::create(url).get(), DataCallback::create(task, resourceDataCallback));
}
}
Modified: trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h (160973 => 160974)
--- trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/UIProcess/soup/WebSoupRequestManagerClient.h 2013-12-22 09:09:01 UTC (rev 160974)
@@ -25,6 +25,8 @@
#include "WKSoupRequestManager.h"
namespace API {
+class URL;
+
template<> struct ClientTraits<WKSoupRequestManagerClientBase> {
typedef std::tuple<WKSoupRequestManagerClientV0> Versions;
};
@@ -33,11 +35,10 @@
namespace WebKit {
class WebSoupRequestManagerProxy;
-class WebURL;
class WebSoupRequestManagerClient : public API::Client<WKSoupRequestManagerClientBase> {
public:
- bool didReceiveURIRequest(WebSoupRequestManagerProxy*, WebURL*, WebPageProxy*, uint64_t requestID);
+ bool didReceiveURIRequest(WebSoupRequestManagerProxy*, API::URL*, WebPageProxy*, uint64_t requestID);
void didFailToLoadURIRequest(WebSoupRequestManagerProxy*, uint64_t requestID);
};
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp (160973 => 160974)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp 2013-12-22 07:01:57 UTC (rev 160973)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp 2013-12-22 09:09:01 UTC (rev 160974)
@@ -28,7 +28,7 @@
#include "config.h"
#include "WebErrors.h"
-#include "WebError.h"
+#include "APIError.h"
#include <WebCore/ErrorsGtk.h>
#include <WebCore/ResourceError.h>
#include <WebCore/ResourceRequest.h>
@@ -77,7 +77,7 @@
WebCore::ResourceError internalError(const WebCore::URL& url)
{
- return ResourceError(WebError::webKitErrorDomain(), kWKErrorInternal, url.string(), _("Internal error"));
+ return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url.string(), _("Internal error"));
}
} // namespace WebKit
