Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: third_party/WebKit/Source/core/inspector/DevToolsHost.cpp

Issue 1504763004: [DevTools] Fix frontend host race and assert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: documentObjectCleared Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/inspector/DevToolsHost.cpp
diff --git a/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp b/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp
index d879b0aecc37044ce5b3d29455f7b3c48646a95b..cae860bbedb03994f6205f0d8b0405ba9409ff08 100644
--- a/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp
+++ b/third_party/WebKit/Source/core/inspector/DevToolsHost.cpp
@@ -215,28 +215,6 @@ void DevToolsHost::showContextMenu(LocalFrame* targetFrame, float x, float y, co
m_client->showContextMenu(targetFrame, x * zoom, y * zoom, menuProvider);
}
-void DevToolsHost::showContextMenu(Event* event, const Vector<ContextMenuItem>& items)
-{
- if (!event)
- return;
-
- ASSERT(m_frontendFrame);
- ScriptState* frontendScriptState = ScriptState::forMainWorld(m_frontendFrame);
- ScriptValue devtoolsApiObject = frontendScriptState->getFromGlobalObject("DevToolsAPI");
- ASSERT(devtoolsApiObject.isObject());
-
- Page* targetPage = m_frontendFrame->page();
- if (event->target() && event->target()->executionContext() && event->target()->executionContext()->executingWindow()) {
- LocalDOMWindow* window = event->target()->executionContext()->executingWindow();
- if (window->document() && window->document()->page())
- targetPage = window->document()->page();
- }
-
- RefPtrWillBeRawPtr<FrontendMenuProvider> menuProvider = FrontendMenuProvider::create(this, devtoolsApiObject, items);
- targetPage->contextMenuController().showContextMenu(event, menuProvider);
- m_menuProvider = menuProvider.get();
-}
-
String DevToolsHost::getSelectionBackgroundColor()
{
return LayoutTheme::theme().activeSelectionBackgroundColor().serialized();
« no previous file with comments | « third_party/WebKit/Source/core/inspector/DevToolsHost.h ('k') | third_party/WebKit/Source/core/inspector/DevToolsHost.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698