| 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 c1547d233c7b750382ecd1bd7da43a123d1bb1df..a3c9fe2654d5c82908ee166595cd93cbb9101f21 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/SourceLocation.cpp
|
| @@ -21,7 +21,7 @@ namespace blink {
|
|
|
| namespace {
|
|
|
| -std::unique_ptr<V8StackTrace> captureStackTrace(bool full)
|
| +std::unique_ptr<v8_inspector::V8StackTrace> captureStackTrace(bool full)
|
| {
|
| v8::Isolate* isolate = v8::Isolate::GetCurrent();
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
| @@ -36,7 +36,7 @@ std::unique_ptr<V8StackTrace> captureStackTrace(bool full)
|
| // static
|
| std::unique_ptr<SourceLocation> SourceLocation::capture(const String& url, unsigned lineNumber, unsigned columnNumber)
|
| {
|
| - std::unique_ptr<V8StackTrace> stackTrace = captureStackTrace(false);
|
| + std::unique_ptr<v8_inspector::V8StackTrace> stackTrace = captureStackTrace(false);
|
| if (stackTrace && !stackTrace->isEmpty())
|
| return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
|
| return SourceLocation::create(url, lineNumber, columnNumber, std::move(stackTrace));
|
| @@ -45,7 +45,7 @@ std::unique_ptr<SourceLocation> SourceLocation::capture(const String& url, unsig
|
| // static
|
| std::unique_ptr<SourceLocation> SourceLocation::capture(ExecutionContext* executionContext)
|
| {
|
| - std::unique_ptr<V8StackTrace> stackTrace = captureStackTrace(false);
|
| + std::unique_ptr<v8_inspector::V8StackTrace> stackTrace = captureStackTrace(false);
|
| if (stackTrace && !stackTrace->isEmpty())
|
| return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
|
|
|
| @@ -66,7 +66,7 @@ std::unique_ptr<SourceLocation> SourceLocation::capture(ExecutionContext* execut
|
| std::unique_ptr<SourceLocation> SourceLocation::fromMessage(v8::Isolate* isolate, v8::Local<v8::Message> message, ExecutionContext* executionContext)
|
| {
|
| v8::Local<v8::StackTrace> stack = message->GetStackTrace();
|
| - std::unique_ptr<V8StackTrace> stackTrace = nullptr;
|
| + std::unique_ptr<v8_inspector::V8StackTrace> stackTrace = nullptr;
|
| V8PerIsolateData* data = V8PerIsolateData::from(isolate);
|
| if (data && data->threadDebugger())
|
| stackTrace = data->threadDebugger()->v8Inspector()->createStackTrace(stack);
|
| @@ -94,13 +94,13 @@ std::unique_ptr<SourceLocation> SourceLocation::fromMessage(v8::Isolate* isolate
|
| }
|
|
|
| // static
|
| -std::unique_ptr<SourceLocation> SourceLocation::create(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
|
| +std::unique_ptr<SourceLocation> SourceLocation::create(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<v8_inspector::V8StackTrace> stackTrace, int scriptId)
|
| {
|
| return wrapUnique(new SourceLocation(url, lineNumber, columnNumber, std::move(stackTrace), scriptId));
|
| }
|
|
|
| // static
|
| -std::unique_ptr<SourceLocation> SourceLocation::createFromNonEmptyV8StackTrace(std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
|
| +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();
|
| @@ -120,13 +120,13 @@ std::unique_ptr<SourceLocation> SourceLocation::fromFunction(v8::Local<v8::Funct
|
| // static
|
| std::unique_ptr<SourceLocation> SourceLocation::captureWithFullStackTrace()
|
| {
|
| - std::unique_ptr<V8StackTrace> stackTrace = captureStackTrace(true);
|
| + std::unique_ptr<v8_inspector::V8StackTrace> stackTrace = captureStackTrace(true);
|
| if (stackTrace && !stackTrace->isEmpty())
|
| return SourceLocation::createFromNonEmptyV8StackTrace(std::move(stackTrace), 0);
|
| return SourceLocation::create(String(), 0, 0, nullptr, 0);
|
| }
|
|
|
| -SourceLocation::SourceLocation(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<V8StackTrace> stackTrace, int scriptId)
|
| +SourceLocation::SourceLocation(const String& url, unsigned lineNumber, unsigned columnNumber, std::unique_ptr<v8_inspector::V8StackTrace> stackTrace, int scriptId)
|
| : m_url(url)
|
| , m_lineNumber(lineNumber)
|
| , m_columnNumber(columnNumber)
|
|
|