[DevTools] Move Console to v8_inspector

third_party/WebKit/Source/core/inspector/MainThreadDebugger.cpp

 /*
  * Copyright (c) 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 24 matching lines @@
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8Window.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/InspectorTaskRunner.h"
+#include "core/timing/MemoryInfo.h"
 #include "core/workers/MainThreadWorkletGlobalScope.h"
 #include "platform/UserGestureIndicator.h"
 #include "platform/v8_inspector/public/V8Debugger.h"
 #include "public/platform/Platform.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/ThreadingPrimitives.h"
 
 namespace blink {
 
@@ skipping 41 matching lines @@
     m_clientMessageLoop = clientMessageLoop;
 }
 
 void MainThreadDebugger::contextCreated(ScriptState* scriptState, LocalFrame* frame, SecurityOrigin* origin)
 {
     ASSERT(isMainThread());
     v8::HandleScope handles(scriptState->isolate());
     DOMWrapperWorld& world = scriptState->world();
     if (frame->localFrameRoot() == frame && world.isMainWorld())
         debugger()->resetContextGroup(contextGroupId(frame));
-    debugger()->contextCreated(V8ContextInfo(scriptState->context(), contextGroupId(frame), world.isMainWorld(), origin ? origin->toRawString() : "", world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "", IdentifiersFactory::frameId(frame)));
+    ExecutionContext* executionContext = scriptState->getExecutionContext();
+    debugger()->contextCreated(V8ContextInfo(scriptState->context(), contextGroupId(frame), world.isMainWorld(), origin ? origin->toRawString() : "", world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "", IdentifiersFactory::frameId(frame), executionContext->isDocument()));

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

Inline it!

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

Done.

 }
 
 void MainThreadDebugger::contextWillBeDestroyed(ScriptState* scriptState)
 {
     v8::HandleScope handles(scriptState->isolate());
     debugger()->contextDestroyed(scriptState->context());
 }
 
 int MainThreadDebugger::contextGroupId(LocalFrame* frame)
 {
@@ skipping 80 matching lines @@
     LocalFrame* frame = WeakIdentifierMap<LocalFrame>::lookup(contextGroupId);
     if (!frame)
         return 0;
     ScriptState* scriptState = ScriptState::forMainWorld(frame);
     if (!scriptState)
         return 0;
     v8::HandleScope scopes(scriptState->isolate());
     return V8Debugger::contextId(scriptState->context());
 }
 
+void MainThreadDebugger::reportMessageToConsole(v8::Local<v8::Context> context, ConsoleMessage* consoleMessage)
+{
+    ExecutionContext* executionContext = toExecutionContext(context);
+    ASSERT(executionContext);
+    if (executionContext->isWorkletGlobalScope()) {
+        executionContext->addConsoleMessage(consoleMessage);
+        return;
+    }
+
+    DOMWindow* window = toDOMWindow(context);
+    if (!window)
+        return;
+    LocalDOMWindow* localDomWindow = toLocalDOMWindow(window);
+    if (!localDomWindow)
+        return;
+    LocalFrame* frame = localDomWindow->frame();
+    if (!frame)
+        return;
+    frame->console().addMessage(consoleMessage);
+}
+
+v8::MaybeLocal<v8::Value> MainThreadDebugger::memoryInfo(v8::Isolate* isolate, v8::Local<v8::Context> context, v8::Local<v8::Object> creationContext)
+{
+    ExecutionContext* executionContext = toExecutionContext(context);
+    ASSERT(executionContext);
+    return executionContext->isDocument() ? toV8(MemoryInfo::create(), creationContext, isolate) : v8::MaybeLocal<v8::Value>();

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

ASSERT(executionContext->isDocument())

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

Done.

+}
+
 } // namespace blink