[DevTools] Generate separate copies of inspector_protocol.

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"
 #include "bindings/core/v8/V8Event.h"
 #include "bindings/core/v8/V8EventListener.h"
 #include "bindings/core/v8/V8EventListenerInfo.h"
 #include "bindings/core/v8/V8EventListenerList.h"
 #include "bindings/core/v8/V8HTMLAllCollection.h"
 #include "bindings/core/v8/V8HTMLCollection.h"
 #include "bindings/core/v8/V8Node.h"
 #include "bindings/core/v8/V8NodeList.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorDOMDebuggerAgent.h"
 #include "core/inspector/InspectorTraceEvents.h"
+#include "core/inspector/V8InspectorStringConversion.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "wtf/CurrentTime.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 ThreadDebugger::ThreadDebugger(v8::Isolate* isolate)
     : m_isolate(isolate)
     , m_v8Inspector(v8_inspector::V8Inspector::create(isolate, this))
@@ skipping 45 matching lines @@
 }
 
 void ThreadDebugger::idleFinished(v8::Isolate* isolate)
 {
     if (ThreadDebugger* debugger = ThreadDebugger::from(isolate))
         debugger->v8Inspector()->idleFinished();
 }
 
 void ThreadDebugger::asyncTaskScheduled(const String& operationName, void* task, bool recurring)
 {
-    m_v8Inspector->asyncTaskScheduled(operationName, task, recurring);
+    m_v8Inspector->asyncTaskScheduled(toV8InspectorString(operationName), task, recurring);
 }
 
 void ThreadDebugger::asyncTaskCanceled(void* task)
 {
     m_v8Inspector->asyncTaskCanceled(task);
 }
 
 void ThreadDebugger::allAsyncTasksCanceled()
 {
     m_v8Inspector->allAsyncTasksCanceled();
@@ skipping 12 matching lines @@
 unsigned ThreadDebugger::promiseRejected(v8::Local<v8::Context> context, const String& errorMessage, v8::Local<v8::Value> exception, std::unique_ptr<SourceLocation> location)
 {
     const String defaultMessage = "Uncaught (in promise)";
     String message = errorMessage;
     if (message.isEmpty())
         message = defaultMessage;
     else if (message.startsWith("Uncaught "))
         message = message.substring(0, 8) + " (in promise)" + message.substring(8);
 
     reportConsoleMessage(toExecutionContext(context), JSMessageSource, ErrorMessageLevel, message, location.get());
-    return v8Inspector()->exceptionThrown(context, defaultMessage, exception, message, location->url(), location->lineNumber(), location->columnNumber(), location->takeStackTrace(), location->scriptId());
+    return v8Inspector()->exceptionThrown(context, toV8InspectorString(defaultMessage), exception, toV8InspectorString(message), toV8InspectorString(location->url()), location->lineNumber(), location->columnNumber(), location->takeStackTrace(), location->scriptId());
 }
 
 void ThreadDebugger::promiseRejectionRevoked(v8::Local<v8::Context> context, unsigned promiseRejectionId)
 {
     const String message = "Handler added to rejected promise";
-    v8Inspector()->exceptionRevoked(context, promiseRejectionId, message);
+    v8Inspector()->exceptionRevoked(context, promiseRejectionId, toV8InspectorString(message));
 }
 
 void ThreadDebugger::beginUserGesture()
 {
     m_userGestureIndicator = wrapUnique(new UserGestureIndicator(DefinitelyProcessingNewUserGesture));
 }
 
 void ThreadDebugger::endUserGesture()
 {
     m_userGestureIndicator.reset();
 }
 
-String16 ThreadDebugger::valueSubtype(v8::Local<v8::Value> value)
+v8_inspector::String16 ThreadDebugger::valueSubtype(v8::Local<v8::Value> value)
 {
     if (V8Node::hasInstance(value, m_isolate))
         return "node";
     if (V8NodeList::hasInstance(value, m_isolate)
         || V8DOMTokenList::hasInstance(value, m_isolate)
         || V8HTMLCollection::hasInstance(value, m_isolate)
         || V8HTMLAllCollection::hasInstance(value, m_isolate)) {
         return "array";
     }
     if (V8DOMException::hasInstance(value, m_isolate))
         return "error";
-    return String();
+    return v8_inspector::String16();
 }
 
 bool ThreadDebugger::formatAccessorsAsProperties(v8::Local<v8::Value> value)
 {
     return V8DOMWrapper::isWrapper(m_isolate, value);
 }
 
 double ThreadDebugger::currentTimeMS()
 {
     return WTF::currentTimeMS();
@@ skipping 157 matching lines @@
         listenerObject->Set(v8String(isolate, "passive"), v8::Boolean::New(isolate, info.passive));
         listenerObject->Set(v8String(isolate, "type"), v8String(isolate, currentEventType));
         v8::Local<v8::Function> removeFunction;
         if (info.removeFunction.ToLocal(&removeFunction))
             listenerObject->Set(v8String(isolate, "remove"), removeFunction);
         listeners->Set(outputIndex++, listenerObject);
     }
     info.GetReturnValue().Set(result);
 }
 
-void ThreadDebugger::consoleTime(const String16& title)
+void ThreadDebugger::consoleTime(const v8_inspector::String16& title)
 {
-    TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", String(title).utf8().data(), this);
+    TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", toCoreString(title).utf8().data(), this);

[caseq, 2016/08/19 02:50:36]

This and the two below are kinda time-sensitive, it would be cool to get hold of
utf8() without an extra copy.

 }
 
-void ThreadDebugger::consoleTimeEnd(const String16& title)
+void ThreadDebugger::consoleTimeEnd(const v8_inspector::String16& title)
 {
-    TRACE_EVENT_COPY_ASYNC_END0("blink.console", String(title).utf8().data(), this);
+    TRACE_EVENT_COPY_ASYNC_END0("blink.console", toCoreString(title).utf8().data(), this);
 }
 
-void ThreadDebugger::consoleTimeStamp(const String16& title)
+void ThreadDebugger::consoleTimeStamp(const v8_inspector::String16& title)
 {
     v8::Isolate* isolate = m_isolate;
-    TRACE_EVENT_INSTANT1("devtools.timeline", "TimeStamp", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTimeStampEvent::data(currentExecutionContext(isolate), title));
+    TRACE_EVENT_INSTANT1("devtools.timeline", "TimeStamp", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTimeStampEvent::data(currentExecutionContext(isolate), toCoreString(title)));
 }
 
 void ThreadDebugger::startRepeatingTimer(double interval, V8InspectorClient::TimerCallback callback, void* data)
 {
     m_timerData.append(data);
     m_timerCallbacks.append(callback);
 
     std::unique_ptr<Timer<ThreadDebugger>> timer = wrapUnique(new Timer<ThreadDebugger>(this, &ThreadDebugger::onTimer));
     Timer<ThreadDebugger>* timerPtr = timer.get();
     m_timers.append(std::move(timer));
@@ skipping 17 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