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

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

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

Powered by Google App Engine
This is Rietveld 408576698