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

Side by Side Diff: third_party/WebKit/Source/core/inspector/ConsoleMessage.h

Issue 1997293002: Introduce SourceLocation to be used for console messages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 4 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ConsoleMessage_h 5 #ifndef ConsoleMessage_h
6 #define ConsoleMessage_h 6 #define ConsoleMessage_h
7 7
8 #include "bindings/core/v8/ScriptCallStack.h"
9 #include "bindings/core/v8/ScriptState.h" 8 #include "bindings/core/v8/ScriptState.h"
10 #include "core/CoreExport.h" 9 #include "core/CoreExport.h"
11 #include "platform/heap/Handle.h" 10 #include "platform/heap/Handle.h"
12 #include "platform/v8_inspector/public/ConsoleAPITypes.h" 11 #include "platform/v8_inspector/public/ConsoleAPITypes.h"
13 #include "platform/v8_inspector/public/ConsoleTypes.h" 12 #include "platform/v8_inspector/public/ConsoleTypes.h"
14 #include "wtf/Forward.h" 13 #include "wtf/Forward.h"
15 #include "wtf/PassRefPtr.h" 14 #include "wtf/PassRefPtr.h"
16 #include "wtf/RefCounted.h" 15 #include "wtf/RefCounted.h"
17 #include "wtf/text/WTFString.h" 16 #include "wtf/text/WTFString.h"
18 17
19 namespace blink { 18 namespace blink {
20 19
21 class ScriptArguments; 20 class ScriptArguments;
21 class ScriptCallStack;
22 class ScriptState; 22 class ScriptState;
23 class SourceLocation;
24 class V8StackTrace;
23 25
24 class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<Console Message> { 26 class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<Console Message> {
25 public: 27 public:
26 // Callstack may be empty. Zero lineNumber or columnNumber means unknown. 28 // Callstack may be empty. Zero lineNumber or columnNumber means unknown.
27 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr< ScriptCallStack>, int scriptId = 0, ScriptArguments* = nullptr); 29 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, const String& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr< ScriptCallStack>, int scriptId = 0, ScriptArguments* = nullptr);
28 30
29 // Shortcut when callstack is unavailable. 31 // Shortcut when callstack is unavailable.
30 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, const String& url, unsigned lineNumber, unsigned columnNumber); 32 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, const String& url, unsigned lineNumber, unsigned columnNumber);
31 33
32 // This method tries to capture callstack if possible and falls back to prov ided location. 34 // This method tries to capture callstack if possible and falls back to prov ided location.
33 static ConsoleMessage* createWithCallStack(MessageSource, MessageLevel, cons t String& message, const String& url, unsigned lineNumber, unsigned columnNumber ); 35 static ConsoleMessage* createWithCallStack(MessageSource, MessageLevel, cons t String& message, const String& url, unsigned lineNumber, unsigned columnNumber );
34 36
35 // Shortcut when location is unavailable. This method captures callstack. 37 // Shortcut when location is unavailable. This method captures callstack.
36 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage); 38 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage);
37 39
38 // This method captures callstack. 40 // This method captures callstack.
39 static ConsoleMessage* createForRequest(MessageSource, MessageLevel, const S tring& message, const String& url, unsigned long requestIdentifier); 41 static ConsoleMessage* createForRequest(MessageSource, MessageLevel, const S tring& message, const String& url, unsigned long requestIdentifier);
40 42
41 // This method captures callstack. 43 // This method captures callstack.
42 static ConsoleMessage* createForConsoleAPI(MessageLevel, MessageType, const String& message, ScriptArguments*); 44 static ConsoleMessage* createForConsoleAPI(MessageLevel, MessageType, const String& message, ScriptArguments*);
43 45
46 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, PassOwnPtr<SourceLocation>);
47 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, const String& url, unsigned lineNumber, unsigned columnNumber, PassOwnPtr< V8StackTrace>, int scriptId, ScriptArguments*);
48
44 ~ConsoleMessage(); 49 ~ConsoleMessage();
45 50
46 MessageType type() const; 51 MessageType type() const;
47 int scriptId() const; 52 int scriptId() const;
48 const String& url() const; 53 const String& url() const;
49 unsigned lineNumber() const; 54 unsigned lineNumber() const;
50 unsigned columnNumber() const; 55 unsigned columnNumber() const;
51 PassRefPtr<ScriptCallStack> callStack() const; 56 V8StackTrace* stackTrace() const;
52 ScriptArguments* scriptArguments() const; 57 ScriptArguments* scriptArguments() const;
53 unsigned long requestIdentifier() const; 58 unsigned long requestIdentifier() const;
54 double timestamp() const; 59 double timestamp() const;
55 unsigned assignMessageId(); 60 unsigned assignMessageId();
56 unsigned messageId() const { return m_messageId; } 61 unsigned messageId() const { return m_messageId; }
57 unsigned relatedMessageId() const { return m_relatedMessageId; } 62 unsigned relatedMessageId() const { return m_relatedMessageId; }
58 void setRelatedMessageId(unsigned relatedMessageId) { m_relatedMessageId = r elatedMessageId; } 63 void setRelatedMessageId(unsigned relatedMessageId) { m_relatedMessageId = r elatedMessageId; }
59 MessageSource source() const; 64 MessageSource source() const;
60 MessageLevel level() const; 65 MessageLevel level() const;
61 const String& message() const; 66 const String& message() const;
62 67
63 void frameWindowDiscarded(LocalDOMWindow*); 68 void frameWindowDiscarded(LocalDOMWindow*);
64 unsigned argumentCount(); 69 unsigned argumentCount();
65 70
66 DECLARE_TRACE(); 71 DECLARE_TRACE();
67 72
68 private: 73 private:
69 ConsoleMessage(MessageSource, MessageLevel, const String& message, const Str ing& url, unsigned lineNumber, unsigned columnNumber, PassRefPtr<ScriptCallStack >, int scriptId, ScriptArguments*); 74 ConsoleMessage(MessageSource, MessageLevel, const String& message, const Str ing& url, unsigned lineNumber, unsigned columnNumber, PassOwnPtr<V8StackTrace>, int scriptId, ScriptArguments*);
70 75
71 MessageSource m_source; 76 MessageSource m_source;
72 MessageLevel m_level; 77 MessageLevel m_level;
73 MessageType m_type; 78 MessageType m_type;
74 String m_message; 79 String m_message;
75 int m_scriptId; 80 int m_scriptId;
76 String m_url; 81 String m_url;
77 unsigned m_lineNumber; 82 unsigned m_lineNumber;
78 unsigned m_columnNumber; 83 unsigned m_columnNumber;
79 RefPtr<ScriptCallStack> m_callStack; 84 OwnPtr<V8StackTrace> m_stackTrace;
80 Member<ScriptArguments> m_scriptArguments; 85 Member<ScriptArguments> m_scriptArguments;
81 unsigned long m_requestIdentifier; 86 unsigned long m_requestIdentifier;
82 double m_timestamp; 87 double m_timestamp;
83 unsigned m_messageId; 88 unsigned m_messageId;
84 unsigned m_relatedMessageId; 89 unsigned m_relatedMessageId;
85 }; 90 };
86 91
87 } // namespace blink 92 } // namespace blink
88 93
89 #endif // ConsoleMessage_h 94 #endif // ConsoleMessage_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp ('k') | third_party/WebKit/Source/core/inspector/ConsoleMessage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698