Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(403)

Unified Diff: third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp

Issue 2251343003: [DevTools] Generate separate copies of inspector_protocol. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp b/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
index a3c9fe2654d5c82908ee166595cd93cbb9101f21..134e56220b939ddcf97f16034e134cddf3c333ef 100644
--- a/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
@@ -11,6 +11,7 @@
#include "core/dom/ScriptableDocumentParser.h"
#include "core/html/HTMLFrameOwnerElement.h"
#include "core/inspector/ThreadDebugger.h"
+#include "core/inspector/V8InspectorStringConversion.h"
#include "platform/ScriptForbiddenScope.h"
#include "platform/TracedValue.h"
#include "platform/v8_inspector/public/V8Inspector.h"
@@ -103,7 +104,7 @@ std::unique_ptr<SourceLocation> SourceLocation::create(const String& url, unsign
std::unique_ptr<SourceLocation> SourceLocation::createFromNonEmptyV8StackTrace(std::unique_ptr<v8_inspector::V8StackTrace> stackTrace, int scriptId)
{
// Retrieve the data before passing the ownership to SourceLocation.
- const String& url = stackTrace->topSourceURL();
+ const String& url = toCoreString(stackTrace->topSourceURL());
caseq 2016/08/19 02:50:36 this doesn't look good :-)
unsigned lineNumber = stackTrace->topLineNumber();
unsigned columnNumber = stackTrace->topColumnNumber();
return wrapUnique(new SourceLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId));
@@ -145,9 +146,9 @@ void SourceLocation::toTracedValue(TracedValue* value, const char* name) const
return;
value->beginArray(name);
value->beginDictionary();
- value->setString("functionName", m_stackTrace->topFunctionName());
- value->setString("scriptId", m_stackTrace->topScriptId());
- value->setString("url", m_stackTrace->topSourceURL());
+ value->setString("functionName", toCoreString(m_stackTrace->topFunctionName()));
+ value->setString("scriptId", toCoreString(m_stackTrace->topScriptId()));
+ value->setString("url", toCoreString(m_stackTrace->topSourceURL()));
value->setInteger("lineNumber", m_stackTrace->topLineNumber());
value->setInteger("columnNumber", m_stackTrace->topColumnNumber());
value->endDictionary();
@@ -159,7 +160,7 @@ std::unique_ptr<SourceLocation> SourceLocation::clone() const
return wrapUnique(new SourceLocation(m_url.isolatedCopy(), m_lineNumber, m_columnNumber, m_stackTrace ? m_stackTrace->clone() : nullptr, m_scriptId));
}
-std::unique_ptr<protocol::Runtime::API::StackTrace> SourceLocation::buildInspectorObject() const
+std::unique_ptr<v8_inspector::protocol::Runtime::API::StackTrace> SourceLocation::buildInspectorObject() const
{
return m_stackTrace ? m_stackTrace->buildInspectorObject() : nullptr;
}
@@ -168,7 +169,7 @@ String SourceLocation::toString() const
{
if (!m_stackTrace)
return String();
- return m_stackTrace->toString();
+ return toCoreString(m_stackTrace->toString());
}
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698