[DevTools] Move Console to v8_inspector

third_party/WebKit/Source/platform/v8_inspector/V8DebuggerImpl.cpp

 /*
  * Copyright (c) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/v8_inspector/V8DebuggerImpl.h"
 
 #include "platform/inspector_protocol/Values.h"
 #include "platform/v8_inspector/Atomics.h"
 #include "platform/v8_inspector/DebuggerScript.h"
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/ScriptBreakpoint.h"
+#include "platform/v8_inspector/V8Console.h"
 #include "platform/v8_inspector/V8DebuggerAgentImpl.h"
 #include "platform/v8_inspector/V8InspectorSessionImpl.h"
+#include "platform/v8_inspector/V8ProfilerAgentImpl.h"
 #include "platform/v8_inspector/V8RuntimeAgentImpl.h"
 #include "platform/v8_inspector/V8StackTraceImpl.h"
 #include "platform/v8_inspector/V8StringUtil.h"
 #include "platform/v8_inspector/public/V8DebuggerClient.h"
 
 namespace blink {
 
 namespace {
 const char stepIntoV8MethodName[] = "stepIntoStatement";
 const char stepOutV8MethodName[] = "stepOutOfFunction";
@@ skipping 94 matching lines @@
     if (!m_enabledAgentsCount++)
         enable();
 }
 
 void V8DebuggerImpl::debuggerAgentDisabled()
 {
     if (!--m_enabledAgentsCount)
         disable();
 }
 
+V8ProfilerAgentImpl* V8DebuggerImpl::findEnabledProfilerAgent(v8::Local<v8::Context> context)
+{
+    int contextGroupId = getGroupId(context);
+    if (!contextGroupId)
+        return nullptr;
+    V8InspectorSessionImpl* session = m_sessions.get(contextGroupId);
+    if (session && session->profileAgentImpl()->enabled())
+        return session->profileAgentImpl();
+    return nullptr;
+}
+
 V8DebuggerAgentImpl* V8DebuggerImpl::findEnabledDebuggerAgent(int contextGroupId)
 {
     if (!contextGroupId)
         return nullptr;
     V8InspectorSessionImpl* session = m_sessions.get(contextGroupId);
     if (session && session->debuggerAgentImpl()->enabled())
         return session->debuggerAgentImpl();
     return nullptr;
 }
 
@@ skipping 595 matching lines @@
 void V8DebuggerImpl::contextCreated(const V8ContextInfo& info)
 {
     ASSERT(info.context->GetIsolate() == m_isolate);
     // TODO(dgozman): make s_lastContextId non-static.
     int contextId = atomicIncrement(&s_lastContextId);
     String16 debugData = String16::number(info.contextGroupId) + "," + String16::number(contextId) + "," + (info.isDefault ? "default" : "nondefault");
     v8::HandleScope scope(m_isolate);
     v8::Context::Scope contextScope(info.context);
     info.context->SetEmbedderData(static_cast<int>(v8::Context::kDebugIdIndex), toV8String(m_isolate, debugData));
 
+    installConsole(info.context, info.hasMemoryOnConsole);

[dgozman, 2016/04/12 03:32:16]

Let's move this to InspectedContext constructor.

[kozy, 2016/04/12 21:58:32]

Done.

+
     if (!m_contexts.contains(info.contextGroupId))
         m_contexts.set(info.contextGroupId, adoptPtr(new ContextByIdMap()));
     ASSERT(!m_contexts.get(info.contextGroupId)->contains(contextId));
 
     OwnPtr<InspectedContext> contextOwner = adoptPtr(new InspectedContext(this, info, contextId));
     InspectedContext* inspectedContext = contextOwner.get();
     m_contexts.get(info.contextGroupId)->set(contextId, contextOwner.release());
 
     if (V8InspectorSessionImpl* session = m_sessions.get(info.contextGroupId))
         session->runtimeAgentImpl()->reportExecutionContextCreated(inspectedContext);
 }
 
+bool V8DebuggerImpl::installConsole(v8::Local<v8::Context> context, bool hasMemoryAttribute)
+{
+    v8::Isolate* isolate = context->GetIsolate();
+    v8::Local<v8::Object> global = context->Global();
+    v8::Local<v8::Object> console;
+    if (!V8Console::create(context, this, hasMemoryAttribute).ToLocal(&console))
+        return false;
+    return global->Set(context, toV8StringInternalized(isolate, "console"), console).FromMaybe(false);
+}
+
 void V8DebuggerImpl::contextDestroyed(v8::Local<v8::Context> context)
 {
     int contextId = V8Debugger::contextId(context);
     int contextGroupId = getGroupId(context);
     if (!m_contexts.contains(contextGroupId) || !m_contexts.get(contextGroupId)->contains(contextId))
         return;
 
     InspectedContext* inspectedContext = m_contexts.get(contextGroupId)->get(contextId);
     if (V8InspectorSessionImpl* session = m_sessions.get(contextGroupId))
         session->runtimeAgentImpl()->reportExecutionContextDestroyed(inspectedContext);
@@ skipping 33 matching lines @@
 }
 
 const V8DebuggerImpl::ContextByIdMap* V8DebuggerImpl::contextGroup(int contextGroupId)
 {
     if (!m_contexts.contains(contextGroupId))
         return nullptr;
     return m_contexts.get(contextGroupId);
 }
 
 } // namespace blink