summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webframeloaderclient_impl.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 09:53:27 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 09:53:27 +0000
commitb004209b94e258e9ca5a2356e4bd108f8443e142 (patch)
tree5f0170dfafbaa7b3a7e0fc48e502396e6e09004e /webkit/glue/webframeloaderclient_impl.cc
parentbc296f37929b762850ce2c3b317f8542bdace2a1 (diff)
downloadchromium_src-b004209b94e258e9ca5a2356e4bd108f8443e142.zip
chromium_src-b004209b94e258e9ca5a2356e4bd108f8443e142.tar.gz
chromium_src-b004209b94e258e9ca5a2356e4bd108f8443e142.tar.bz2
DevTools: Migrate to InspectorController for network and console events.
- introduced bound object on the agent side; - established remote dispatch of WebInspector calls - using fake InspectorFrontend for serializing events and sending them over the ipc - removed net agents from both sides - moved GetResource stuff to tools agent Assumes following is landed: https://bugs.webkit.org/show_bug.cgi?id=26010 Review URL: http://codereview.chromium.org/113836 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16980 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webframeloaderclient_impl.cc')
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc54
1 files changed, 0 insertions, 54 deletions
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 749d659..718c91c 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -46,7 +46,6 @@ MSVC_POP_WARNING();
#endif
#include "webkit/glue/autofill_form.h"
#include "webkit/glue/alt_404_page_resource_fetcher.h"
-#include "webkit/glue/devtools/net_agent_impl.h"
#include "webkit/glue/glue_util.h"
#include "webkit/glue/password_form_dom_manager.h"
#include "webkit/glue/plugins/plugin_list.h"
@@ -181,10 +180,6 @@ void WebFrameLoaderClient::assignIdentifierToInitialRequest(
WebRequestImpl webreq(request);
d->AssignIdentifierToRequest(webview, identifier, webreq);
}
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->AssignIdentifierToRequest(loader, identifier, request);
- }
}
// Determines whether the request being loaded by |loader| is a frame or a
@@ -233,10 +228,6 @@ void WebFrameLoaderClient::dispatchWillSendRequest(
d->WillSendRequest(webview, identifier, &webreq);
request = webreq.resource_request();
}
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->WillSendRequest(loader, identifier, request);
- }
request.setAppCacheContextID(
webframe_->GetAppCacheContext()->GetContextID());
@@ -304,21 +295,12 @@ void WebFrameLoaderClient::dispatchDidReceiveResponse(DocumentLoader* loader,
// Cancel any pending loads.
alt_404_page_fetcher_.reset(NULL);
-
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidReceiveResponse(loader, identifier, response);
- }
}
void WebFrameLoaderClient::dispatchDidReceiveContentLength(
DocumentLoader* loader,
unsigned long identifier,
int length_received) {
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidReceiveContentLength(loader, identifier, length_received);
- }
}
// Called when a particular resource load completes
@@ -338,11 +320,6 @@ void WebFrameLoaderClient::dispatchDidFinishLoading(DocumentLoader* loader,
WebViewDelegate* d = webview->delegate();
if (d)
d->DidFinishLoading(webview, identifier);
-
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidFinishLoading(loader, identifier);
- }
}
GURL WebFrameLoaderClient::GetAlt404PageUrl(DocumentLoader* loader) {
@@ -384,10 +361,6 @@ void WebFrameLoaderClient::dispatchDidFailLoading(DocumentLoader* loader,
webview->delegate()->DidFailLoadingWithError(webview, identifier,
WebErrorImpl(error));
}
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidFailLoading(loader, identifier, error);
- }
}
void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
@@ -451,26 +424,12 @@ bool WebFrameLoaderClient::dispatchDidLoadResourceFromMemoryCache(
result = d->DidLoadResourceFromMemoryCache(webview, webreq, webresp,
webframe_);
}
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidLoadResourceFromMemoryCache(
- loader,
- request,
- response,
- length);
- }
return result;
}
void WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest(
unsigned long identifier,
const ScriptString& source) {
- NetAgentImpl* net_agent = GetNetAgentImpl();
- if (net_agent) {
- net_agent->DidLoadResourceByXMLHttpRequest(
- identifier,
- source);
- }
}
void WebFrameLoaderClient::dispatchDidHandleOnloadEvents() {
@@ -1643,16 +1602,3 @@ void WebFrameLoaderClient::HandleBackForwardNavigation(const GURL& url) {
if (d)
d->NavigateBackForwardSoon(offset);
}
-
-NetAgentImpl* WebFrameLoaderClient::GetNetAgentImpl() {
- WebViewImpl* web_view = webframe_->GetWebViewImpl();
- if (!web_view) {
- return NULL;
- }
- WebDevToolsAgentImpl* tools_agent = web_view->GetWebDevToolsAgentImpl();
- if (tools_agent) {
- return tools_agent->net_agent_impl();
- } else {
- return NULL;
- }
-}