| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 #include "platform/TraceEvent.h" | 36 #include "platform/TraceEvent.h" |
| 37 #include "wtf/text/CString.h" | 37 #include "wtf/text/CString.h" |
| 38 #include "wtf/text/WTFString.h" | 38 #include "wtf/text/WTFString.h" |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 ConsoleBase::~ConsoleBase() | 42 ConsoleBase::~ConsoleBase() |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| 46 void ConsoleBase::debug(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 46 void ConsoleBase::debug(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 47 { | 47 { |
| 48 internalAddMessage(LogMessageType, DebugMessageLevel, scriptState, arguments
); | 48 internalAddMessage(LogMessageType, DebugMessageLevel, scriptState, arguments
); |
| 49 } | 49 } |
| 50 | 50 |
| 51 void ConsoleBase::error(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 51 void ConsoleBase::error(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 52 { | 52 { |
| 53 internalAddMessage(LogMessageType, ErrorMessageLevel, scriptState, arguments
); | 53 internalAddMessage(LogMessageType, ErrorMessageLevel, scriptState, arguments
); |
| 54 } | 54 } |
| 55 | 55 |
| 56 void ConsoleBase::info(ScriptState* scriptState, PassRefPtr<ScriptArguments> arg
uments) | 56 void ConsoleBase::info(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptAr
guments> arguments) |
| 57 { | 57 { |
| 58 internalAddMessage(LogMessageType, InfoMessageLevel, scriptState, arguments)
; | 58 internalAddMessage(LogMessageType, InfoMessageLevel, scriptState, arguments)
; |
| 59 } | 59 } |
| 60 | 60 |
| 61 void ConsoleBase::log(ScriptState* scriptState, PassRefPtr<ScriptArguments> argu
ments) | 61 void ConsoleBase::log(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArg
uments> arguments) |
| 62 { | 62 { |
| 63 internalAddMessage(LogMessageType, LogMessageLevel, scriptState, arguments); | 63 internalAddMessage(LogMessageType, LogMessageLevel, scriptState, arguments); |
| 64 } | 64 } |
| 65 | 65 |
| 66 void ConsoleBase::warn(ScriptState* scriptState, PassRefPtr<ScriptArguments> arg
uments) | 66 void ConsoleBase::warn(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptAr
guments> arguments) |
| 67 { | 67 { |
| 68 internalAddMessage(LogMessageType, WarningMessageLevel, scriptState, argumen
ts); | 68 internalAddMessage(LogMessageType, WarningMessageLevel, scriptState, argumen
ts); |
| 69 } | 69 } |
| 70 | 70 |
| 71 void ConsoleBase::dir(ScriptState* scriptState, PassRefPtr<ScriptArguments> argu
ments) | 71 void ConsoleBase::dir(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArg
uments> arguments) |
| 72 { | 72 { |
| 73 internalAddMessage(DirMessageType, LogMessageLevel, scriptState, arguments); | 73 internalAddMessage(DirMessageType, LogMessageLevel, scriptState, arguments); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void ConsoleBase::dirxml(ScriptState* scriptState, PassRefPtr<ScriptArguments> a
rguments) | 76 void ConsoleBase::dirxml(ScriptState* scriptState, PassRefPtrWillBeRawPtr<Script
Arguments> arguments) |
| 77 { | 77 { |
| 78 internalAddMessage(DirXMLMessageType, LogMessageLevel, scriptState, argument
s); | 78 internalAddMessage(DirXMLMessageType, LogMessageLevel, scriptState, argument
s); |
| 79 } | 79 } |
| 80 | 80 |
| 81 void ConsoleBase::table(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 81 void ConsoleBase::table(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 82 { | 82 { |
| 83 internalAddMessage(TableMessageType, LogMessageLevel, scriptState, arguments
); | 83 internalAddMessage(TableMessageType, LogMessageLevel, scriptState, arguments
); |
| 84 } | 84 } |
| 85 | 85 |
| 86 void ConsoleBase::clear(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 86 void ConsoleBase::clear(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 87 { | 87 { |
| 88 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, ClearMessageType, LogMessageLevel, String(), scriptState, arguments); | 88 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, ClearMessageType, LogMessageLevel, String(), scriptState, arguments); |
| 89 } | 89 } |
| 90 | 90 |
| 91 void ConsoleBase::trace(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 91 void ConsoleBase::trace(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 92 { | 92 { |
| 93 internalAddMessage(TraceMessageType, LogMessageLevel, scriptState, arguments
, true, true); | 93 internalAddMessage(TraceMessageType, LogMessageLevel, scriptState, arguments
, true, true); |
| 94 } | 94 } |
| 95 | 95 |
| 96 void ConsoleBase::assertCondition(ScriptState* scriptState, PassRefPtr<ScriptArg
uments> arguments, bool condition) | 96 void ConsoleBase::assertCondition(ScriptState* scriptState, PassRefPtrWillBeRawP
tr<ScriptArguments> arguments, bool condition) |
| 97 { | 97 { |
| 98 if (condition) | 98 if (condition) |
| 99 return; | 99 return; |
| 100 | 100 |
| 101 internalAddMessage(AssertMessageType, ErrorMessageLevel, scriptState, argume
nts, true); | 101 internalAddMessage(AssertMessageType, ErrorMessageLevel, scriptState, argume
nts, true); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void ConsoleBase::count(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 104 void ConsoleBase::count(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 105 { | 105 { |
| 106 InspectorInstrumentation::consoleCount(context(), scriptState, arguments); | 106 InspectorInstrumentation::consoleCount(context(), scriptState, arguments); |
| 107 } | 107 } |
| 108 | 108 |
| 109 void ConsoleBase::markTimeline(const String& title) | 109 void ConsoleBase::markTimeline(const String& title) |
| 110 { | 110 { |
| 111 InspectorInstrumentation::consoleTimeStamp(context(), title); | 111 InspectorInstrumentation::consoleTimeStamp(context(), title); |
| 112 } | 112 } |
| 113 | 113 |
| 114 void ConsoleBase::profile(ScriptState* scriptState, const String& title) | 114 void ConsoleBase::profile(ScriptState* scriptState, const String& title) |
| (...skipping 26 matching lines...) Expand all Loading... |
| 141 void ConsoleBase::timeline(ScriptState* scriptState, const String& title) | 141 void ConsoleBase::timeline(ScriptState* scriptState, const String& title) |
| 142 { | 142 { |
| 143 InspectorInstrumentation::consoleTimeline(context(), title, scriptState); | 143 InspectorInstrumentation::consoleTimeline(context(), title, scriptState); |
| 144 } | 144 } |
| 145 | 145 |
| 146 void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title) | 146 void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title) |
| 147 { | 147 { |
| 148 InspectorInstrumentation::consoleTimelineEnd(context(), title, scriptState); | 148 InspectorInstrumentation::consoleTimelineEnd(context(), title, scriptState); |
| 149 } | 149 } |
| 150 | 150 |
| 151 void ConsoleBase::group(ScriptState* scriptState, PassRefPtr<ScriptArguments> ar
guments) | 151 void ConsoleBase::group(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
rguments> arguments) |
| 152 { | 152 { |
| 153 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, StartGroupMessageType, LogMessageLevel, String(), scriptState, arguments); | 153 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, StartGroupMessageType, LogMessageLevel, String(), scriptState, arguments); |
| 154 } | 154 } |
| 155 | 155 |
| 156 void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtr<ScriptArgu
ments> arguments) | 156 void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtrWillBeRawPt
r<ScriptArguments> arguments) |
| 157 { | 157 { |
| 158 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, StartGroupCollapsedMessageType, LogMessageLevel, String(), scriptState, ar
guments); | 158 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, StartGroupCollapsedMessageType, LogMessageLevel, String(), scriptState, ar
guments); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void ConsoleBase::groupEnd() | 161 void ConsoleBase::groupEnd() |
| 162 { | 162 { |
| 163 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, EndGroupMessageType, LogMessageLevel, String(), nullptr); | 163 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, EndGroupMessageType, LogMessageLevel, String(), nullptr); |
| 164 } | 164 } |
| 165 | 165 |
| 166 void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, Scrip
tState* scriptState, PassRefPtr<ScriptArguments> scriptArguments, bool acceptNoA
rguments, bool printTrace) | 166 void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, Scrip
tState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> scriptArguments, bo
ol acceptNoArguments, bool printTrace) |
| 167 { | 167 { |
| 168 if (!context()) | 168 if (!context()) |
| 169 return; | 169 return; |
| 170 | 170 |
| 171 RefPtr<ScriptArguments> arguments = scriptArguments; | 171 RefPtrWillBeRawPtr<ScriptArguments> arguments = scriptArguments; |
| 172 if (!acceptNoArguments && !arguments->argumentCount()) | 172 if (!acceptNoArguments && !arguments->argumentCount()) |
| 173 return; | 173 return; |
| 174 | 174 |
| 175 size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture :
1; | 175 size_t stackSize = printTrace ? ScriptCallStack::maxCallStackSizeToCapture :
1; |
| 176 RefPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(scriptStat
e, stackSize)); | 176 RefPtrWillBeRawPtr<ScriptCallStack> callStack(createScriptCallStackForConsol
e(scriptState, stackSize)); |
| 177 | 177 |
| 178 String message; | 178 String message; |
| 179 bool gotStringMessage = arguments->getFirstArgumentAsString(message); | 179 bool gotStringMessage = arguments->getFirstArgumentAsString(message); |
| 180 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, type, level, message, scriptState, arguments); | 180 InspectorInstrumentation::addMessageToConsole(context(), ConsoleAPIMessageSo
urce, type, level, message, scriptState, arguments); |
| 181 if (gotStringMessage) | 181 if (gotStringMessage) |
| 182 reportMessageToClient(level, message, callStack); | 182 reportMessageToClient(level, message, callStack); |
| 183 } | 183 } |
| 184 | 184 |
| 185 } // namespace WebCore | 185 } // namespace WebCore |
| OLD | NEW |