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

Unified Diff: Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp

Issue 660503002: Revert of [DevTools] Inject element into toolbox window, do not load modules there. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « no previous file | Source/core/inspector/InspectorFrontendHost.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp
diff --git a/Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp b/Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp
index 0e132ecda12dc17b59c7eba689bcba4cb921fc9a..06c77f4859b147151e05118cbe0096cb23a1f733 100644
--- a/Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp
+++ b/Source/bindings/core/v8/custom/V8InspectorFrontendHostCustom.cpp
@@ -32,7 +32,6 @@
#include "bindings/core/v8/V8InspectorFrontendHost.h"
#include "bindings/core/v8/V8Binding.h"
-#include "bindings/core/v8/V8Document.h"
#include "bindings/core/v8/V8MouseEvent.h"
#include "bindings/core/v8/V8Window.h"
#include "core/dom/Document.h"
@@ -147,17 +146,12 @@
if (!populateContextMenuItems(v8::Local<v8::Array>::Cast(array), menu, info.GetIsolate()))
return;
- LocalDOMWindow* window = nullptr;
- if (info.Length() >= 4) {
- window = toDOMWindow(info[3], info.GetIsolate());
- } else {
- v8::Isolate* isolate = info.GetIsolate();
- v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(isolate->GetEnteredContext()->Global(), isolate);
- if (windowWrapper.IsEmpty())
- return;
- window = V8Window::toImpl(windowWrapper);
- }
- if (!window || !window->document() || !window->document()->page())
+ v8::Isolate* isolate = info.GetIsolate();
+ v8::Handle<v8::Object> windowWrapper = V8Window::findInstanceInPrototypeChain(isolate->GetEnteredContext()->Global(), isolate);
+ if (windowWrapper.IsEmpty())
+ return;
+ LocalDOMWindow* window = V8Window::toImpl(windowWrapper);
+ if (!window->document() || !window->document()->page())
return;
InspectorFrontendHost* frontendHost = V8InspectorFrontendHost::toImpl(info.Holder());
« no previous file with comments | « no previous file | Source/core/inspector/InspectorFrontendHost.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698