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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « src/debug/interface-types.h ('k') | src/inspector/v8-console.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 the V8 project authors. All rights reserved. 1 // Copyright 2016 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/inspector/inspected-context.h" 5 #include "src/inspector/inspected-context.h"
6 6
7 #include "src/inspector/injected-script.h" 7 #include "src/inspector/injected-script.h"
8 #include "src/inspector/string-util.h" 8 #include "src/inspector/string-util.h"
9 #include "src/inspector/v8-console.h" 9 #include "src/inspector/v8-console.h"
10 #include "src/inspector/v8-inspector-impl.h" 10 #include "src/inspector/v8-inspector-impl.h"
11 #include "src/inspector/v8-value-copier.h" 11 #include "src/inspector/v8-value-copier.h"
12 12
13 #include "include/v8-inspector.h" 13 #include "include/v8-inspector.h"
14 14
15 namespace v8_inspector { 15 namespace v8_inspector {
16 16
17 InspectedContext::InspectedContext(V8InspectorImpl* inspector, 17 InspectedContext::InspectedContext(V8InspectorImpl* inspector,
18 const V8ContextInfo& info, int contextId) 18 const V8ContextInfo& info, int contextId)
19 : m_inspector(inspector), 19 : m_inspector(inspector),
20 m_context(info.context->GetIsolate(), info.context), 20 m_context(info.context->GetIsolate(), info.context),
21 m_contextId(contextId), 21 m_contextId(contextId),
22 m_contextGroupId(info.contextGroupId), 22 m_contextGroupId(info.contextGroupId),
23 m_origin(toString16(info.origin)), 23 m_origin(toString16(info.origin)),
24 m_humanReadableName(toString16(info.humanReadableName)), 24 m_humanReadableName(toString16(info.humanReadableName)),
25 m_auxData(toString16(info.auxData)), 25 m_auxData(toString16(info.auxData)),
26 m_reported(false) { 26 m_reported(false) {
27 v8::Isolate* isolate = m_inspector->isolate(); 27 v8::Isolate* isolate = m_inspector->isolate();
28 info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex), 28 info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex),
29 v8::Int32::New(isolate, contextId)); 29 v8::Int32::New(isolate, contextId));
30 if (!info.hasMemoryOnConsole) return;
31 v8::Context::Scope contextScope(info.context);
32 v8::Local<v8::Object> global = info.context->Global(); 30 v8::Local<v8::Object> global = info.context->Global();
33 v8::Local<v8::Value> console; 31 v8::Local<v8::Object> console =
34 if (global->Get(info.context, toV8String(m_inspector->isolate(), "console")) 32 m_inspector->console()->createConsole(info.context);
35 .ToLocal(&console) && 33 if (info.hasMemoryOnConsole) {
36 console->IsObject()) { 34 m_inspector->console()->installMemoryGetter(info.context, console);
37 m_inspector->console()->installMemoryGetter( 35 }
38 info.context, v8::Local<v8::Object>::Cast(console)); 36 if (!global
37 ->Set(info.context, toV8StringInternalized(isolate, "console"),
38 console)
39 .FromMaybe(false)) {
40 return;
39 } 41 }
40 } 42 }
41 43
42 InspectedContext::~InspectedContext() { 44 InspectedContext::~InspectedContext() {
43 } 45 }
44 46
45 // static 47 // static
46 int InspectedContext::contextId(v8::Local<v8::Context> context) { 48 int InspectedContext::contextId(v8::Local<v8::Context> context) {
47 v8::Local<v8::Value> data = 49 v8::Local<v8::Value> data =
48 context->GetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex)); 50 context->GetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex));
(...skipping 14 matching lines...) Expand all
63 std::unique_ptr<InjectedScript> injectedScript = InjectedScript::create(this); 65 std::unique_ptr<InjectedScript> injectedScript = InjectedScript::create(this);
64 // InjectedScript::create can destroy |this|. 66 // InjectedScript::create can destroy |this|.
65 if (!injectedScript) return false; 67 if (!injectedScript) return false;
66 m_injectedScript = std::move(injectedScript); 68 m_injectedScript = std::move(injectedScript);
67 return true; 69 return true;
68 } 70 }
69 71
70 void InspectedContext::discardInjectedScript() { m_injectedScript.reset(); } 72 void InspectedContext::discardInjectedScript() { m_injectedScript.reset(); }
71 73
72 } // namespace v8_inspector 74 } // namespace v8_inspector
OLDNEW
« 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