| Index: third_party/WebKit/Source/core/frame/ConsoleBase.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/ConsoleBase.cpp b/third_party/WebKit/Source/core/frame/ConsoleBase.cpp
|
| index 72372acb79188d8a958cac28e866d839538dc292..d41e61ff273033c3ce2cfc77cf4ec7e6fa2d28b5 100644
|
| --- a/third_party/WebKit/Source/core/frame/ConsoleBase.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/ConsoleBase.cpp
|
| @@ -43,57 +43,57 @@ ConsoleBase::~ConsoleBase()
|
| {
|
| }
|
|
|
| -void ConsoleBase::debug(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::debug(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(LogMessageType, DebugMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::error(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::error(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(LogMessageType, ErrorMessageLevel, scriptState, arguments, false);
|
| }
|
|
|
| -void ConsoleBase::info(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::info(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(LogMessageType, InfoMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::log(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::log(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(LogMessageType, LogMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::warn(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::warn(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(LogMessageType, WarningMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::dir(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::dir(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(DirMessageType, LogMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::dirxml(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::dirxml(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(DirXMLMessageType, LogMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::table(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::table(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(TableMessageType, LogMessageLevel, scriptState, arguments);
|
| }
|
|
|
| -void ConsoleBase::clear(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::clear(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(ClearMessageType, LogMessageLevel, scriptState, arguments, true);
|
| }
|
|
|
| -void ConsoleBase::trace(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::trace(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(TraceMessageType, LogMessageLevel, scriptState, arguments, true);
|
| }
|
|
|
| -void ConsoleBase::assertCondition(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments, bool condition)
|
| +void ConsoleBase::assertCondition(ScriptState* scriptState, RawPtr<ScriptArguments> arguments, bool condition)
|
| {
|
| if (condition)
|
| return;
|
| @@ -101,7 +101,7 @@ void ConsoleBase::assertCondition(ScriptState* scriptState, PassRefPtrWillBeRawP
|
| internalAddMessage(AssertMessageType, ErrorMessageLevel, scriptState, arguments, true);
|
| }
|
|
|
| -void ConsoleBase::count(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::count(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| RefPtr<ScriptCallStack> callStack(ScriptCallStack::capture(1));
|
| // Follow Firebug's behavior of counting with null and undefined title in
|
| @@ -114,7 +114,7 @@ void ConsoleBase::count(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptA
|
| HashCountedSet<String>::AddResult result = m_counts.add(identifier);
|
| String message = title + ": " + String::number(result.storedValue->value);
|
|
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
|
| consoleMessage->setType(CountMessageType);
|
| consoleMessage->setScriptState(scriptState);
|
| consoleMessage->setCallStack(callStack.release());
|
| @@ -165,7 +165,7 @@ void ConsoleBase::timeEnd(ScriptState* scriptState, const String& title)
|
| double elapsed = monotonicallyIncreasingTime() - startTime;
|
| String message = title + String::format(": %.3fms", elapsed * 1000);
|
|
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, DebugMessageLevel, message);
|
| consoleMessage->setType(TimeEndMessageType);
|
| consoleMessage->setScriptState(scriptState);
|
| consoleMessage->setCallStack(ScriptCallStack::capture(1));
|
| @@ -192,12 +192,12 @@ void ConsoleBase::timelineEnd(ScriptState* scriptState, const String& title)
|
| TRACE_EVENT_COPY_ASYNC_END0("blink.console", formatTimelineTitle(title).utf8().data(), this);
|
| }
|
|
|
| -void ConsoleBase::group(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::group(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(StartGroupMessageType, LogMessageLevel, scriptState, arguments, true);
|
| }
|
|
|
| -void ConsoleBase::groupCollapsed(ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> arguments)
|
| +void ConsoleBase::groupCollapsed(ScriptState* scriptState, RawPtr<ScriptArguments> arguments)
|
| {
|
| internalAddMessage(StartGroupCollapsedMessageType, LogMessageLevel, scriptState, arguments, true);
|
| }
|
| @@ -207,9 +207,9 @@ void ConsoleBase::groupEnd()
|
| internalAddMessage(EndGroupMessageType, LogMessageLevel, nullptr, nullptr, true);
|
| }
|
|
|
| -void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, ScriptState* scriptState, PassRefPtrWillBeRawPtr<ScriptArguments> scriptArguments, bool acceptNoArguments)
|
| +void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, ScriptState* scriptState, RawPtr<ScriptArguments> scriptArguments, bool acceptNoArguments)
|
| {
|
| - RefPtrWillBeRawPtr<ScriptArguments> arguments = scriptArguments;
|
| + RawPtr<ScriptArguments> arguments = scriptArguments;
|
| if (!acceptNoArguments && (!arguments || !arguments->argumentCount()))
|
| return;
|
|
|
| @@ -219,7 +219,7 @@ void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, Scrip
|
| if (arguments)
|
| arguments->getFirstArgumentAsString(message);
|
|
|
| - RefPtrWillBeRawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, level, message);
|
| + RawPtr<ConsoleMessage> consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, level, message);
|
| consoleMessage->setType(type);
|
| consoleMessage->setScriptState(scriptState);
|
| consoleMessage->setScriptArguments(arguments);
|
|
|