Eliminate WebViewImpl's dependency on WebDevToolsAgentImpl....

webkit/api/src/WebViewImpl.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 59 matching lines @@
 #include "PluginInfoStore.h"
 #include "PopupMenuChromium.h"
 #include "PopupMenuClient.h"
 #include "RenderView.h"
 #include "ResourceHandle.h"
 #include "SecurityOrigin.h"
 #include "SelectionController.h"
 #include "Settings.h"
 #include "TypingCommand.h"
 #include "WebAccessibilityObject.h"
+#include "WebDevToolsAgentPrivate.h"
 #include "WebDragData.h"
 #include "WebFrameImpl.h"
 #include "WebInputEvent.h"
 #include "WebInputEventConversion.h"
 #include "WebMediaPlayerAction.h"
 #include "WebNode.h"
 #include "WebPoint.h"
 #include "WebPopupMenuImpl.h"
 #include "WebRect.h"
 #include "WebSettingsImpl.h"
 #include "WebString.h"
 #include "WebVector.h"
 #include "WebViewClient.h"
 
 #if PLATFORM(WIN_OS)
 #include "KeyboardCodesWin.h"
 #include "RenderThemeChromiumWin.h"
 #else
 #include "KeyboardCodesPosix.h"
 #include "RenderTheme.h"
 #endif
 
-// FIXME
-#include "webkit/glue/webdevtoolsagent_impl.h"
-
 // Get rid of WTF's pow define so we can use std::pow.
 #undef pow
 #include <cmath> // for std::pow
 
 using namespace WebCore;
 
 namespace WebKit {
 
 // Change the text zoom level by kTextSizeMultiplierRatio each time the user
 // zooms text in or out (ie., change by 20%).  The min and max values limit
@@ skipping 54 matching lines @@
     Page::allVisitedStateChanged(PageGroup::pageGroup(pageGroupName));
 }
 
 void WebViewImpl::initializeMainFrame(WebFrameClient* frameClient) {
     // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
     // and releases that reference once the corresponding Frame is destroyed.
     RefPtr<WebFrameImpl> frame = WebFrameImpl::create(frameClient);
 
     frame->initializeAsMainFrame(this);
 
-    if (m_client) {
-        WebDevToolsAgentClient* toolsClient = m_client->devToolsAgentClient();
-        if (toolsClient)
-            m_devToolsAgent.set(new WebDevToolsAgentImpl(this, toolsClient));
-    }
-
     // Restrict the access to the local file system
     // (see WebView.mm WebView::_commonInitializationWithFrameName).
     SecurityOrigin::setLocalLoadPolicy(SecurityOrigin::AllowLocalLoadsForLocalOnly);
 }
 
 WebViewImpl::WebViewImpl(WebViewClient* client)
     : m_client(client)
     , m_backForwardListClientImpl(this)
     , m_chromeClientImpl(this)
     , m_contextMenuClientImpl(this)
@@ skipping 575 matching lines @@
     if (m_page.get()) {
         // Initiate shutdown for the entire frameset.  This will cause a lot of
         // notifications to be sent.
         if (m_page->mainFrame()) {
             mainFrameImpl = WebFrameImpl::fromFrame(m_page->mainFrame());
             m_page->mainFrame()->loader()->frameDetached();
         }
         m_page.clear();
     }
 
-    // Should happen after m_page.reset().
+    // Should happen after m_page.clear().
     if (m_devToolsAgent.get())
         m_devToolsAgent.clear();
 
     // We drop the client after the page has been destroyed to support the
     // WebFrameClient::didDestroyScriptContext method.
     if (mainFrameImpl)
         mainFrameImpl->dropClient();
 
     // Reset the delegate to prevent notifications being sent as we're being
     // deleted.
@@ skipping 700 matching lines @@
 void WebViewImpl::setInspectorSettings(const WebString& settings)
 {
     m_inspectorSettings = settings;
 }
 
 WebDevToolsAgent* WebViewImpl::devToolsAgent()
 {
     return m_devToolsAgent.get();
 }
 
+void WebViewImpl::setDevToolsAgent(WebDevToolsAgent* devToolsAgent)
+{
+    ASSERT(!m_devToolsAgent.get()); // May only set once!
+    m_devToolsAgent.set(static_cast<WebDevToolsAgentPrivate*>(devToolsAgent));
+}
+
 WebAccessibilityObject WebViewImpl::accessibilityObject()
 {
     if (!mainFrameImpl())
         return WebAccessibilityObject();
 
     Document* document = mainFrameImpl()->frame()->document();
     return WebAccessibilityObject(
         document->axObjectCache()->getOrCreate(document->renderer()));
 }
 
@@ skipping 65 matching lines @@
 // WebView --------------------------------------------------------------------
 
 bool WebViewImpl::setDropEffect(bool accept) {
     if (m_dragTargetDispatch) {
         m_dropEffect = accept ? DropEffectCopy : DropEffectNone;
         return true;
     }
     return false;
 }
 
-WebDevToolsAgentImpl* WebViewImpl::devToolsAgentImpl()
-{
-    return m_devToolsAgent.get();
-}
-
 void WebViewImpl::setIsTransparent(bool isTransparent)
 {
     // Set any existing frames to be transparent.
     Frame* frame = m_page->mainFrame();
     while (frame) {
         frame->view()->setTransparent(isTransparent);
         frame = frame->tree()->traverseNext();
     }
 
     // Future frames check this to know whether to be transparent.
@@ skipping 157 matching lines @@
 {
     m_tabsToLinks = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const
 {
     return m_tabsToLinks;
 }
 
 } // namespace WebKit