Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl....

webkit/glue/webdevtoolsagent_impl.h

 // 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.
 
 #ifndef WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_
 #define WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_
 
 #include <string>
 
 #include <wtf/OwnPtr.h>
 
 #include "v8.h"
-#include "webkit/api/public/WebDevToolsAgent.h"
+#include "webkit/api/src/WebDevToolsAgentPrivate.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
 #include "webkit/glue/devtools/apu_agent_delegate.h"
 #include "webkit/glue/devtools/tools_agent.h"
 
 namespace WebCore {
 class Document;
 class Node;
 class ScriptState;
 class String;
 }
 
 namespace WebKit {
 class WebDevToolsAgentClient;
 class WebFrame;
 class WebFrameImpl;
 class WebString;
 class WebViewImpl;
 }
 
 class BoundObject;
 class DebuggerAgentDelegateStub;
 class DebuggerAgentImpl;
 class Value;
 
-class WebDevToolsAgentImpl : public WebKit::WebDevToolsAgent,
+class WebDevToolsAgentImpl : public WebKit::WebDevToolsAgentPrivate,
                              public ToolsAgent,
                              public DevToolsRpc::Delegate {
  public:
   WebDevToolsAgentImpl(WebKit::WebViewImpl* web_view_impl,
                        WebKit::WebDevToolsAgentClient* client);
   virtual ~WebDevToolsAgentImpl();
 
   // ToolsAgent implementation.
   virtual void DispatchOnInspectorController(
       int call_id,
       const WebCore::String& function_name,
       const WebCore::String& json_args);
   virtual void DispatchOnInjectedScript(
       int call_id,
       const WebCore::String& function_name,
       const WebCore::String& json_args);
   virtual void ExecuteVoidJavaScript();
   virtual void GetResourceContent(
       int call_id,
       int identifier);
 
+  // WebDevToolsAgentPrivate implementation.
+  virtual void didClearWindowObject(WebKit::WebFrameImpl* frame);
+  virtual void didCommitProvisionalLoad(
+      WebKit::WebFrameImpl* frame, bool is_new_navigation);
+
   // WebDevToolsAgent implementation.
   virtual void attach();
   virtual void detach();
   virtual void didNavigate();
   virtual void dispatchMessageFromFrontend(
       const WebKit::WebString& class_name,
       const WebKit::WebString& method_name,
       const WebKit::WebString& param1,
       const WebKit::WebString& param2,
       const WebKit::WebString& param3);
   virtual void inspectElementAt(const WebKit::WebPoint& point);
   virtual void setRuntimeFeatureEnabled(const WebKit::WebString& feature,
                                         bool enabled);
 
   // DevToolsRpc::Delegate implementation.
   void SendRpcMessage(const WebCore::String& class_name,
                       const WebCore::String& method_name,
                       const WebCore::String& param1,
                       const WebCore::String& param2,
                       const WebCore::String& param3);
 
-  // Methods called by the glue.
-  void SetMainFrameDocumentReady(bool ready);
-  void DidCommitLoadForFrame(WebKit::WebViewImpl* webview,
-                             WebKit::WebFrame* frame,
-                             bool is_new_navigation);
-
-  void WindowObjectCleared(WebKit::WebFrameImpl* webframe);
-
   void ForceRepaint();
 
   int host_id() { return host_id_; }
 
  private:
   static v8::Handle<v8::Value> JsDispatchOnClient(const v8::Arguments& args);
   static v8::Handle<v8::Value> JsDispatchToApu(const v8::Arguments& args);
   static v8::Handle<v8::Value> JsOnRuntimeFeatureStateChanged(
       const v8::Arguments& args);
 
@@ skipping 22 matching lines @@
   bool resource_tracking_was_enabled_;
   bool attached_;
   // TODO(pfeldman): This should not be needed once GC styles issue is fixed
   // for matching rules.
   v8::Persistent<v8::Context> utility_context_;
   OwnPtr<BoundObject> devtools_agent_host_;
   OwnPtr<WebCore::ScriptState> inspector_frontend_script_state_;
 };
 
 #endif  // WEBKIT_GLUE_WEBDEVTOOLSAGENT_IMPL_H_