diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 03:31:55 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-17 03:31:55 +0000 |
commit | cd1c89e833b7e67b7a7ca8799122e07b65999771 (patch) | |
tree | 8be5bb7ffacaee015edc085026d811a571fc7cc0 /webkit/glue | |
parent | b67d748a27218fe026449cd98b1ac334c1266d4c (diff) | |
download | chromium_src-cd1c89e833b7e67b7a7ca8799122e07b65999771.zip chromium_src-cd1c89e833b7e67b7a7ca8799122e07b65999771.tar.gz chromium_src-cd1c89e833b7e67b7a7ca8799122e07b65999771.tar.bz2 |
Move WebDevToolsAgent{Delegate} into the WebKit API.
Moves corresponding WebView and WebViewDelegate methods too.
This uses the term "Frontend" for what was previously known as "Client" in the
devtools interfaces. This is to avoid awkward "ClientClient" naming. Frontend
was Pavel Feldman's suggested renaming. In a follow up patch, I will be
renaming WebDevToolsClient{Delegate} to WebDevToolsFrontend{Client}.
R=dglazkov
BUG=24597
TEST=none
Review URL: http://codereview.chromium.org/287009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r-- | webkit/glue/devtools/debugger_agent_impl.h | 1 | ||||
-rw-r--r-- | webkit/glue/devtools/debugger_agent_manager.cc | 3 | ||||
-rw-r--r-- | webkit/glue/devtools/debugger_agent_manager.h | 6 | ||||
-rw-r--r-- | webkit/glue/editor_client_impl.cc | 1 | ||||
-rw-r--r-- | webkit/glue/mimetype_unittest.cc | 1 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent.h | 62 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent_delegate.h | 35 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent_impl.cc | 79 | ||||
-rw-r--r-- | webkit/glue/webdevtoolsagent_impl.h | 36 | ||||
-rw-r--r-- | webkit/glue/webview.h | 17 | ||||
-rw-r--r-- | webkit/glue/webview_delegate.h | 31 | ||||
-rw-r--r-- | webkit/glue/webview_impl.cc | 25 | ||||
-rw-r--r-- | webkit/glue/webview_impl.h | 7 |
13 files changed, 76 insertions, 228 deletions
diff --git a/webkit/glue/devtools/debugger_agent_impl.h b/webkit/glue/devtools/debugger_agent_impl.h index 1695775..ebc78cc 100644 --- a/webkit/glue/devtools/debugger_agent_impl.h +++ b/webkit/glue/devtools/debugger_agent_impl.h @@ -9,7 +9,6 @@ #include "v8.h" #include "webkit/glue/devtools/debugger_agent.h" -#include "webkit/glue/webdevtoolsagent.h" class WebDevToolsAgentImpl; class WebViewImpl; diff --git a/webkit/glue/devtools/debugger_agent_manager.cc b/webkit/glue/devtools/debugger_agent_manager.cc index d390f12..a905766 100644 --- a/webkit/glue/devtools/debugger_agent_manager.cc +++ b/webkit/glue/devtools/debugger_agent_manager.cc @@ -11,6 +11,7 @@ #undef LOG #include "base/string_util.h" +#include "webkit/api/public/WebDevToolsAgent.h" #include "webkit/glue/devtools/debugger_agent_impl.h" #include "webkit/glue/devtools/debugger_agent_manager.h" #include "webkit/glue/webdevtoolsagent_impl.h" @@ -20,6 +21,8 @@ #include "v8/include/v8-debug.h" #endif +using WebKit::WebDevToolsAgent; + WebDevToolsAgent::MessageLoopDispatchHandler DebuggerAgentManager::message_loop_dispatch_handler_ = NULL; diff --git a/webkit/glue/devtools/debugger_agent_manager.h b/webkit/glue/devtools/debugger_agent_manager.h index 3ec5561..b81ed76 100644 --- a/webkit/glue/devtools/debugger_agent_manager.h +++ b/webkit/glue/devtools/debugger_agent_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "v8/include/v8-debug.h" -#include "webkit/glue/webdevtoolsagent.h" +#include "webkit/api/public/WebDevToolsAgent.h" namespace WebCore { class PageGroupLoadDeferrer; @@ -43,7 +43,7 @@ class DebuggerAgentManager { static void ExecuteDebuggerCommand(const WebCore::String& command, int caller_id); static void SetMessageLoopDispatchHandler( - WebDevToolsAgent::MessageLoopDispatchHandler handler); + WebKit::WebDevToolsAgent::MessageLoopDispatchHandler handler); // Sets |host_id| as the frame context data. This id is used to filter scripts // related to the inspected page. @@ -86,7 +86,7 @@ class DebuggerAgentManager { typedef HashMap<int, DebuggerAgentImpl*> AttachedAgentsMap; static AttachedAgentsMap* attached_agents_map_; - static WebDevToolsAgent::MessageLoopDispatchHandler + static WebKit::WebDevToolsAgent::MessageLoopDispatchHandler message_loop_dispatch_handler_; static bool in_host_dispatch_handler_; typedef HashMap<WebViewImpl*, WebCore::PageGroupLoadDeferrer*> diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc index 6ea16db..bbcadc46 100644 --- a/webkit/glue/editor_client_impl.cc +++ b/webkit/glue/editor_client_impl.cc @@ -32,7 +32,6 @@ #include "webkit/glue/dom_operations.h" #include "webkit/glue/editor_client_impl.h" #include "webkit/glue/glue_util.h" -#include "webkit/glue/webkit_glue.h" #include "webkit/glue/webview.h" #include "webkit/glue/webview_impl.h" diff --git a/webkit/glue/mimetype_unittest.cc b/webkit/glue/mimetype_unittest.cc index 46757f2..36a59dd 100644 --- a/webkit/glue/mimetype_unittest.cc +++ b/webkit/glue/mimetype_unittest.cc @@ -10,6 +10,7 @@ #include "base/string_util.h" #include "net/url_request/url_request_unittest.h" +#include "webkit/api/public/WebFrame.h" #include "webkit/glue/unittest_test_server.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/webview.h" diff --git a/webkit/glue/webdevtoolsagent.h b/webkit/glue/webdevtoolsagent.h deleted file mode 100644 index 8186051..0000000 --- a/webkit/glue/webdevtoolsagent.h +++ /dev/null @@ -1,62 +0,0 @@ -// 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_H_ -#define WEBKIT_GLUE_WEBDEVTOOLSAGENT_H_ - -#include "base/basictypes.h" - -namespace WebKit { -class WebString; -} - -// WebDevToolsAgent represents DevTools agent sitting in the Glue. It provides -// direct and delegate Apis to the host. -class WebDevToolsAgent { - public: - class Message { - public: - Message() {} - virtual ~Message() {} - virtual void Dispatch() = 0; - private: - DISALLOW_COPY_AND_ASSIGN(Message); - }; - - WebDevToolsAgent() {} - virtual ~WebDevToolsAgent() {} - - virtual void Attach() = 0; - - virtual void Detach() = 0; - - virtual void OnNavigate() = 0; - - virtual void DispatchMessageFromClient(const WebKit::WebString& class_name, - const WebKit::WebString& method_name, - const WebKit::WebString& param1, - const WebKit::WebString& param2, - const WebKit::WebString& param3) = 0; - - virtual void InspectElement(int x, int y) = 0; - - virtual void SetApuAgentEnabled(bool enabled) = 0; - - // Asynchronously executes debugger command in the render thread. - // |caller_id| will be used for sending response. - static void ExecuteDebuggerCommand(const WebKit::WebString& command, - int caller_id); - - typedef void (*MessageLoopDispatchHandler)(); - - // Installs dispatch handle that is going to be called periodically - // while on a breakpoint. - static void SetMessageLoopDispatchHandler( - MessageLoopDispatchHandler handler); - - private: - DISALLOW_COPY_AND_ASSIGN(WebDevToolsAgent); -}; - -#endif // WEBKIT_GLUE_WEBDEVTOOLSAGENT_H_ diff --git a/webkit/glue/webdevtoolsagent_delegate.h b/webkit/glue/webdevtoolsagent_delegate.h deleted file mode 100644 index 1e34fb7..0000000 --- a/webkit/glue/webdevtoolsagent_delegate.h +++ /dev/null @@ -1,35 +0,0 @@ -// 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_DELEGATE_H_ -#define WEBKIT_GLUE_WEBDEVTOOLSAGENT_DELEGATE_H_ - -#include "base/basictypes.h" - -namespace WebKit { -class WebString; -} - -class WebDevToolsAgentDelegate { - public: - WebDevToolsAgentDelegate() {} - virtual ~WebDevToolsAgentDelegate() {} - - virtual void SendMessageToClient(const WebKit::WebString& class_name, - const WebKit::WebString& method_name, - const WebKit::WebString& param1, - const WebKit::WebString& param2, - const WebKit::WebString& param3) = 0; - - // Invalidates widget which leads to the repaint. - virtual void ForceRepaint() = 0; - - // Returns the id of the entity hosting this agent. - virtual int GetHostId() = 0; - - private: - DISALLOW_COPY_AND_ASSIGN(WebDevToolsAgentDelegate); -}; - -#endif // WEBKIT_GLUE_WEBDEVTOOLSAGENT_DELEGATE_H_ diff --git a/webkit/glue/webdevtoolsagent_impl.cc b/webkit/glue/webdevtoolsagent_impl.cc index e255b39..ae320c5 100644 --- a/webkit/glue/webdevtoolsagent_impl.cc +++ b/webkit/glue/webdevtoolsagent_impl.cc @@ -25,13 +25,13 @@ #undef LOG #include "webkit/api/public/WebDataSource.h" +#include "webkit/api/public/WebDevToolsAgentClient.h" #include "webkit/api/public/WebURL.h" #include "webkit/api/public/WebURLRequest.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_delegate.h" #include "webkit/glue/webdevtoolsagent_impl.h" #include "webkit/glue/webview_impl.h" @@ -51,7 +51,9 @@ using WebCore::V8ClassIndex; using WebCore::V8DOMWrapper; using WebCore::V8Proxy; using WebKit::WebDataSource; +using WebKit::WebDevToolsAgentClient; using WebKit::WebFrame; +using WebKit::WebPoint; using WebKit::WebString; using WebKit::WebURL; using WebKit::WebURLRequest; @@ -81,9 +83,9 @@ void SetApuAgentEnabledInUtilityContext(v8::Handle<v8::Context> context, WebDevToolsAgentImpl::WebDevToolsAgentImpl( WebViewImpl* web_view_impl, - WebDevToolsAgentDelegate* delegate) - : host_id_(delegate->GetHostId()), - delegate_(delegate), + WebDevToolsAgentClient* client) + : host_id_(client->hostIdentifier()), + client_(client), web_view_impl_(web_view_impl), apu_agent_enabled_(false), resource_tracking_was_enabled_(false), @@ -114,7 +116,7 @@ void WebDevToolsAgentImpl::UnhideResourcesPanelIfNecessary() { tools_agent_delegate_stub_->DispatchOnClient(command); } -void WebDevToolsAgentImpl::Attach() { +void WebDevToolsAgentImpl::attach() { if (attached_) { return; } @@ -130,7 +132,7 @@ void WebDevToolsAgentImpl::Attach() { attached_ = true; } -void WebDevToolsAgentImpl::Detach() { +void WebDevToolsAgentImpl::detach() { // Prevent controller from sending messages to the frontend. InspectorController* ic = web_view_impl_->page()->inspectorController(); ic->hideHighlight(); @@ -142,7 +144,7 @@ void WebDevToolsAgentImpl::Detach() { attached_ = false; } -void WebDevToolsAgentImpl::OnNavigate() { +void WebDevToolsAgentImpl::didNavigate() { DebuggerAgentManager::OnNavigate(); } @@ -176,7 +178,7 @@ void WebDevToolsAgentImpl::WindowObjectCleared(WebFrameImpl* webframe) { } void WebDevToolsAgentImpl::ForceRepaint() { - delegate_->ForceRepaint(); + client_->forceRepaint(); } void WebDevToolsAgentImpl::DispatchOnInspectorController( @@ -230,28 +232,7 @@ void WebDevToolsAgentImpl::GetResourceContent( tools_agent_native_delegate_stub_->DidGetResourceContent(call_id, content); } -void WebDevToolsAgentImpl::SetApuAgentEnabled(bool enable) { - apu_agent_enabled_ = enable; - SetApuAgentEnabledInUtilityContext(utility_context_, enable); - InspectorController* ic = web_view_impl_->page()->inspectorController(); - if (enable) { - resource_tracking_was_enabled_ = ic->resourceTrackingEnabled(); - ic->startTimelineProfiler(); - if (!resource_tracking_was_enabled_) { - // TODO(knorton): Introduce some kind of agents dependency here so that - // user could turn off resource tracking while apu agent is on. - ic->enableResourceTracking(false); - } - } else { - ic->stopTimelineProfiler(); - if (!resource_tracking_was_enabled_) { - ic->disableResourceTracking(false); - } - resource_tracking_was_enabled_ = false; - } -} - -void WebDevToolsAgentImpl::DispatchMessageFromClient( +void WebDevToolsAgentImpl::dispatchMessageFromFrontend( const WebString& class_name, const WebString& method_name, const WebString& param1, @@ -283,13 +264,29 @@ void WebDevToolsAgentImpl::DispatchMessageFromClient( } } -void WebDevToolsAgentImpl::InspectElement(int x, int y) { - Node* node = web_view_impl_->GetNodeForWindowPos(x, y); - if (!node) { - return; - } +void WebDevToolsAgentImpl::inspectElementAt(const WebPoint& point) { + web_view_impl_->inspectElementAt(point); +} + +void WebDevToolsAgentImpl::setApuAgentEnabled(bool enable) { + apu_agent_enabled_ = enable; + SetApuAgentEnabledInUtilityContext(utility_context_, enable); InspectorController* ic = web_view_impl_->page()->inspectorController(); - ic->inspect(node); + if (enable) { + resource_tracking_was_enabled_ = ic->resourceTrackingEnabled(); + ic->startTimelineProfiler(); + if (!resource_tracking_was_enabled_) { + // TODO(knorton): Introduce some kind of agents dependency here so that + // user could turn off resource tracking while apu agent is on. + ic->enableResourceTracking(false); + } + } else { + ic->stopTimelineProfiler(); + if (!resource_tracking_was_enabled_) { + ic->disableResourceTracking(false); + } + resource_tracking_was_enabled_ = false; + } } void WebDevToolsAgentImpl::SendRpcMessage( @@ -298,7 +295,7 @@ void WebDevToolsAgentImpl::SendRpcMessage( const String& param1, const String& param2, const String& param3) { - delegate_->SendMessageToClient( + client_->sendMessageToFrontend( webkit_glue::StringToWebString(class_name), webkit_glue::StringToWebString(method_name), webkit_glue::StringToWebString(param1), @@ -407,8 +404,10 @@ v8::Handle<v8::Value> WebDevToolsAgentImpl::JsDispatchToApu( return v8::Undefined(); } +namespace WebKit { + // static -void WebDevToolsAgent::ExecuteDebuggerCommand( +void WebDevToolsAgent::executeDebuggerCommand( const WebString& command, int caller_id) { DebuggerAgentManager::ExecuteDebuggerCommand( @@ -416,7 +415,9 @@ void WebDevToolsAgent::ExecuteDebuggerCommand( } // static -void WebDevToolsAgent::SetMessageLoopDispatchHandler( +void WebDevToolsAgent::setMessageLoopDispatchHandler( MessageLoopDispatchHandler handler) { DebuggerAgentManager::SetMessageLoopDispatchHandler(handler); } + +} // namespace WebKit diff --git a/webkit/glue/webdevtoolsagent_impl.h b/webkit/glue/webdevtoolsagent_impl.h index f0fb56e..98c4f25 100644 --- a/webkit/glue/webdevtoolsagent_impl.h +++ b/webkit/glue/webdevtoolsagent_impl.h @@ -10,10 +10,10 @@ #include <wtf/OwnPtr.h> #include "v8.h" +#include "webkit/api/public/WebDevToolsAgent.h" #include "webkit/glue/devtools/devtools_rpc.h" #include "webkit/glue/devtools/apu_agent_delegate.h" #include "webkit/glue/devtools/tools_agent.h" -#include "webkit/glue/webdevtoolsagent.h" namespace WebCore { class Document; @@ -23,6 +23,7 @@ class String; } namespace WebKit { +class WebDevToolsAgentClient; class WebFrame; } @@ -30,17 +31,15 @@ class BoundObject; class DebuggerAgentDelegateStub; class DebuggerAgentImpl; class Value; -class WebDevToolsAgentDelegate; class WebFrameImpl; class WebViewImpl; -class WebDevToolsAgentImpl - : public WebDevToolsAgent, - public ToolsAgent, - public DevToolsRpc::Delegate { +class WebDevToolsAgentImpl : public WebKit::WebDevToolsAgent, + public ToolsAgent, + public DevToolsRpc::Delegate { public: WebDevToolsAgentImpl(WebViewImpl* web_view_impl, - WebDevToolsAgentDelegate* delegate); + WebKit::WebDevToolsAgentClient* client); virtual ~WebDevToolsAgentImpl(); // ToolsAgent implementation. @@ -56,18 +55,19 @@ class WebDevToolsAgentImpl virtual void GetResourceContent( int call_id, int identifier); - virtual void SetApuAgentEnabled(bool enable); // WebDevToolsAgent implementation. - virtual void Attach(); - virtual void Detach(); - virtual void OnNavigate(); - virtual void DispatchMessageFromClient(const WebKit::WebString& class_name, - const WebKit::WebString& method_name, - const WebKit::WebString& param1, - const WebKit::WebString& param2, - const WebKit::WebString& param3); - virtual void InspectElement(int x, int y); + 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 setApuAgentEnabled(bool enable); // DevToolsRpc::Delegate implementation. void SendRpcMessage(const WebCore::String& class_name, @@ -104,7 +104,7 @@ class WebDevToolsAgentImpl v8::Local<v8::Object> CreateInspectorBackendV8Wrapper(); int host_id_; - WebDevToolsAgentDelegate* delegate_; + WebKit::WebDevToolsAgentClient* client_; WebViewImpl* web_view_impl_; OwnPtr<DebuggerAgentDelegateStub> debugger_agent_delegate_stub_; OwnPtr<ToolsAgentDelegateStub> tools_agent_delegate_stub_; diff --git a/webkit/glue/webview.h b/webkit/glue/webview.h index 036e5a3..765b6f4 100644 --- a/webkit/glue/webview.h +++ b/webkit/glue/webview.h @@ -5,23 +5,9 @@ #ifndef WEBKIT_GLUE_WEBVIEW_H_ #define WEBKIT_GLUE_WEBVIEW_H_ -#include <string> -#include <vector> - #include "base/basictypes.h" -#include "webkit/api/public/WebDragOperation.h" #include "webkit/api/public/WebView.h" -namespace WebKit { -class WebDragData; -class WebFrameClient; -class WebFrame; -class WebSettings; -struct WebPoint; -} - -class GURL; -class WebDevToolsAgent; class WebViewDelegate; // @@ -63,9 +49,6 @@ class WebView : public WebKit::WebView { // links. static void ResetVisitedLinkState(); - // Returns development tools agent instance belonging to this view. - virtual WebDevToolsAgent* GetWebDevToolsAgent() = 0; - private: DISALLOW_COPY_AND_ASSIGN(WebView); }; diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h index c647e7c..5c9e3d7 100644 --- a/webkit/glue/webview_delegate.h +++ b/webkit/glue/webview_delegate.h @@ -26,41 +26,10 @@ #ifndef WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ #define WEBKIT_GLUE_WEBVIEW_DELEGATE_H_ -#include <vector> - -#include "webkit/api/public/WebDragOperation.h" -#include "webkit/api/public/WebFrame.h" -#include "webkit/api/public/WebTextDirection.h" #include "webkit/api/public/WebViewClient.h" -#include "webkit/glue/context_menu.h" - -namespace WebCore { -class AccessibilityObject; -} - -namespace WebKit { -class WebDragData; -class WebNotificationPresenter; -class WebWidget; -struct WebPopupMenuInfo; -struct WebPoint; -struct WebRect; -} - -class FilePath; -class SkBitmap; -class WebDevToolsAgentDelegate; -class WebView; // TODO(darin): Eliminate WebViewDelegate in favor of WebViewClient. class WebViewDelegate : public WebKit::WebViewClient { - public: - // DevTools ---------------------------------------------------------------- - - virtual WebDevToolsAgentDelegate* GetWebDevToolsAgentDelegate() { - return NULL; - } - protected: ~WebViewDelegate() { } }; diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 91021f2..5c9b322 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -80,7 +80,6 @@ MSVC_POP_WARNING(); #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" @@ -99,6 +98,8 @@ 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; @@ -354,11 +355,10 @@ void WebViewImpl::initializeMainFrame(WebFrameClient* 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 @@ -1665,6 +1665,10 @@ void WebViewImpl::setInspectorSettings(const WebString& settings) { inspector_settings_ = settings; } +WebDevToolsAgent* WebViewImpl::devToolsAgent() { + return devtools_agent_.get(); +} + WebAccessibilityObject WebViewImpl::accessibilityObject() { if (!main_frame()) return WebAccessibilityObject(); @@ -1751,10 +1755,6 @@ bool WebViewImpl::setDropEffect(bool accept) { } } -WebDevToolsAgent* WebViewImpl::GetWebDevToolsAgent() { - return GetWebDevToolsAgentImpl(); -} - WebDevToolsAgentImpl* WebViewImpl::GetWebDevToolsAgentImpl() { return devtools_agent_.get(); } @@ -1869,11 +1869,6 @@ void WebViewImpl::SetIgnoreInputEvents(bool 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()) diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index eeb1d89..35eaf44 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -57,7 +57,6 @@ class ImageResourceFetcher; class AutocompletePopupMenuClient; class SearchableFormData; class WebHistoryItemImpl; -class WebDevToolsAgent; class WebDevToolsAgentImpl; class WebViewDelegate; @@ -137,6 +136,7 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> { virtual void inspectElementAt(const WebKit::WebPoint& point); virtual WebKit::WebString inspectorSettings() const; virtual void setInspectorSettings(const WebKit::WebString& settings); + virtual WebKit::WebDevToolsAgent* devToolsAgent(); virtual WebKit::WebAccessibilityObject accessibilityObject(); virtual void applyAutofillSuggestions( const WebKit::WebNode&, @@ -146,7 +146,6 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> { // WebView methods: virtual void SetIgnoreInputEvents(bool new_value); - virtual WebDevToolsAgent* GetWebDevToolsAgent(); WebDevToolsAgentImpl* GetWebDevToolsAgentImpl(); // WebViewImpl @@ -247,10 +246,6 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> { void HideAutoCompletePopup(); void AutoCompletePopupDidHide(); - // Converts |x|, |y| from window coordinates to contents coordinates and gets - // the underlying Node for them. - WebCore::Node* GetNodeForWindowPos(int x, int y); - #if ENABLE(NOTIFICATIONS) // Returns the provider of desktop notifications. WebKit::NotificationPresenterImpl* GetNotificationPresenter(); |