Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl....

webkit/api/src/FrameLoaderClientImpl.cpp

 /*
  * Copyright (C) 2009 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 45 matching lines @@
 #include "WebNode.h"
 #include "WebPlugin.h"
 #include "WebPluginParams.h"
 #include "WebSecurityOrigin.h"
 #include "WebURL.h"
 #include "WebURLError.h"
 #include "WebVector.h"
 #include "WebViewClient.h"
 #include "WebViewImpl.h"
 #include "WebDataSourceImpl.h"
+#include "WebDevToolsAgentPrivate.h"
 #include "WebPluginContainerImpl.h"
 #include "WebPluginLoadObserver.h"
 #include "WindowFeatures.h"
 #include "WrappedResourceRequest.h"
 #include "WrappedResourceResponse.h"
 
 // FIXME: remove these
 #include "net/base/mime_util.h"
-#include "webkit/glue/webdevtoolsagent_impl.h"
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Domain for internal error codes.
 static const char internalErrorDomain[] = "WebKit";
 
 // An internal error code.  Used to note a policy change error resulting from
 // dispatchDecidePolicyForMIMEType not passing the PolicyUse option.
@@ skipping 21 matching lines @@
     m_webFrame->closing();
     m_webFrame->deref();
 }
 
 void FrameLoaderClientImpl::windowObjectCleared()
 {
     if (m_webFrame->client())
         m_webFrame->client()->didClearWindowObject(m_webFrame);
 
     WebViewImpl* webview = m_webFrame->viewImpl();
-    if (webview) {
-        WebDevToolsAgentImpl* toolsAgent = webview->devToolsAgentImpl();
-        if (toolsAgent)
-            toolsAgent->WindowObjectCleared(m_webFrame);
-    }
+    if (webview->devToolsAgentPrivate())
+        webview->devToolsAgentPrivate()->didClearWindowObject(m_webFrame);
 }
 
 void FrameLoaderClientImpl::documentElementAvailable()
 {
     if (m_webFrame->client())
         m_webFrame->client()->didCreateDocumentElement(m_webFrame);
 }
 
 void FrameLoaderClientImpl::didCreateScriptContextForFrame()
 {
@@ skipping 515 matching lines @@
 
 void FrameLoaderClientImpl::dispatchDidCommitLoad()
 {
     WebViewImpl* webview = m_webFrame->viewImpl();
     bool isNewNavigation;
     webview->didCommitLoad(&isNewNavigation);
 
     if (m_webFrame->client())
         m_webFrame->client()->didCommitProvisionalLoad(m_webFrame, isNewNavigation);
 
-    WebDevToolsAgentImpl* toolsAgent = webview->devToolsAgentImpl();
-    if (toolsAgent)
-        toolsAgent->DidCommitLoadForFrame(webview, m_webFrame, isNewNavigation);
+    if (webview->devToolsAgentPrivate())
+        webview->devToolsAgentPrivate()->didCommitProvisionalLoad(m_webFrame, isNewNavigation);
 }
 
 void FrameLoaderClientImpl::dispatchDidFailProvisionalLoad(
     const ResourceError& error)
 {
 
     // If a policy change occured, then we do not want to inform the plugin
     // delegate.  See http://b/907789 for details.  FIXME: This means the
     // plugin won't receive NPP_URLNotify, which seems like it could result in
     // a memory leak in the plugin!!
@@ skipping 732 matching lines @@
 }
 
 PassOwnPtr<WebPluginLoadObserver> FrameLoaderClientImpl::pluginLoadObserver()
 {
     WebDataSourceImpl* ds = WebDataSourceImpl::fromDocumentLoader(
         m_webFrame->frame()->loader()->activeDocumentLoader());
     return ds->releasePluginLoadObserver();
 }
 
 } // namespace WebKit