diff options
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.cc | 10 | ||||
| -rw-r--r-- | webkit/glue/webdevtoolsfrontend_impl.h | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/webkit/glue/webdevtoolsfrontend_impl.cc b/webkit/glue/webdevtoolsfrontend_impl.cc index 1048a41..172c5ff 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.cc +++ b/webkit/glue/webdevtoolsfrontend_impl.cc @@ -136,7 +136,7 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl( client_(client), application_locale_(application_locale), loaded_(false) { - menu_selection_handler_ = MenuSelectionHandler::create(this); + // menu_selection_handler_ = MenuSelectionHandler::create(this); WebFrameImpl* frame = web_view_impl_->mainFrameImpl(); v8::HandleScope scope; @@ -216,7 +216,7 @@ WebDevToolsFrontendImpl::WebDevToolsFrontendImpl( } WebDevToolsFrontendImpl::~WebDevToolsFrontendImpl() { - menu_selection_handler_->disconnect(); + // menu_selection_handler_->disconnect(); } // TODO(yurys): this method is deprecated and will go away soon, use @@ -501,8 +501,9 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsWindowUnloading( // static v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsShowContextMenu( - const v8::Arguments& args) { - + const v8::Arguments&) { +/* + TODO: Uncomment once new ContextMenu API lands upstream. if (args.Length() < 2) return v8::Undefined(); @@ -543,5 +544,6 @@ v8::Handle<v8::Value> WebDevToolsFrontendImpl::JsShowContextMenu( menu_controller->showContextMenu(event, items, frontend->menu_selection_handler_); +*/ return v8::Undefined(); } diff --git a/webkit/glue/webdevtoolsfrontend_impl.h b/webkit/glue/webdevtoolsfrontend_impl.h index e60e7d5..611553c 100644 --- a/webkit/glue/webdevtoolsfrontend_impl.h +++ b/webkit/glue/webdevtoolsfrontend_impl.h @@ -7,8 +7,6 @@ #include <string> -#include "ContextMenuSelectionHandler.h" - #include <wtf/HashMap.h> #include <wtf/Noncopyable.h> #include <wtf/OwnPtr.h> @@ -60,7 +58,8 @@ class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend, const WebKit::WebDevToolsMessageData& data); private: - class MenuSelectionHandler : public WebCore::ContextMenuSelectionHandler { +/* Uncomment once breaking API changes upstream land. + class MenuSelectionHandler : public WebCore::ContextMenuSelectionHandler { public: static PassRefPtr<MenuSelectionHandler> create( WebDevToolsFrontendImpl* frontend_host) { @@ -86,7 +85,7 @@ class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend, : frontend_host_(frontend_host) {} WebDevToolsFrontendImpl* frontend_host_; }; - +*/ void AddResourceSourceToFrame(int resource_id, String mime_type, WebCore::Node* frame); @@ -94,7 +93,7 @@ class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend, void ExecuteScript(const Vector<String>& v); void DispatchOnWebInspector(const String& method, const String& param); - friend class MenuSelectionHandler; + // friend class MenuSelectionHandler; void ContextMenuItemSelected(WebCore::ContextMenuItem* menu_item); void ContextMenuCleared(); @@ -136,7 +135,7 @@ class WebDevToolsFrontendImpl : public WebKit::WebDevToolsFrontend, bool loaded_; Vector<Vector<String> > pending_incoming_messages_; OwnPtr<ToolsAgentNativeDelegateImpl> tools_agent_native_delegate_impl_; - RefPtr<MenuSelectionHandler> menu_selection_handler_; +// RefPtr<MenuSelectionHandler> menu_selection_handler_; }; #endif // WEBKIT_GLUE_WEBDEVTOOLSFRONTEND_IMPL_H_ |