| Index: third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.h
|
| diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.h b/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.h
|
| index 5edf63d03d621b418426055ee9d8dc4fefb127cf..41c40a7c97b64aa16d795640f5f3c37489dc6c5c 100644
|
| --- a/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.h
|
| +++ b/third_party/WebKit/Source/platform/v8_inspector/V8StackTraceImpl.h
|
| @@ -20,12 +20,12 @@ public:
|
| class Frame {
|
| public:
|
| Frame();
|
| - Frame(const String& functionName, const String& scriptId, const String& scriptName, int lineNumber, int column = 0);
|
| + Frame(const String16& functionName, const String16& scriptId, const String16& scriptName, int lineNumber, int column = 0);
|
| ~Frame();
|
|
|
| - const String& functionName() const { return m_functionName; }
|
| - const String& scriptId() const { return m_scriptId; }
|
| - const String& sourceURL() const { return m_scriptName; }
|
| + const String16& functionName() const { return m_functionName; }
|
| + const String16& scriptId() const { return m_scriptId; }
|
| + const String16& sourceURL() const { return m_scriptName; }
|
| int lineNumber() const { return m_lineNumber; }
|
| int columnNumber() const { return m_columnNumber; }
|
|
|
| @@ -34,34 +34,34 @@ public:
|
| PassOwnPtr<protocol::Runtime::CallFrame> buildInspectorObject() const;
|
| void toTracedValue(TracedValue*) const;
|
|
|
| - String m_functionName;
|
| - String m_scriptId;
|
| - String m_scriptName;
|
| + String16 m_functionName;
|
| + String16 m_scriptId;
|
| + String16 m_scriptName;
|
| int m_lineNumber;
|
| int m_columnNumber;
|
| };
|
|
|
| - static PassOwnPtr<V8StackTraceImpl> create(const String& description, protocol::Vector<Frame>&, PassOwnPtr<V8StackTraceImpl>);
|
| - static PassOwnPtr<V8StackTraceImpl> create(V8DebuggerAgentImpl*, v8::Local<v8::StackTrace>, size_t maxStackSize, const String& description = String());
|
| - static PassOwnPtr<V8StackTraceImpl> capture(V8DebuggerAgentImpl*, size_t maxStackSize, const String& description = String());
|
| + static PassOwnPtr<V8StackTraceImpl> create(const String16& description, protocol::Vector<Frame>&, PassOwnPtr<V8StackTraceImpl>);
|
| + static PassOwnPtr<V8StackTraceImpl> create(V8DebuggerAgentImpl*, v8::Local<v8::StackTrace>, size_t maxStackSize, const String16& description = String16());
|
| + static PassOwnPtr<V8StackTraceImpl> capture(V8DebuggerAgentImpl*, size_t maxStackSize, const String16& description = String16());
|
| static PassOwnPtr<V8StackTraceImpl> clone(V8StackTraceImpl*, size_t maxAsyncStackSize);
|
|
|
| ~V8StackTraceImpl() override;
|
|
|
| // V8StackTrace implementation.
|
| bool isEmpty() const override { return !m_frames.size(); };
|
| - String topSourceURL() const override;
|
| + String16 topSourceURL() const override;
|
| int topLineNumber() const override;
|
| int topColumnNumber() const override;
|
| - String topScriptId() const override;
|
| - String topFunctionName() const override;
|
| + String16 topScriptId() const override;
|
| + String16 topFunctionName() const override;
|
| PassOwnPtr<protocol::Runtime::StackTrace> buildInspectorObject() const override;
|
| - String toString() const override;
|
| + String16 toString() const override;
|
|
|
| private:
|
| - V8StackTraceImpl(const String& description, protocol::Vector<Frame>& frames, PassOwnPtr<V8StackTraceImpl> parent);
|
| + V8StackTraceImpl(const String16& description, protocol::Vector<Frame>& frames, PassOwnPtr<V8StackTraceImpl> parent);
|
|
|
| - String m_description;
|
| + String16 m_description;
|
| protocol::Vector<Frame> m_frames;
|
| OwnPtr<V8StackTraceImpl> m_parent;
|
| };
|
|
|