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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 "core/CoreExport.h" 8 #include "core/CoreExport.h"
9 #include "platform/heap/Handle.h" 9 #include "platform/heap/Handle.h"
10 #include "platform/v8_inspector/public/ConsoleAPITypes.h" 10 #include "platform/v8_inspector/public/ConsoleAPITypes.h"
11 #include "platform/v8_inspector/public/ConsoleTypes.h" 11 #include "platform/v8_inspector/public/ConsoleTypes.h"
12 #include "wtf/Forward.h" 12 #include "wtf/Forward.h"
13 #include "wtf/PassRefPtr.h" 13 #include "wtf/PassRefPtr.h"
14 #include "wtf/RefCounted.h" 14 #include "wtf/RefCounted.h"
15 #include "wtf/text/WTFString.h" 15 #include "wtf/text/WTFString.h"
16 #include <memory>
17 16
18 namespace blink { 17 namespace blink {
19 18
20 class LocalDOMWindow; 19 class LocalDOMWindow;
21 class ScriptArguments; 20 class ScriptArguments;
22 class SourceLocation; 21 class SourceLocation;
23 class V8StackTrace; 22 class V8StackTrace;
24 23
25 class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<Console Message> { 24 class CORE_EXPORT ConsoleMessage final: public GarbageCollectedFinalized<Console Message> {
26 public: 25 public:
27 // Location should not be null. Zero lineNumber or columnNumber means unknow n. 26 // Location should not be null. Zero lineNumber or columnNumber means unknow n.
28 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, std::unique_ptr<SourceLocation>, ScriptArguments* = nullptr); 27 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage, PassOwnPtr<SourceLocation>, ScriptArguments* = nullptr);
29 28
30 // Shortcut when location is unknown. Captures current location. 29 // Shortcut when location is unknown. Captures current location.
31 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage); 30 static ConsoleMessage* create(MessageSource, MessageLevel, const String& mes sage);
32 31
33 // This method captures current location. 32 // This method captures current location.
34 static ConsoleMessage* createForRequest(MessageSource, MessageLevel, const S tring& message, const String& url, unsigned long requestIdentifier); 33 static ConsoleMessage* createForRequest(MessageSource, MessageLevel, const S tring& message, const String& url, unsigned long requestIdentifier);
35 34
36 // This method captures current location. 35 // This method captures current location.
37 static ConsoleMessage* createForConsoleAPI(MessageLevel, MessageType, const String& message, ScriptArguments*); 36 static ConsoleMessage* createForConsoleAPI(MessageLevel, MessageType, const String& message, ScriptArguments*);
38 37
(...skipping 11 matching lines...) Expand all
50 MessageSource source() const; 49 MessageSource source() const;
51 MessageLevel level() const; 50 MessageLevel level() const;
52 const String& message() const; 51 const String& message() const;
53 52
54 void frameWindowDiscarded(LocalDOMWindow*); 53 void frameWindowDiscarded(LocalDOMWindow*);
55 unsigned argumentCount(); 54 unsigned argumentCount();
56 55
57 DECLARE_TRACE(); 56 DECLARE_TRACE();
58 57
59 private: 58 private:
60 ConsoleMessage(MessageSource, MessageLevel, const String& message, std::uniq ue_ptr<SourceLocation>, ScriptArguments*); 59 ConsoleMessage(MessageSource, MessageLevel, const String& message, PassOwnPt r<SourceLocation>, ScriptArguments*);
61 60
62 MessageSource m_source; 61 MessageSource m_source;
63 MessageLevel m_level; 62 MessageLevel m_level;
64 MessageType m_type; 63 MessageType m_type;
65 String m_message; 64 String m_message;
66 std::unique_ptr<SourceLocation> m_location; 65 OwnPtr<SourceLocation> m_location;
67 Member<ScriptArguments> m_scriptArguments; 66 Member<ScriptArguments> m_scriptArguments;
68 unsigned long m_requestIdentifier; 67 unsigned long m_requestIdentifier;
69 double m_timestamp; 68 double m_timestamp;
70 unsigned m_messageId; 69 unsigned m_messageId;
71 unsigned m_relatedMessageId; 70 unsigned m_relatedMessageId;
72 }; 71 };
73 72
74 } // namespace blink 73 } // namespace blink
75 74
76 #endif // ConsoleMessage_h 75 #endif // ConsoleMessage_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698