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

Unified Diff: src/inspector/inspected-context.cc

Issue 2801023003: Revert of [inspector] move console to builtins (Closed)
Patch Set: Created 3 years, 8 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 | « src/debug/interface-types.h ('k') | src/inspector/v8-console.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/inspector/inspected-context.cc
diff --git a/src/inspector/inspected-context.cc b/src/inspector/inspected-context.cc
index 08bb69f77c95c9e5825c32183b64ee4beadeaadc..0509683789d6762e9ff865d49f02eaf235238958 100644
--- a/src/inspector/inspected-context.cc
+++ b/src/inspector/inspected-context.cc
@@ -27,15 +27,17 @@
v8::Isolate* isolate = m_inspector->isolate();
info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex),
v8::Int32::New(isolate, contextId));
- if (!info.hasMemoryOnConsole) return;
- v8::Context::Scope contextScope(info.context);
v8::Local<v8::Object> global = info.context->Global();
- v8::Local<v8::Value> console;
- if (global->Get(info.context, toV8String(m_inspector->isolate(), "console"))
- .ToLocal(&console) &&
- console->IsObject()) {
- m_inspector->console()->installMemoryGetter(
- info.context, v8::Local<v8::Object>::Cast(console));
+ v8::Local<v8::Object> console =
+ m_inspector->console()->createConsole(info.context);
+ if (info.hasMemoryOnConsole) {
+ m_inspector->console()->installMemoryGetter(info.context, console);
+ }
+ if (!global
+ ->Set(info.context, toV8StringInternalized(isolate, "console"),
+ console)
+ .FromMaybe(false)) {
+ return;
}
}
« no previous file with comments | « src/debug/interface-types.h ('k') | src/inspector/v8-console.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698