Diff
Modified: trunk/Source/WebKit2/ChangeLog (140284 => 140285)
--- trunk/Source/WebKit2/ChangeLog 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-21 01:01:40 UTC (rev 140285)
@@ -1,3 +1,34 @@
+2013-01-20 Sam Weinig <[email protected]>
+
+ Remove support getting per-resource callbacks in the UIProcess
+ https://bugs.webkit.org/show_bug.cgi?id=107405
+
+ Reviewed by Anders Carlsson.
+
+ Removes support for the WKPageResourceLoadClient. Access to per-resource
+ callbacks are still available in the bundle, and via the WebInspector.
+
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ Stop handling per-resource messages and forwarding them to the API.
+
+ * UIProcess/WebResourceLoadClient.cpp: Removed.
+ * UIProcess/WebResourceLoadClient.h: Removed.
+ * WebKit2.xcodeproj/project.pbxproj:
+ Remove the files.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::assignIdentifierToInitialRequest):
+ (WebKit::WebFrameLoaderClient::dispatchWillSendRequest):
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveResponse):
+ (WebKit::WebFrameLoaderClient::dispatchDidReceiveContentLength):
+ (WebKit::WebFrameLoaderClient::dispatchDidFinishLoading):
+ (WebKit::WebFrameLoaderClient::dispatchDidFailLoading):
+ Stop sending per-resource messages to the UIProcess.
+
2013-01-20 Gustavo Noronha Silva <[email protected]>
Unreviewed. Simple indentation fix.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-01-21 01:01:40 UTC (rev 140285)
@@ -555,11 +555,6 @@
toImpl(pageRef)->initializePolicyClient(wkClient);
}
-void WKPageSetPageResourceLoadClient(WKPageRef pageRef, const WKPageResourceLoadClient* wkClient)
-{
- toImpl(pageRef)->initializeResourceLoadClient(wkClient);
-}
-
void WKPageSetPageUIClient(WKPageRef pageRef, const WKPageUIClient* wkClient)
{
toImpl(pageRef)->initializeUIClient(wkClient);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-01-21 01:01:40 UTC (rev 140285)
@@ -165,28 +165,6 @@
enum { kWKPageFormClientCurrentVersion = 0 };
-// Resource Load Client.
-typedef void (*WKPageDidInitiateLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, bool pageIsProvisionallyLoading, const void* clientInfo);
-typedef void (*WKPageDidSendRequestForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLRequestRef request, WKURLResponseRef redirectResponse, const void* clientInfo);
-typedef void (*WKPageDidReceiveResponseForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKURLResponseRef response, const void* clientInfo);
-typedef void (*WKPageDidReceiveContentLengthForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, uint64_t contentLength, const void* clientInfo);
-typedef void (*WKPageDidFinishLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, const void* clientInfo);
-typedef void (*WKPageDidFailLoadForResourceCallback)(WKPageRef page, WKFrameRef frame, uint64_t resourceIdentifier, WKErrorRef error, const void* clientInfo);
-
-struct WKPageResourceLoadClient {
- int version;
- const void * clientInfo;
- WKPageDidInitiateLoadForResourceCallback didInitiateLoadForResource;
- WKPageDidSendRequestForResourceCallback didSendRequestForResource;
- WKPageDidReceiveResponseForResourceCallback didReceiveResponseForResource;
- WKPageDidReceiveContentLengthForResourceCallback didReceiveContentLengthForResource;
- WKPageDidFinishLoadForResourceCallback didFinishLoadForResource;
- WKPageDidFailLoadForResourceCallback didFailLoadForResource;
-};
-typedef struct WKPageResourceLoadClient WKPageResourceLoadClient;
-
-enum { kWKPageResourceLoadClientCurrentVersion = 0 };
-
enum {
kWKPluginUnavailabilityReasonPluginMissing,
kWKPluginUnavailabilityReasonPluginCrashed,
@@ -476,7 +454,6 @@
WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClient* client);
WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
-WK_EXPORT void WKPageSetPageResourceLoadClient(WKPageRef page, const WKPageResourceLoadClient* client);
WK_EXPORT void WKPageSetPageUIClient(WKPageRef page, const WKPageUIClient* client);
typedef void (*WKPageRunJavaScriptFunction)(WKSerializedScriptValueRef, WKErrorRef, void*);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-01-21 01:01:40 UTC (rev 140285)
@@ -347,11 +347,6 @@
m_formClient.initialize(formClient);
}
-void WebPageProxy::initializeResourceLoadClient(const WKPageResourceLoadClient* client)
-{
- m_resourceLoadClient.initialize(client);
-}
-
void WebPageProxy::initializeUIClient(const WKPageUIClient* client)
{
if (!isValid())
@@ -2519,59 +2514,6 @@
listener->continueSubmission();
}
-// ResourceLoad Client
-
-void WebPageProxy::didInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceRequest& request, bool pageIsProvisionallyLoading)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
-
- m_resourceLoadClient.didInitiateLoadForResource(this, frame, resourceIdentifier, request, pageIsProvisionallyLoading);
-}
-
-void WebPageProxy::didSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceRequest& request, const ResourceResponse& redirectResponse)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(request.url());
-
- m_resourceLoadClient.didSendRequestForResource(this, frame, resourceIdentifier, request, redirectResponse);
-}
-
-void WebPageProxy::didReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceResponse& response)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
- MESSAGE_CHECK_URL(response.url());
-
- m_resourceLoadClient.didReceiveResponseForResource(this, frame, resourceIdentifier, response);
-}
-
-void WebPageProxy::didReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
-
- m_resourceLoadClient.didReceiveContentLengthForResource(this, frame, resourceIdentifier, contentLength);
-}
-
-void WebPageProxy::didFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
-
- m_resourceLoadClient.didFinishLoadForResource(this, frame, resourceIdentifier);
-}
-
-void WebPageProxy::didFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const ResourceError& error)
-{
- WebFrameProxy* frame = m_process->webFrame(frameID);
- MESSAGE_CHECK(frame);
-
- m_resourceLoadClient.didFailLoadForResource(this, frame, resourceIdentifier, error);
-}
-
// UIClient
void WebPageProxy::createNewPage(const ResourceRequest& request, const WindowFeatures& windowFeatures, uint32_t opaqueModifiers, int32_t opaqueMouseButton, uint64_t& newPageID, WebPageCreationParameters& newPageParameters)
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-01-21 01:01:40 UTC (rev 140285)
@@ -57,7 +57,6 @@
#include "WebPageContextMenuClient.h"
#include "WebPolicyClient.h"
#include "WebPopupMenuProxy.h"
-#include "WebResourceLoadClient.h"
#include "WebUIClient.h"
#include <WebCore/AlternativeTextClient.h>
#include <WebCore/Color.h>
@@ -281,7 +280,6 @@
void initializeFormClient(const WKPageFormClient*);
void initializeLoaderClient(const WKPageLoaderClient*);
void initializePolicyClient(const WKPagePolicyClient*);
- void initializeResourceLoadClient(const WKPageResourceLoadClient*);
void initializeUIClient(const WKPageUIClient*);
void initializeWebPage();
@@ -819,14 +817,6 @@
void willSubmitForm(uint64_t frameID, uint64_t sourceFrameID, const StringPairVector& textFieldValues, uint64_t listenerID, CoreIPC::MessageDecoder&);
- // Resource load client
- void didInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
- void didSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
- void didReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceResponse&);
- void didReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength);
- void didFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier);
- void didFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, const WebCore::ResourceError&);
-
// UI client
void createNewPage(const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, uint32_t modifiers, int32_t mouseButton, uint64_t& newPageID, WebPageCreationParameters&);
void showPage();
@@ -1046,7 +1036,6 @@
WebLoaderClient m_loaderClient;
WebPolicyClient m_policyClient;
WebFormClient m_formClient;
- WebResourceLoadClient m_resourceLoadClient;
WebUIClient m_uiClient;
WebFindClient m_findClient;
WebFindMatchesClient m_findMatchesClient;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-01-21 01:01:40 UTC (rev 140285)
@@ -144,18 +144,10 @@
FrameDidBecomeFrameSet(uint64_t frameID, bool value)
- # Resource load messages
- DidInitiateLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceRequest request, bool pageIsProvisionallyLoading)
- DidSendRequestForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
- DidReceiveResponseForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceResponse response)
- DidReceiveContentLengthForResource(uint64_t frameID, uint64_t resourceIdentifier, uint64_t contentLength)
- DidFinishLoadForResource(uint64_t frameID, uint64_t resourceIdentifier)
- DidFailLoadForResource(uint64_t frameID, uint64_t resourceIdentifier, WebCore::ResourceError error)
#if PLATFORM(QT)
ResolveApplicationSchemeRequest(WebKit::QtNetworkRequestData request)
#endif
-
# Custom representations
DidFinishLoadingDataForCustomRepresentation(WTF::String suggestedFilename, CoreIPC::DataReference data)
Deleted: trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.cpp (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.cpp 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.cpp 2013-01-21 01:01:40 UTC (rev 140285)
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "WebResourceLoadClient.h"
-
-#include "WKAPICast.h"
-#include "WebURLRequest.h"
-#include "WebURLResponse.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-void WebResourceLoadClient::didInitiateLoadForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier, const ResourceRequest& resourceRequest, bool pageIsProvisionallyLoading)
-{
- if (!m_client.didInitiateLoadForResource)
- return;
-
- RefPtr<WebURLRequest> request = WebURLRequest::create(resourceRequest);
- return m_client.didInitiateLoadForResource(toAPI(page), toAPI(frame), resourceIdentifier, toAPI(request.get()), pageIsProvisionallyLoading, m_client.clientInfo);
-}
-
-void WebResourceLoadClient::didSendRequestForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier, const ResourceRequest& resourceRequest, const ResourceResponse& redirectResourceResponse)
-{
- if (!m_client.didSendRequestForResource)
- return;
-
- RefPtr<WebURLRequest> request = WebURLRequest::create(resourceRequest);
- RefPtr<WebURLResponse> response;
- if (!redirectResourceResponse.isNull())
- response = WebURLResponse::create(redirectResourceResponse);
- return m_client.didSendRequestForResource(toAPI(page), toAPI(frame), resourceIdentifier, toAPI(request.get()), toAPI(response.get()), m_client.clientInfo);
-}
-
-void WebResourceLoadClient::didReceiveResponseForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier, const ResourceResponse& resourceResponse)
-{
- if (!m_client.didReceiveResponseForResource)
- return;
-
- RefPtr<WebURLResponse> response = WebURLResponse::create(resourceResponse);
- return m_client.didReceiveResponseForResource(toAPI(page), toAPI(frame), resourceIdentifier, toAPI(response.get()), m_client.clientInfo);
-}
-
-void WebResourceLoadClient::didReceiveContentLengthForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier, uint64_t contentLength)
-{
- if (!m_client.didReceiveContentLengthForResource)
- return;
-
- return m_client.didReceiveContentLengthForResource(toAPI(page), toAPI(frame), resourceIdentifier, contentLength, m_client.clientInfo);
-}
-
-void WebResourceLoadClient::didFinishLoadForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier)
-{
- if (!m_client.didFinishLoadForResource)
- return;
-
- return m_client.didFinishLoadForResource(toAPI(page), toAPI(frame), resourceIdentifier, m_client.clientInfo);
-}
-
-void WebResourceLoadClient::didFailLoadForResource(WebPageProxy* page, WebFrameProxy* frame, uint64_t resourceIdentifier, const ResourceError& error)
-{
- if (!m_client.didFailLoadForResource)
- return;
-
- return m_client.didFailLoadForResource(toAPI(page), toAPI(frame), resourceIdentifier, toAPI(error), m_client.clientInfo);
-}
-
-} // namespace WebKit
Deleted: trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h (140284 => 140285)
--- trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadClient.h 2013-01-21 01:01:40 UTC (rev 140285)
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebResourceLoadClient_h
-#define WebResourceLoadClient_h
-
-#include "APIClient.h"
-#include "WKPage.h"
-
-namespace WebCore {
-class ResourceError;
-class ResourceRequest;
-class ResourceResponse;
-}
-
-namespace WebKit {
-
-class APIObject;
-class WebFrameProxy;
-class WebPageProxy;
-
-class WebResourceLoadClient : public APIClient<WKPageResourceLoadClient, kWKPageResourceLoadClientCurrentVersion> {
-public:
- void didInitiateLoadForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, bool pageIsProvisionallyLoading);
- void didSendRequestForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
- void didReceiveResponseForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceResponse&);
- void didReceiveContentLengthForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, uint64_t contentLength);
- void didFinishLoadForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier);
- void didFailLoadForResource(WebPageProxy*, WebFrameProxy*, uint64_t resourceIdentifier, const WebCore::ResourceError&);
-};
-
-} // namespace WebKit
-
-#endif // WebResourceLoadClient_h
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (140284 => 140285)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-01-21 01:01:40 UTC (rev 140285)
@@ -806,8 +806,6 @@
BC857FE612B843D800EDEB2E /* WKOpenPanelParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = BC857FE412B843D800EDEB2E /* WKOpenPanelParameters.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC85806212B8505700EDEB2E /* WKOpenPanelResultListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC1DFE8E12B31CA8005DF730 /* WKOpenPanelResultListener.cpp */; };
BC85806312B8505700EDEB2E /* WKOpenPanelParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC857FE512B843D800EDEB2E /* WKOpenPanelParameters.cpp */; };
- BC858A2012C0357B00EDEB2E /* WebResourceLoadClient.h in Headers */ = {isa = PBXBuildFile; fileRef = BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */; };
- BC858A2112C0357B00EDEB2E /* WebResourceLoadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */; };
BC8699B5116AADAA002A925B /* WKView.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B2116AADAA002A925B /* WKView.h */; settings = {ATTRIBUTES = (Public, ); }; };
BC8699B6116AADAA002A925B /* WKView.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC8699B3116AADAA002A925B /* WKView.mm */; };
BC8699B7116AADAA002A925B /* WKViewInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC8699B4116AADAA002A925B /* WKViewInternal.h */; };
@@ -2096,8 +2094,6 @@
BC857FB412B830E600EDEB2E /* WebOpenPanelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebOpenPanelParameters.cpp; sourceTree = "<group>"; };
BC857FE412B843D800EDEB2E /* WKOpenPanelParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKOpenPanelParameters.h; sourceTree = "<group>"; };
BC857FE512B843D800EDEB2E /* WKOpenPanelParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKOpenPanelParameters.cpp; sourceTree = "<group>"; };
- BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebResourceLoadClient.h; sourceTree = "<group>"; };
- BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebResourceLoadClient.cpp; sourceTree = "<group>"; };
BC8699B2116AADAA002A925B /* WKView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKView.h; sourceTree = "<group>"; };
BC8699B3116AADAA002A925B /* WKView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKView.mm; sourceTree = "<group>"; };
BC8699B4116AADAA002A925B /* WKViewInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKViewInternal.h; sourceTree = "<group>"; };
@@ -3641,8 +3637,6 @@
33367632130C99B2006C9DE2 /* WebResourceCacheManagerProxy.cpp */,
33367633130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h */,
33367634130C99B2006C9DE2 /* WebResourceCacheManagerProxy.messages.in */,
- BC858A1F12C0357B00EDEB2E /* WebResourceLoadClient.cpp */,
- BC858A1E12C0357B00EDEB2E /* WebResourceLoadClient.h */,
1A594AB8112A1FB6009DE7C7 /* WebUIClient.cpp */,
1A594AB9112A1FB6009DE7C7 /* WebUIClient.h */,
);
@@ -4904,7 +4898,6 @@
33367656130C9ECA006C9DE2 /* WebResourceCacheManagerMessages.h in Headers */,
33367636130C99B2006C9DE2 /* WebResourceCacheManagerProxy.h in Headers */,
33367658130C9ECB006C9DE2 /* WebResourceCacheManagerProxyMessages.h in Headers */,
- BC858A2012C0357B00EDEB2E /* WebResourceLoadClient.h in Headers */,
510AFFBA16542048001BA05E /* WebResourceLoader.h in Headers */,
51F060E01654317F00F3281B /* WebResourceLoaderMessages.h in Headers */,
D3B9484911FF4B6500032B39 /* WebSearchPopupMenu.h in Headers */,
@@ -5915,7 +5908,6 @@
33367655130C9ECA006C9DE2 /* WebResourceCacheManagerMessageReceiver.cpp in Sources */,
33367635130C99B2006C9DE2 /* WebResourceCacheManagerProxy.cpp in Sources */,
33367657130C9ECA006C9DE2 /* WebResourceCacheManagerProxyMessageReceiver.cpp in Sources */,
- BC858A2112C0357B00EDEB2E /* WebResourceLoadClient.cpp in Sources */,
510AFFB916542048001BA05E /* WebResourceLoader.cpp in Sources */,
51F060E11654318500F3281B /* WebResourceLoaderMessageReceiver.cpp in Sources */,
51FB08FF1639DE1A00EC324A /* WebResourceLoadScheduler.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (140284 => 140285)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-01-21 00:59:45 UTC (rev 140284)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-01-21 01:01:40 UTC (rev 140285)
@@ -174,7 +174,6 @@
pageIsProvisionallyLoading = frameLoader->provisionalDocumentLoader() == loader;
webPage->injectedBundleResourceLoadClient().didInitiateLoadForResource(webPage, m_frame, identifier, request, pageIsProvisionallyLoading);
- webPage->send(Messages::WebPageProxy::DidInitiateLoadForResource(m_frame->frameID(), identifier, request, pageIsProvisionallyLoading));
}
void WebFrameLoaderClient::dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
@@ -184,13 +183,6 @@
return;
webPage->injectedBundleResourceLoadClient().willSendRequestForFrame(webPage, m_frame, identifier, request, redirectResponse);
-
- if (request.isNull()) {
- // FIXME: We should probably send a message saying we cancelled the request for the resource.
- return;
- }
-
- webPage->send(Messages::WebPageProxy::DidSendRequestForResource(m_frame->frameID(), identifier, request, redirectResponse));
}
bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier)
@@ -244,7 +236,6 @@
return;
webPage->injectedBundleResourceLoadClient().didReceiveResponseForResource(webPage, m_frame, identifier, response);
- webPage->send(Messages::WebPageProxy::DidReceiveResponseForResource(m_frame->frameID(), identifier, response));
}
void WebFrameLoaderClient::dispatchDidReceiveContentLength(DocumentLoader*, unsigned long identifier, int dataLength)
@@ -254,7 +245,6 @@
return;
webPage->injectedBundleResourceLoadClient().didReceiveContentLengthForResource(webPage, m_frame, identifier, dataLength);
- webPage->send(Messages::WebPageProxy::DidReceiveContentLengthForResource(m_frame->frameID(), identifier, dataLength));
}
void WebFrameLoaderClient::dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier)
@@ -264,7 +254,6 @@
return;
webPage->injectedBundleResourceLoadClient().didFinishLoadForResource(webPage, m_frame, identifier);
- webPage->send(Messages::WebPageProxy::DidFinishLoadForResource(m_frame->frameID(), identifier));
}
void WebFrameLoaderClient::dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError& error)
@@ -274,7 +263,6 @@
return;
webPage->injectedBundleResourceLoadClient().didFailLoadForResource(webPage, m_frame, identifier, error);
- webPage->send(Messages::WebPageProxy::DidFailLoadForResource(m_frame->frameID(), identifier, error));
}
bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(DocumentLoader*, const ResourceRequest&, const ResourceResponse&, int /*length*/)
