Diff
Modified: trunk/Source/WebKit2/ChangeLog (160749 => 160750)
--- trunk/Source/WebKit2/ChangeLog 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-18 06:04:51 UTC (rev 160750)
@@ -1,3 +1,26 @@
+2013-12-17 Jae Hyun Park <[email protected]>
+
+ [GTK] Build fix after r160737
+
+ Unreviewed.
+
+ Rename WebURLRequest to API::URLRequest
+
+ * GNUmakefile.list.am:
+ * UIProcess/API/gtk/WebKitInjectedBundleClient.cpp:
+ (didReceiveWebViewMessageFromInjectedBundle):
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp:
+ (webkitNavigationPolicyDecisionCreate):
+ * UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp:
+ (webkitResponsePolicyDecisionCreate):
+ * UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h:
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_load_request):
+ * UIProcess/API/gtk/WebKitWindowProperties.cpp:
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (willSendRequestForFrame):
+
2013-12-17 Ryuan Choi <[email protected]>
Unreviewed build fix on EFL port after r160737
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (160749 => 160750)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-18 06:04:51 UTC (rev 160750)
@@ -432,6 +432,8 @@
Source/WebKit2/Shared/API/c/WKUserScriptInjectionTime.h \
Source/WebKit2/Shared/APIObject.cpp \
Source/WebKit2/Shared/APIObject.h \
+ Source/WebKit2/Shared/APIURLRequest.cpp \
+ Source/WebKit2/Shared/APIURLRequest.h \
Source/WebKit2/Shared/ActivityAssertion.cpp \
Source/WebKit2/Shared/ActivityAssertion.h \
Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp \
@@ -599,8 +601,6 @@
Source/WebKit2/Shared/WebString.h \
Source/WebKit2/Shared/WebTouchEvent.cpp \
Source/WebKit2/Shared/WebURL.h \
- Source/WebKit2/Shared/WebURLRequest.cpp \
- Source/WebKit2/Shared/WebURLRequest.h \
Source/WebKit2/Shared/WebURLResponse.cpp \
Source/WebKit2/Shared/WebURLResponse.h \
Source/WebKit2/Shared/WebUserContentURLPattern.h \
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitInjectedBundleClient.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -36,7 +36,7 @@
if (g_str_equal(messageName, "DidInitiateLoadForResource")) {
WebFrameProxy* frame = static_cast<WebFrameProxy*>(message.get(String::fromUTF8("Frame")));
API::UInt64* resourceIdentifier = static_cast<API::UInt64*>(message.get(String::fromUTF8("Identifier")));
- WebURLRequest* webRequest = static_cast<WebURLRequest*>(message.get(String::fromUTF8("Request")));
+ API::URLRequest* webRequest = static_cast<API::URLRequest*>(message.get(String::fromUTF8("Request")));
GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(webRequest->resourceRequest()));
webkitWebViewResourceLoadStarted(webView, frame, resourceIdentifier->value(), request.get());
@@ -46,7 +46,7 @@
if (!resource)
return;
- WebURLRequest* webRequest = static_cast<WebURLRequest*>(message.get(String::fromUTF8("Request")));
+ API::URLRequest* webRequest = static_cast<API::URLRequest*>(message.get(String::fromUTF8("Request")));
GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(webRequest->resourceRequest()));
WebURLResponse* webRedirectResponse = static_cast<WebURLResponse*>(message.get(String::fromUTF8("RedirectResponse")));
GRefPtr<WebKitURIResponse> redirectResponse = webRedirectResponse ? adoptGRef(webkitURIResponseCreateForResourceResponse(webRedirectResponse->resourceResponse())) : 0;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecision.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -20,11 +20,11 @@
#include "config.h"
#include "WebKitNavigationPolicyDecision.h"
+#include "APIURLRequest.h"
#include "WebEvent.h"
#include "WebKitEnumTypes.h"
#include "WebKitPolicyDecisionPrivate.h"
#include "WebKitURIRequestPrivate.h"
-#include "WebURLRequest.h"
#include <glib/gi18n-lib.h>
#include <wtf/gobject/GRefPtr.h>
#include <wtf/text/CString.h>
@@ -250,7 +250,7 @@
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_FORM_RESUBMITTED, NavigationTypeFormResubmitted);
COMPILE_ASSERT_MATCHING_ENUM(WEBKIT_NAVIGATION_TYPE_OTHER, NavigationTypeOther);
-WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType navigationType, unsigned mouseButton, unsigned modifiers, WebURLRequest* request, const char* frameName, WebFramePolicyListenerProxy* listener)
+WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType navigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest* request, const char* frameName, WebFramePolicyListenerProxy* listener)
{
WebKitNavigationPolicyDecision* decision = WEBKIT_NAVIGATION_POLICY_DECISION(g_object_new(WEBKIT_TYPE_NAVIGATION_POLICY_DECISION, NULL));
decision->priv->navigationType = navigationType;
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitNavigationPolicyDecisionPrivate.h 2013-12-18 06:04:51 UTC (rev 160750)
@@ -23,6 +23,6 @@
#include "WebKitNavigationPolicyDecision.h"
#include "WebKitPrivate.h"
-WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType, unsigned mouseButton, unsigned modifiers, WebKit::WebURLRequest*, const char* frameName, WebKit::WebFramePolicyListenerProxy*);
+WebKitNavigationPolicyDecision* webkitNavigationPolicyDecisionCreate(WebKitNavigationType, unsigned mouseButton, unsigned modifiers, API::URLRequest*, const char* frameName, WebKit::WebFramePolicyListenerProxy*);
#endif // WebKitNavigationPolicyDecisionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -20,11 +20,11 @@
#include "config.h"
#include "WebKitResponsePolicyDecision.h"
+#include "APIURLRequest.h"
#include "WebKitPolicyDecisionPrivate.h"
#include "WebKitPrivate.h"
#include "WebKitURIRequestPrivate.h"
#include "WebKitURIResponsePrivate.h"
-#include "WebURLRequest.h"
#include "WebURLResponse.h"
#include <glib/gi18n-lib.h>
#include <wtf/gobject/GRefPtr.h>
@@ -137,7 +137,7 @@
return decision->priv->response.get();
}
-WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(WebURLRequest* request, WebURLResponse* response, WebFramePolicyListenerProxy* listener)
+WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(API::URLRequest* request, WebURLResponse* response, WebFramePolicyListenerProxy* listener)
{
WebKitResponsePolicyDecision* decision = WEBKIT_RESPONSE_POLICY_DECISION(g_object_new(WEBKIT_TYPE_RESPONSE_POLICY_DECISION, NULL));
decision->priv->request = adoptGRef(webkitURIRequestCreateForResourceRequest(request->resourceRequest()));
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h 2013-12-18 06:04:51 UTC (rev 160750)
@@ -23,6 +23,6 @@
#include "WebKitPrivate.h"
#include "WebKitResponsePolicyDecision.h"
-WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(WebKit::WebURLRequest*, WebKit::WebURLResponse*, WebKit::WebFramePolicyListenerProxy*);
+WebKitResponsePolicyDecision* webkitResponsePolicyDecisionCreate(API::URLRequest*, WebKit::WebURLResponse*, WebKit::WebFramePolicyListenerProxy*);
#endif // WebKitResponsePolicyDecisionPrivate_h
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -2027,7 +2027,7 @@
ResourceRequest resourceRequest;
webkitURIRequestGetResourceRequest(request, resourceRequest);
- RefPtr<WebURLRequest> urlRequest = WebURLRequest::create(resourceRequest);
+ RefPtr<API::URLRequest> urlRequest = API::URLRequest::create(resourceRequest);
getPage(webView)->loadURLRequest(urlRequest.get());
}
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp (160749 => 160750)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWindowProperties.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -21,10 +21,10 @@
#include "WebKitWindowProperties.h"
#include "APINumber.h"
+#include "APIURLRequest.h"
#include "ImmutableDictionary.h"
#include "WebKitPrivate.h"
#include "WebKitWindowPropertiesPrivate.h"
-#include "WebURLRequest.h"
#include <WebCore/IntRect.h>
#include <glib/gi18n-lib.h>
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (160749 => 160750)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-18 05:37:02 UTC (rev 160749)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2013-12-18 06:04:51 UTC (rev 160750)
@@ -172,7 +172,7 @@
ResourceRequest resourceRequest;
webkitURIRequestGetResourceRequest(request.get(), resourceRequest);
- RefPtr<WebURLRequest> newRequest = WebURLRequest::create(resourceRequest);
+ RefPtr<API::URLRequest> newRequest = API::URLRequest::create(resourceRequest);
ImmutableDictionary::MapType message;
message.set(String::fromUTF8("Page"), toImpl(page));
