DevTools: introduce bound object on the agent side.

webkit/glue/webframeloaderclient_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 
@@ skipping 28 matching lines @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #if defined(OS_WIN)
 #include "webkit/activex_shim/activex_shared.h"
 #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"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webappcachecontext.h"
 #include "webkit/glue/webdatasource_impl.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/weberror_impl.h"
 #include "webkit/glue/webframeloaderclient_impl.h"
 #include "webkit/glue/webkit_glue.h"
@@ skipping 114 matching lines @@
 // WebFrame.
 void WebFrameLoaderClient::assignIdentifierToInitialRequest(
     unsigned long identifier, DocumentLoader* loader,
     const ResourceRequest& request) {
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
   if (d) {
     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
 // subresource. A subresource in this context is anything other than a frame --
 // this includes images and xmlhttp requests.  It is important to note that a
 // subresource is NOT limited to stuff loaded through the frame's subresource
 // loader. Synchronous xmlhttp requests for example, do not go through the
 // subresource loader, but we still label them as TargetIsSubResource.
 //
 // The important edge cases to consider when modifying this function are
@@ skipping 28 matching lines @@
     request.setFirstPartyForCookies(KURL("about:blank"));
 
   // Give the delegate a crack at the request.
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
   if (d) {
     WebRequestImpl webreq(request);
     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());
 }
 
 bool WebFrameLoaderClient::shouldUseCredentialStorage(DocumentLoader*,
     unsigned long identifier) {
   // FIXME
   // Intended to pass through to a method on the resource load delegate.
   // If implemented, that method controls whether the browser should ask the
@@ skipping 47 matching lines @@
   postpone_loading_data_ =
       ResourceRequest::TargetIsMainFrame == target_type &&
       !is_substitute_data &&
       response.httpStatusCode() == 404 &&
       GetAlt404PageUrl(loader).is_valid();
   if (postpone_loading_data_)
     postponed_data_.clear();
 
   // 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
 void WebFrameLoaderClient::dispatchDidFinishLoading(DocumentLoader* loader,
                                                     unsigned long identifier) {
   if (postpone_loading_data_) {
     // The server returned a 404 and the content was < 512 bytes (which we
     // suppressed).  Go ahead and fetch the alternate page content.
     const GURL& url = GetAlt404PageUrl(loader);
     DCHECK(url.is_valid()) <<
         "URL changed? It was valid in dispatchDidReceiveResponse.";
     alt_404_page_fetcher_.reset(new Alt404PageResourceFetcher(this,
         webframe_->frame(), loader, url));
   }
 
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   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) {
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
   if (!d)
     return GURL();
 
   const GURL& failedURL = webkit_glue::KURLToGURL(loader->url());
 
@@ skipping 21 matching lines @@
 }
 
 void WebFrameLoaderClient::dispatchDidFailLoading(DocumentLoader* loader,
                                                   unsigned long identifier,
                                                   const ResourceError& error) {
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   if (webview && webview->delegate()) {
     webview->delegate()->DidFailLoadingWithError(webview, identifier,
                                                  WebErrorImpl(error));
   }
-  NetAgentImpl* net_agent = GetNetAgentImpl();
-  if (net_agent) {
-    net_agent->DidFailLoading(loader, identifier, error);
-  }
 }
 
 void WebFrameLoaderClient::dispatchDidFinishDocumentLoad() {
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
   DocumentLoader* documentLoader =
       webframe_->frame()->loader()->activeDocumentLoader();
   WebDataSourceImpl* data_source =
       WebDataSourceImpl::FromLoader(documentLoader);
 
@@ skipping 43 matching lines @@
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
 
   bool result = false;
   if (d) {
     WebRequestImpl webreq(request);
     WebResponseImpl webresp(response);
     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() {
   // During the onload event of a subframe, the subframe can be removed.  In
   // that case, it has no page.  This is covered by
   // LayoutTests/fast/dom/replaceChild.html
   if (!webframe_->frame()->page())
     return;
   WebViewImpl* webview = webframe_->GetWebViewImpl();
   WebViewDelegate* d = webview->delegate();
@@ skipping 1152 matching lines @@
 
   std::string offset_str = url.ExtractFileName();
   int offset;
   if (!StringToInt(offset_str, &offset))
     return;
 
   WebViewDelegate* d = webframe_->GetWebViewImpl()->delegate();
   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;
-  }
-}