| Index: third_party/WebKit/Source/core/inspector/ConsoleMessage.h
|
| diff --git a/third_party/WebKit/Source/core/inspector/ConsoleMessage.h b/third_party/WebKit/Source/core/inspector/ConsoleMessage.h
|
| index 0df4f4f3cfee52a6dbf0b7b30bba1d70e6eb597b..4d0b11fc8b3e3df7ff1ffc6726a7d9bb510ff073 100644
|
| --- a/third_party/WebKit/Source/core/inspector/ConsoleMessage.h
|
| +++ b/third_party/WebKit/Source/core/inspector/ConsoleMessage.h
|
| @@ -6,9 +6,8 @@
|
| #define ConsoleMessage_h
|
|
|
| #include "core/CoreExport.h"
|
| +#include "core/inspector/ConsoleTypes.h"
|
| #include "platform/heap/Handle.h"
|
| -#include "platform/v8_inspector/public/ConsoleAPITypes.h"
|
| -#include "platform/v8_inspector/public/ConsoleTypes.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/RefCounted.h"
|
| @@ -17,15 +16,12 @@
|
|
|
| namespace blink {
|
|
|
| -class LocalDOMWindow;
|
| -class ScriptArguments;
|
| class SourceLocation;
|
| -class V8StackTrace;
|
|
|
| class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<ConsoleMessage> {
|
| public:
|
| // Location should not be null. Zero lineNumber or columnNumber means unknown.
|
| - static ConsoleMessage* create(MessageSource, MessageLevel, const String& message, std::unique_ptr<SourceLocation>, ScriptArguments* = nullptr);
|
| + static ConsoleMessage* create(MessageSource, MessageLevel, const String& message, std::unique_ptr<SourceLocation>);
|
|
|
| // Shortcut when location is unknown. Captures current location.
|
| static ConsoleMessage* create(MessageSource, MessageLevel, const String& message);
|
| @@ -33,42 +29,26 @@ public:
|
| // This method captures current location.
|
| static ConsoleMessage* createForRequest(MessageSource, MessageLevel, const String& message, const String& url, unsigned long requestIdentifier);
|
|
|
| - // This method captures current location.
|
| - static ConsoleMessage* createForConsoleAPI(MessageLevel, MessageType, const String& message, ScriptArguments*);
|
| -
|
| ~ConsoleMessage();
|
|
|
| - MessageType type() const;
|
| SourceLocation* location() const;
|
| - ScriptArguments* scriptArguments() const;
|
| unsigned long requestIdentifier() const;
|
| double timestamp() const;
|
| - unsigned assignMessageId();
|
| - unsigned messageId() const { return m_messageId; }
|
| - unsigned relatedMessageId() const { return m_relatedMessageId; }
|
| - void setRelatedMessageId(unsigned relatedMessageId) { m_relatedMessageId = relatedMessageId; }
|
| MessageSource source() const;
|
| MessageLevel level() const;
|
| const String& message() const;
|
|
|
| - void frameWindowDiscarded(LocalDOMWindow*);
|
| - unsigned argumentCount();
|
| -
|
| DECLARE_TRACE();
|
|
|
| private:
|
| - ConsoleMessage(MessageSource, MessageLevel, const String& message, std::unique_ptr<SourceLocation>, ScriptArguments*);
|
| + ConsoleMessage(MessageSource, MessageLevel, const String& message, std::unique_ptr<SourceLocation>);
|
|
|
| MessageSource m_source;
|
| MessageLevel m_level;
|
| - MessageType m_type;
|
| String m_message;
|
| std::unique_ptr<SourceLocation> m_location;
|
| - Member<ScriptArguments> m_scriptArguments;
|
| unsigned long m_requestIdentifier;
|
| double m_timestamp;
|
| - unsigned m_messageId;
|
| - unsigned m_relatedMessageId;
|
| };
|
|
|
| } // namespace blink
|
|
|