[DevTools] Remove V8Debugger::logToConsole method

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/inspector/ThreadDebugger.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8DOMException.h"
 #include "bindings/core/v8/V8DOMTokenList.h"
@@ skipping 223 matching lines @@
         else if (types[i] == "pointer")
             outputTypes.appendVector(Vector<String>({ "pointerover", "pointerout", "pointerenter", "pointerleave", "pointerdown", "pointerup", "pointermove", "pointercancel", "gotpointercapture", "lostpointercapture" }));
         else if (types[i] == "control")
             outputTypes.appendVector(Vector<String>({ "resize", "scroll", "zoom", "focus", "blur", "select", "input", "change", "submit", "reset" }));
         else
             outputTypes.append(types[i]);
     }
     return outputTypes;
 }
 
-void ThreadDebugger::logCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
+namespace {
+
+v8::MaybeLocal<v8::Value> compileAndRunInternalScript(v8::Isolate* isolate, v8::Local<v8::Context> context, v8::Local<v8::String> code)
 {
-    if (info.Length() < 1)
-        return;
-    ThreadDebugger* debugger = static_cast<ThreadDebugger*>(v8::Local<v8::External>::Cast(info.Data())->Value());
-    DCHECK(debugger);
-    Event* event = V8Event::toImplWithTypeCheck(info.GetIsolate(), info[0]);
-    if (!event)
-        return;
-    debugger->debugger()->logToConsole(info.GetIsolate()->GetCurrentContext(), v8String(info.GetIsolate(), event->type()), info[0]);
+    v8::ScriptOrigin origin(v8::String::Empty(isolate), v8::Integer::New(isolate, 0), v8::Integer::New(isolate, 0), v8::False(isolate), v8::Local<v8::Integer>(), v8::True(isolate), v8::String::Empty(isolate), v8::True(isolate));
+    v8::ScriptCompiler::Source source(code, origin);
+    v8::Local<v8::Script> script;
+    if (!v8::ScriptCompiler::Compile(context, &source, v8::ScriptCompiler::kNoCompileOptions).ToLocal(&script))
+        return v8::MaybeLocal<v8::Value>();
+    v8::MicrotasksScope microtasksScope(isolate, v8::MicrotasksScope::kDoNotRunMicrotasks);
+    return script->Run(context);
 }
 
+} // namespace
+
 v8::Local<v8::Function> ThreadDebugger::eventLogFunction()

[dgozman, 2016/07/25 19:05:51]

Let's not store it, but compile every time.

[kozy, 2016/07/25 19:13:14]

Done.

 {
-    if (m_eventLogFunction.IsEmpty())
-        m_eventLogFunction.Reset(m_isolate, v8::Function::New(m_isolate->GetCurrentContext(), logCallback, v8::External::New(m_isolate, this), 0, v8::ConstructorBehavior::kThrow).ToLocalChecked());
+    if (m_eventLogFunction.IsEmpty()) {
+        v8::Local<v8::Value> logFunctionValue;
+        bool success = compileAndRunInternalScript(m_isolate, m_isolate->GetCurrentContext(), v8String(m_isolate, "(function(e) { console.log(e.type, e); })")).ToLocal(&logFunctionValue) && logFunctionValue->IsFunction();

[dgozman, 2016/07/25 19:05:51]

As discussed offline, use V8ScriptRunner here.

[kozy, 2016/07/25 19:13:14]

Done.

+        DCHECK(success);
+        m_eventLogFunction.Reset(m_isolate, v8::Local<v8::Function>::Cast(logFunctionValue));
+    }
     return m_eventLogFunction.Get(m_isolate);
 }
 
 static EventTarget* firstArgumentAsEventTarget(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     if (info.Length() < 1)
         return nullptr;
     if (EventTarget* target = V8EventTarget::toImplWithTypeCheck(info.GetIsolate(), info[0]))
         return target;
     return toDOMWindow(info.GetIsolate(), info[0]);
@@ skipping 118 matching lines @@
 {
     for (size_t index = 0; index < m_timers.size(); ++index) {
         if (m_timers[index].get() == timer) {
             m_timerCallbacks[index](m_timerData[index]);
             return;
         }
     }
 }
 
 } // namespace blink