| Index: third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp
|
| index 26b5607e93724ed1b27914bb54499b7b59cb43dd..2aaeb0dba4a32c539382438a405b2c1dfb88063b 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8InspectorSessionImpl.cpp
|
| @@ -278,7 +278,7 @@ V8InspectorSession::Inspectable* V8InspectorSessionImpl::inspectedObject(unsigne
|
|
|
| void V8InspectorSessionImpl::schedulePauseOnNextStatement(const String16& breakReason, const String16& breakDetails)
|
| {
|
| - m_debuggerAgent->schedulePauseOnNextStatement(breakReason, protocol::DictionaryValue::cast(parseJSON(breakDetails)));
|
| + m_debuggerAgent->schedulePauseOnNextStatement(breakReason, protocol::DictionaryValue::cast(protocol::parseJSON(breakDetails)));
|
| }
|
|
|
| void V8InspectorSessionImpl::cancelPauseOnNextStatement()
|
| @@ -288,7 +288,7 @@ void V8InspectorSessionImpl::cancelPauseOnNextStatement()
|
|
|
| void V8InspectorSessionImpl::breakProgram(const String16& breakReason, const String16& breakDetails)
|
| {
|
| - m_debuggerAgent->breakProgram(breakReason, protocol::DictionaryValue::cast(parseJSON(breakDetails)));
|
| + m_debuggerAgent->breakProgram(breakReason, protocol::DictionaryValue::cast(protocol::parseJSON(breakDetails)));
|
| }
|
|
|
| void V8InspectorSessionImpl::setSkipAllPauses(bool skip)
|
| @@ -309,12 +309,12 @@ void V8InspectorSessionImpl::stepOver()
|
| 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::vector<std::unique_ptr<protocol::Debugger::API::SearchMatch>> V8InspectorSessionImpl::searchInTextByLines(const String16& text, const String16& query, bool caseSensitive, bool isRegex)
|
| {
|
| std::vector<std::unique_ptr<protocol::Debugger::SearchMatch>> matches = searchInTextByLinesImpl(this, text, query, caseSensitive, isRegex);
|
| - std::unique_ptr<protocol::Array<protocol::Debugger::API::SearchMatch>> result = protocol::Array<protocol::Debugger::API::SearchMatch>::create();
|
| + std::vector<std::unique_ptr<protocol::Debugger::API::SearchMatch>> result;
|
| for (size_t i = 0; i < matches.size(); ++i)
|
| - result->addItem(std::move(matches[i]));
|
| + result.push_back(std::move(matches[i]));
|
| return result;
|
| }
|
|
|
|
|