Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl....

webkit/glue/webdevtoolsagent_impl.cc

 // Copyright (c) 2009 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 "Document.h"
 #include "EventListener.h"
@@ skipping 12 matching lines @@
 #include "V8Utilities.h"
 #include <wtf/OwnPtr.h>
 #undef LOG
 
 #include "webkit/api/public/WebDataSource.h"
 #include "webkit/api/public/WebDevToolsAgentClient.h"
 #include "webkit/api/public/WebFrame.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebURLRequest.h"
+#include "webkit/api/src/WebFrameImpl.h"
 #include "webkit/api/src/WebViewImpl.h"
 #include "webkit/glue/devtools/bound_object.h"
 #include "webkit/glue/devtools/debugger_agent_impl.h"
 #include "webkit/glue/devtools/debugger_agent_manager.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 
 using WebCore::Document;
 using WebCore::InspectorBackend;
 using WebCore::InspectorController;
@@ skipping 109 matching lines @@
   inspector_frontend_script_state_.clear();
   devtools_agent_host_.set(NULL);
   debugger_agent_impl_.set(NULL);
   attached_ = false;
 }
 
 void WebDevToolsAgentImpl::didNavigate() {
   DebuggerAgentManager::OnNavigate();
 }
 
-void WebDevToolsAgentImpl::DidCommitLoadForFrame(
-    WebViewImpl* webview,
-    WebFrame* frame,
+void WebDevToolsAgentImpl::didCommitProvisionalLoad(
+    WebFrameImpl* webframe,
     bool is_new_navigation) {
   if (!attached_) {
     return;
   }
-  WebDataSource* ds = frame->dataSource();
+  WebDataSource* ds = webframe->dataSource();
   const WebURLRequest& request = ds->request();
   WebURL url = ds->hasUnreachableURL() ?
       ds->unreachableURL() :
       request.url();
-  if (webview->mainFrame() == frame) {
+  if (!webframe->parent()) {
     ResetInspectorFrontendProxy();
     tools_agent_delegate_stub_->FrameNavigate(
         webkit_glue::WebURLToKURL(url).string());
     SetApuAgentEnabledInUtilityContext(utility_context_, apu_agent_enabled_);
     UnhideResourcesPanelIfNecessary();
   }
 }
 
-void WebDevToolsAgentImpl::WindowObjectCleared(WebFrameImpl* webframe) {
+void WebDevToolsAgentImpl::didClearWindowObject(WebFrameImpl* webframe) {
   DebuggerAgentManager::SetHostId(webframe, host_id_);
   if (attached_) {
     // Push context id into the client if it is already attached.
     debugger_agent_delegate_stub_->SetContextId(host_id_);
   }
 }
 
 void WebDevToolsAgentImpl::ForceRepaint() {
   client_->forceRepaint();
 }
@@ skipping 260 matching lines @@
       v8::External::Cast(*args.Data())->Value());
   agent->client_->runtimeFeatureStateChanged(
       webkit_glue::StringToWebString(feature),
       enabled);
   return v8::Undefined();
 }
 
 namespace WebKit {
 
 // static
+WebDevToolsAgent* WebDevToolsAgent::create(WebView* webview,
+                                           WebDevToolsAgentClient* client) {
+  return new WebDevToolsAgentImpl(static_cast<WebViewImpl*>(webview), client);
+}
+
+// static
 void WebDevToolsAgent::executeDebuggerCommand(
     const WebString& command,
     int caller_id) {
   DebuggerAgentManager::ExecuteDebuggerCommand(
       webkit_glue::WebStringToString(command), caller_id);
 }
 
 // static
 void WebDevToolsAgent::setMessageLoopDispatchHandler(
     MessageLoopDispatchHandler handler) {
   DebuggerAgentManager::SetMessageLoopDispatchHandler(handler);
 }
 
 } // namespace WebKit