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

Unified Diff: third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp

Issue 2030453002: [DevTools] Support CommandLineAPI in workers and Node.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 6 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
Index: third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
index 942680906095a013b21eadb225a693c9d78cf814..f85adae94a4119d80479d75b5bd948399e4f0537 100644
--- a/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/custom/V8WindowCustom.cpp
@@ -56,13 +56,11 @@
#include "core/frame/csp/ContentSecurityPolicy.h"
#include "core/html/HTMLCollection.h"
#include "core/html/HTMLDocument.h"
-#include "core/inspector/InspectorInstrumentation.h"
#include "core/inspector/MainThreadDebugger.h"
#include "core/loader/FrameLoadRequest.h"
#include "core/loader/FrameLoader.h"
#include "core/loader/FrameLoaderClient.h"
#include "platform/LayoutTestSupport.h"
-#include "platform/v8_inspector/public/V8Debugger.h"
#include "wtf/Assertions.h"
#include "wtf/OwnPtr.h"
@@ -246,41 +244,6 @@ void V8Window::openMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
v8SetReturnValueFast(info, openedWindow, impl);
}
-static bool namedPropertyFromDebuggerScopeExtension(v8::Local<v8::Name> name, const AtomicString& nameString, const v8::PropertyCallbackInfo<v8::Value>& info)
-{
- if (!InspectorInstrumentation::hasFrontends())
- return false;
-
- bool isGetter = V8Debugger::isCommandLineAPIGetter(nameString);
- bool isMethod = !isGetter && MainThreadDebugger::isCommandLineAPIMethod(nameString);
- if (!isGetter && !isMethod)
- return false;
-
- v8::Isolate* isolate = info.GetIsolate();
- v8::Local<v8::Context> context = isolate->GetCurrentContext();
- v8::Local<v8::Object> global = context->Global();
- v8::Local<v8::Value> scopeExtensionValue;
-
- if (v8Call(global->GetPrivate(context, V8Debugger::scopeExtensionPrivate(isolate)), scopeExtensionValue)) {
- v8::Local<v8::Value> value;
- if (scopeExtensionValue->IsObject() && v8Call(scopeExtensionValue->ToObject(isolate)->Get(context, name), value)) {
- if (isMethod) {
- v8SetReturnValue(info, value);
- return true;
- }
- if (isGetter && value->IsFunction()) {
- v8::Local<v8::Function> getterFunction = v8::Local<v8::Function>::Cast(value);
- v8::MicrotasksScope microtasks(isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
- if (getterFunction->Call(context, scopeExtensionValue, 0, nullptr).ToLocal(&value)) {
- v8SetReturnValue(info, value);
- return true;
- }
- }
- }
- }
- return false;
-}
-
void V8Window::namedPropertyGetterCustom(v8::Local<v8::Name> name, const v8::PropertyCallbackInfo<v8::Value>& info)
{
auto nameString = name.As<v8::String>();
@@ -308,9 +271,6 @@ void V8Window::namedPropertyGetterCustom(v8::Local<v8::Name> name, const v8::Pro
if (!frame->isLocalFrame())
return;
- if (namedPropertyFromDebuggerScopeExtension(name, propName, info))
- return;
-
// Search named items in the document.
Document* doc = toLocalFrame(frame)->document();
if (!doc || !doc->isHTMLDocument())

Powered by Google App Engine
This is Rietveld 408576698