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

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

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 #include "core/inspector/ConsoleMessage.h" 5 #include "core/inspector/ConsoleMessage.h"
6 6
7 #include "bindings/core/v8/ScriptValue.h" 7 #include "bindings/core/v8/ScriptValue.h"
8 #include "bindings/core/v8/SourceLocation.h" 8 #include "bindings/core/v8/SourceLocation.h"
9 #include "core/inspector/ScriptArguments.h" 9 #include "core/inspector/ScriptArguments.h"
10 #include "wtf/CurrentTime.h" 10 #include "wtf/CurrentTime.h"
11 #include <memory> 11 #include "wtf/PassOwnPtr.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 unsigned nextMessageId() 15 unsigned nextMessageId()
16 { 16 {
17 struct MessageId { 17 struct MessageId {
18 MessageId() : value(0) { } 18 MessageId() : value(0) { }
19 unsigned value; 19 unsigned value;
20 }; 20 };
21 21
(...skipping 11 matching lines...) Expand all
33 33
34 // static 34 // static
35 ConsoleMessage* ConsoleMessage::createForConsoleAPI(MessageLevel level, MessageT ype type, const String& message, ScriptArguments* arguments) 35 ConsoleMessage* ConsoleMessage::createForConsoleAPI(MessageLevel level, MessageT ype type, const String& message, ScriptArguments* arguments)
36 { 36 {
37 ConsoleMessage* consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSou rce, level, message, SourceLocation::capture(), arguments); 37 ConsoleMessage* consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSou rce, level, message, SourceLocation::capture(), arguments);
38 consoleMessage->m_type = type; 38 consoleMessage->m_type = type;
39 return consoleMessage; 39 return consoleMessage;
40 } 40 }
41 41
42 // static 42 // static
43 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level, const String& message, std::unique_ptr<SourceLocation> location, ScriptArgument s* arguments) 43 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level, const String& message, PassOwnPtr<SourceLocation> location, ScriptArguments* ar guments)
44 { 44 {
45 return new ConsoleMessage(source, level, message, std::move(location), argum ents); 45 return new ConsoleMessage(source, level, message, std::move(location), argum ents);
46 } 46 }
47 47
48 // static 48 // static
49 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level, const String& message) 49 ConsoleMessage* ConsoleMessage::create(MessageSource source, MessageLevel level, const String& message)
50 { 50 {
51 return ConsoleMessage::create(source, level, message, SourceLocation::captur e()); 51 return ConsoleMessage::create(source, level, message, SourceLocation::captur e());
52 } 52 }
53 53
54 ConsoleMessage::ConsoleMessage(MessageSource source, 54 ConsoleMessage::ConsoleMessage(MessageSource source,
55 MessageLevel level, 55 MessageLevel level,
56 const String& message, 56 const String& message,
57 std::unique_ptr<SourceLocation> location, 57 PassOwnPtr<SourceLocation> location,
58 ScriptArguments* arguments) 58 ScriptArguments* arguments)
59 : m_source(source) 59 : m_source(source)
60 , m_level(level) 60 , m_level(level)
61 , m_type(LogMessageType) 61 , m_type(LogMessageType)
62 , m_message(message) 62 , m_message(message)
63 , m_location(std::move(location)) 63 , m_location(std::move(location))
64 , m_scriptArguments(arguments) 64 , m_scriptArguments(arguments)
65 , m_requestIdentifier(0) 65 , m_requestIdentifier(0)
66 , m_timestamp(WTF::currentTime()) 66 , m_timestamp(WTF::currentTime())
67 , m_messageId(0) 67 , m_messageId(0)
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 return m_scriptArguments->argumentCount(); 137 return m_scriptArguments->argumentCount();
138 return 0; 138 return 0;
139 } 139 }
140 140
141 DEFINE_TRACE(ConsoleMessage) 141 DEFINE_TRACE(ConsoleMessage)
142 { 142 {
143 visitor->trace(m_scriptArguments); 143 visitor->trace(m_scriptArguments);
144 } 144 }
145 145
146 } // namespace blink 146 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/inspector/ConsoleMessage.h ('k') | third_party/WebKit/Source/core/inspector/DOMPatchSupport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698