Move WebDevToolsAgent{Delegate} into the WebKit API....

webkit/glue/webview_impl.cc

 // Copyright (c) 2007-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 "build/build_config.h"
 
 #include "base/compiler_specific.h"
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "AXObjectCache.h"
@@ skipping 62 matching lines @@
 #include "webkit/api/src/WebInputEventConversion.h"
 #include "webkit/api/src/WebSettingsImpl.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/glue_serialize.h"
 #include "webkit/glue/glue_util.h"
 #include "webkit/glue/image_resource_fetcher.h"
 #include "webkit/glue/searchable_form_data.h"
 #include "webkit/glue/webdevtoolsagent_impl.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpopupmenu_impl.h"
-#include "webkit/glue/webdevtoolsagent.h"
 #include "webkit/glue/webdevtoolsclient.h"
 #include "webkit/glue/webview_delegate.h"
 #include "webkit/glue/webview_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;
 
 using WebKit::PlatformKeyboardEventBuilder;
 using WebKit::PlatformMouseEventBuilder;
 using WebKit::PlatformWheelEventBuilder;
 using WebKit::WebAccessibilityObject;
 using WebKit::WebCanvas;
 using WebKit::WebCompositionCommand;
 using WebKit::WebCompositionCommandConfirm;
 using WebKit::WebCompositionCommandDiscard;
+using WebKit::WebDevToolsAgent;
+using WebKit::WebDevToolsAgentClient;
 using WebKit::WebDragData;
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebFrame;
 using WebKit::WebFrameClient;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMediaPlayerAction;
@@ skipping 235 matching lines @@
   return instance;
 }
 
 void WebViewImpl::initializeMainFrame(WebFrameClient* frame_client) {
   // NOTE: The WebFrameImpl takes a reference to itself within InitMainFrame
   // and releases that reference once the corresponding Frame is destroyed.
   RefPtr<WebFrameImpl> main_frame = WebFrameImpl::create(frame_client);
 
   main_frame->InitMainFrame(this);
 
-  if (delegate_) {
-    WebDevToolsAgentDelegate* tools_delegate =
-        delegate_->GetWebDevToolsAgentDelegate();
-    if (tools_delegate)
-      devtools_agent_.reset(new WebDevToolsAgentImpl(this, tools_delegate));
+  if (client()) {
+    WebDevToolsAgentClient* tools_client = client()->devToolsAgentClient();
+    if (tools_client)
+      devtools_agent_.reset(new WebDevToolsAgentImpl(this, tools_client));
   }
 
   // Restrict the access to the local file system
   // (see WebView.mm WebView::_commonInitializationWithFrameName).
   SecurityOrigin::setLocalLoadPolicy(
       SecurityOrigin::AllowLocalLoadsForLocalOnly);
 }
 
 // static
 void WebView::UpdateVisitedLinkState(uint64 link_hash) {
@@ skipping 1286 matching lines @@
 }
 
 WebString WebViewImpl::inspectorSettings() const {
   return inspector_settings_;
 }
 
 void WebViewImpl::setInspectorSettings(const WebString& settings) {
   inspector_settings_ = settings;
 }
 
+WebDevToolsAgent* WebViewImpl::devToolsAgent() {
+  return devtools_agent_.get();
+}
+
 WebAccessibilityObject WebViewImpl::accessibilityObject() {
   if (!main_frame())
     return WebAccessibilityObject();
 
   WebCore::Document* document = main_frame()->frame()->document();
 
   return AccessibilityObjectToWebAccessibilityObject(
       document->axObjectCache()->getOrCreate(document->renderer()));
 }
 
@@ skipping 66 matching lines @@
 
 bool WebViewImpl::setDropEffect(bool accept) {
   if (drag_target_dispatch_) {
     drop_effect_ = accept ? DROP_EFFECT_COPY : DROP_EFFECT_NONE;
     return true;
   } else {
     return false;
   }
 }
 
-WebDevToolsAgent* WebViewImpl::GetWebDevToolsAgent() {
-  return GetWebDevToolsAgentImpl();
-}
-
 WebDevToolsAgentImpl* WebViewImpl::GetWebDevToolsAgentImpl() {
   return devtools_agent_.get();
 }
 
 void WebViewImpl::setIsTransparent(bool is_transparent) {
   // Set any existing frames to be transparent.
   WebCore::Frame* frame = page_->mainFrame();
   while (frame) {
     frame->view()->setTransparent(is_transparent);
     frame = frame->tree()->traverseNext();
@@ skipping 94 matching lines @@
 
 void WebViewImpl::AutoCompletePopupDidHide() {
   autocomplete_popup_showing_ = false;
 }
 
 void WebViewImpl::SetIgnoreInputEvents(bool new_value) {
   DCHECK(ignore_input_events_ != new_value);
   ignore_input_events_ = new_value;
 }
 
-WebCore::Node* WebViewImpl::GetNodeForWindowPos(int x, int y) {
-  HitTestResult result = HitTestResultForWindowPos(IntPoint(x, y));
-  return result.innerNonSharedNode();
-}
-
 #if ENABLE(NOTIFICATIONS)
 WebKit::NotificationPresenterImpl* WebViewImpl::GetNotificationPresenter() {
   if (!notification_presenter_.isInitialized() && client())
     notification_presenter_.initialize(client()->notificationPresenter());
   return &notification_presenter_;
 }
 #endif
 
 void WebViewImpl::RefreshAutofillPopup() {
   DCHECK(autocomplete_popup_showing_);
@@ skipping 35 matching lines @@
       hitTestResultAtPoint(doc_point, false);
 }
 
 void WebViewImpl::setTabsToLinks(bool enable) {
   tabs_to_links_ = enable;
 }
 
 bool WebViewImpl::tabsToLinks() const {
   return tabs_to_links_;
 }