[DevTools] Migrate v8_inspector/public from String16 to String{View,Buffer}.

third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.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 "platform/v8_inspector/V8InspectorSessionImpl.h"
 
 #include "platform/v8_inspector/InjectedScript.h"
 #include "platform/v8_inspector/InspectedContext.h"
 #include "platform/v8_inspector/RemoteObjectId.h"
 #include "platform/v8_inspector/V8ConsoleAgentImpl.h"
 #include "platform/v8_inspector/V8Debugger.h"
 #include "platform/v8_inspector/V8DebuggerAgentImpl.h"
 #include "platform/v8_inspector/V8HeapProfilerAgentImpl.h"
 #include "platform/v8_inspector/V8InspectorImpl.h"
 #include "platform/v8_inspector/V8ProfilerAgentImpl.h"
 #include "platform/v8_inspector/V8RuntimeAgentImpl.h"
 #include "platform/v8_inspector/V8StringUtil.h"
 #include "platform/v8_inspector/public/V8ContextInfo.h"
 #include "platform/v8_inspector/public/V8InspectorClient.h"
 
 namespace v8_inspector {
 
 // static
-bool V8InspectorSession::canDispatchMethod(const String16& method)
+bool V8InspectorSession::canDispatchMethod(const StringView& method)
 {
-    return method.startsWith(protocol::Runtime::Metainfo::commandPrefix)
-        || method.startsWith(protocol::Debugger::Metainfo::commandPrefix)
-        || method.startsWith(protocol::Profiler::Metainfo::commandPrefix)
-        || method.startsWith(protocol::HeapProfiler::Metainfo::commandPrefix)
-        || method.startsWith(protocol::Console::Metainfo::commandPrefix);
+    return stringViewStartsWith(method, protocol::Runtime::Metainfo::commandPrefix)
+        || stringViewStartsWith(method, protocol::Debugger::Metainfo::commandPrefix)
+        || stringViewStartsWith(method, protocol::Profiler::Metainfo::commandPrefix)
+        || stringViewStartsWith(method, protocol::HeapProfiler::Metainfo::commandPrefix)
+        || stringViewStartsWith(method, protocol::Console::Metainfo::commandPrefix);
 }
 
-std::unique_ptr<V8InspectorSessionImpl> V8InspectorSessionImpl::create(V8InspectorImpl* inspector, int contextGroupId, protocol::FrontendChannel* channel, const String16* state)
+std::unique_ptr<V8InspectorSessionImpl> V8InspectorSessionImpl::create(V8InspectorImpl* inspector, int contextGroupId, protocol::FrontendChannel* channel, const StringView& state)
 {
     return wrapUnique(new V8InspectorSessionImpl(inspector, contextGroupId, channel, state));
 }
 
-V8InspectorSessionImpl::V8InspectorSessionImpl(V8InspectorImpl* inspector, int contextGroupId, protocol::FrontendChannel* channel, const String16* savedState)
+V8InspectorSessionImpl::V8InspectorSessionImpl(V8InspectorImpl* inspector, int contextGroupId, protocol::FrontendChannel* channel, const StringView& savedState)
     : m_contextGroupId(contextGroupId)
     , m_inspector(inspector)
     , m_customObjectFormatterEnabled(false)
     , m_dispatcher(channel)
     , m_state(nullptr)
     , m_runtimeAgent(nullptr)
     , m_debuggerAgent(nullptr)
     , m_heapProfilerAgent(nullptr)
     , m_profilerAgent(nullptr)
     , m_consoleAgent(nullptr)
 {
-    if (savedState) {
-        std::unique_ptr<protocol::Value> state = protocol::parseJSON(*savedState);
+    if (savedState.length()) {
+        std::unique_ptr<protocol::Value> state = protocol::parseJSON(toString16(savedState));
         if (state)
             m_state = protocol::DictionaryValue::cast(std::move(state));
         if (!m_state)
             m_state = protocol::DictionaryValue::create();
     } else {
         m_state = protocol::DictionaryValue::create();
     }
 
     m_runtimeAgent = wrapUnique(new V8RuntimeAgentImpl(this, channel, agentState(protocol::Runtime::Metainfo::domainName)));
     protocol::Runtime::Dispatcher::wire(&m_dispatcher, m_runtimeAgent.get());
 
     m_debuggerAgent = wrapUnique(new V8DebuggerAgentImpl(this, channel, agentState(protocol::Debugger::Metainfo::domainName)));
     protocol::Debugger::Dispatcher::wire(&m_dispatcher, m_debuggerAgent.get());
 
     m_profilerAgent = wrapUnique(new V8ProfilerAgentImpl(this, channel, agentState(protocol::Profiler::Metainfo::domainName)));
     protocol::Profiler::Dispatcher::wire(&m_dispatcher, m_profilerAgent.get());
 
     m_heapProfilerAgent = wrapUnique(new V8HeapProfilerAgentImpl(this, channel, agentState(protocol::HeapProfiler::Metainfo::domainName)));
     protocol::HeapProfiler::Dispatcher::wire(&m_dispatcher, m_heapProfilerAgent.get());
 
     m_consoleAgent = wrapUnique(new V8ConsoleAgentImpl(this, channel, agentState(protocol::Console::Metainfo::domainName)));
     protocol::Console::Dispatcher::wire(&m_dispatcher, m_consoleAgent.get());
 
-    if (savedState) {
+    if (savedState.length()) {
         m_runtimeAgent->restore();
         m_debuggerAgent->restore();
         m_heapProfilerAgent->restore();
         m_profilerAgent->restore();
         m_consoleAgent->restore();
     }
 }
 
 V8InspectorSessionImpl::~V8InspectorSessionImpl()
 {
@@ skipping 77 matching lines @@
             context->getInjectedScript()->setCustomObjectFormatterEnabled(true);
     }
     return context->getInjectedScript();
 }
 
 InjectedScript* V8InspectorSessionImpl::findInjectedScript(ErrorString* errorString, RemoteObjectIdBase* objectId)
 {
     return objectId ? findInjectedScript(errorString, objectId->contextId()) : nullptr;
 }
 
+void V8InspectorSessionImpl::releaseObjectGroup(const StringView& objectGroup)
+{
+    releaseObjectGroup(toString16(objectGroup));
+}
+
 void V8InspectorSessionImpl::releaseObjectGroup(const String16& objectGroup)
 {
     const V8InspectorImpl::ContextByIdMap* contexts = m_inspector->contextGroup(m_contextGroupId);
     if (!contexts)
         return;
 
     std::vector<int> keys;
     for (auto& idContext : *contexts)
         keys.push_back(idContext.first);
     for (auto& key : keys) {
         contexts = m_inspector->contextGroup(m_contextGroupId);
         if (!contexts)
             continue;
         auto contextsIt = contexts->find(key);
         if (contextsIt == contexts->end())
             continue;
         InjectedScript* injectedScript = contextsIt->second->getInjectedScript();
         if (injectedScript)
             injectedScript->releaseObjectGroup(objectGroup); // This may destroy some contexts.
     }
 }
 
+bool V8InspectorSessionImpl::unwrapObject(ErrorString* errorString, const StringView& objectId, v8::Local<v8::Value>* object, v8::Local<v8::Context>* context, StringView* objectGroup)
+{
+    String16 group;
+    bool result = unwrapObject(errorString, toString16(objectId), object, context, &group);
+    *objectGroup = toStringView(group);

[caseq, 2016/08/19 21:57:02]

This does not look good -- you're returning to the caller a reference to a
memory controlled by a stack-allocated object that is about to die. 

[dgozman, 2016/08/20 02:04:51]

Right! Added simple StringBuffer for this.

+    return result;
+}
+
 bool V8InspectorSessionImpl::unwrapObject(ErrorString* errorString, const String16& objectId, v8::Local<v8::Value>* object, v8::Local<v8::Context>* context, String16* objectGroup)
 {
     std::unique_ptr<RemoteObjectId> remoteId = RemoteObjectId::parse(errorString, objectId);
     if (!remoteId)
         return false;
     InjectedScript* injectedScript = findInjectedScript(errorString, remoteId.get());
     if (!injectedScript)
         return false;
     if (!injectedScript->findObject(errorString, *remoteId, object))
         return false;
     *context = injectedScript->context()->context();
     *objectGroup = injectedScript->objectGroupName(*remoteId);
     return true;
 }
 
-std::unique_ptr<protocol::Runtime::API::RemoteObject> V8InspectorSessionImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& groupName)
+std::unique_ptr<protocol::Runtime::API::RemoteObject> V8InspectorSessionImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const StringView& groupName)
 {
-    return wrapObject(context, value, groupName, false);
+    return wrapObject(context, value, toString16(groupName), false);
 }
 
 std::unique_ptr<protocol::Runtime::RemoteObject> V8InspectorSessionImpl::wrapObject(v8::Local<v8::Context> context, v8::Local<v8::Value> value, const String16& groupName, bool generatePreview)
 {
     ErrorString errorString;
     InjectedScript* injectedScript = findInjectedScript(&errorString, V8Debugger::contextId(context));
     if (!injectedScript)
         return nullptr;
     return injectedScript->wrapObject(&errorString, value, groupName, false, generatePreview);
 }
@@ skipping 22 matching lines @@
 
 void V8InspectorSessionImpl::reportAllContexts(V8RuntimeAgentImpl* agent)
 {
     const V8InspectorImpl::ContextByIdMap* contexts = m_inspector->contextGroup(m_contextGroupId);
     if (!contexts)
         return;
     for (auto& idContext : *contexts)
         agent->reportExecutionContextCreated(idContext.second.get());
 }
 
-void V8InspectorSessionImpl::dispatchProtocolMessage(const String16& message)
+void V8InspectorSessionImpl::dispatchProtocolMessage(const StringView& message)
 {
-    m_dispatcher.dispatch(message);
+    m_dispatcher.dispatch(parseJSON(message));
 }
 
-String16 V8InspectorSessionImpl::stateJSON()
+StringView V8InspectorSessionImpl::stateJSON()
 {
-    return m_state->toJSONString();
+    String16 json = m_state->toJSONString();
+    return toStringView(json);

[caseq, 2016/08/19 21:57:02]

I'm sure we must have some very different understanding of how StringView works.

 }
 
 void V8InspectorSessionImpl::addInspectedObject(std::unique_ptr<V8InspectorSession::Inspectable> inspectable)
 {
     m_inspectedObjects.insert(m_inspectedObjects.begin(), std::move(inspectable));
     if (m_inspectedObjects.size() > kInspectedObjectBufferSize)
         m_inspectedObjects.resize(kInspectedObjectBufferSize);
 }
 
 V8InspectorSession::Inspectable* V8InspectorSessionImpl::inspectedObject(unsigned num)
 {
     if (num >= m_inspectedObjects.size())
         return nullptr;
     return m_inspectedObjects[num].get();
 }
 
-void V8InspectorSessionImpl::schedulePauseOnNextStatement(const String16& breakReason, const String16& breakDetails)
+void V8InspectorSessionImpl::schedulePauseOnNextStatement(const StringView& breakReason, const StringView& breakDetails)
 {
-    m_debuggerAgent->schedulePauseOnNextStatement(breakReason, protocol::DictionaryValue::cast(parseJSON(breakDetails)));
+    m_debuggerAgent->schedulePauseOnNextStatement(toString16(breakReason), protocol::DictionaryValue::cast(parseJSON(breakDetails)));
 }
 
 void V8InspectorSessionImpl::cancelPauseOnNextStatement()
 {
     m_debuggerAgent->cancelPauseOnNextStatement();
 }
 
-void V8InspectorSessionImpl::breakProgram(const String16& breakReason, const String16& breakDetails)
+void V8InspectorSessionImpl::breakProgram(const StringView& breakReason, const StringView& breakDetails)
 {
-    m_debuggerAgent->breakProgram(breakReason, protocol::DictionaryValue::cast(parseJSON(breakDetails)));
+    m_debuggerAgent->breakProgram(toString16(breakReason), protocol::DictionaryValue::cast(parseJSON(breakDetails)));
 }
 
 void V8InspectorSessionImpl::setSkipAllPauses(bool skip)
 {
     ErrorString errorString;
     m_debuggerAgent->setSkipAllPauses(&errorString, skip);
 }
 
 void V8InspectorSessionImpl::resume()
 {
     ErrorString errorString;
     m_debuggerAgent->resume(&errorString);
 }
 
 void V8InspectorSessionImpl::stepOver()
 {
     ErrorString errorString;
     m_debuggerAgent->stepOver(&errorString);
 }
 
-std::unique_ptr<protocol::Array<protocol::Debugger::API::SearchMatch>> V8InspectorSessionImpl::searchInTextByLines(const String16& text, const String16& query, bool caseSensitive, bool isRegex)
+std::unique_ptr<protocol::Array<protocol::Debugger::API::SearchMatch>> V8InspectorSessionImpl::searchInTextByLines(const StringView& text, const StringView& query, bool caseSensitive, bool isRegex)
 {
-    std::vector<std::unique_ptr<protocol::Debugger::SearchMatch>> matches = searchInTextByLinesImpl(this, text, query, caseSensitive, isRegex);
+    // TODO(dgozman): search may operate on StringView and avoid copying |text|.
+    std::vector<std::unique_ptr<protocol::Debugger::SearchMatch>> matches = searchInTextByLinesImpl(this, toString16(text), toString16(query), caseSensitive, isRegex);
     std::unique_ptr<protocol::Array<protocol::Debugger::API::SearchMatch>> result = protocol::Array<protocol::Debugger::API::SearchMatch>::create();
     for (size_t i = 0; i < matches.size(); ++i)
         result->addItem(std::move(matches[i]));
     return result;
 }
 
 } // namespace v8_inspector