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 9e47e836b6a5d5611765192df648ad14be925de5..bd6c1171364033c77d172a8d7f392f6513ddfb7c 100644 |
--- a/third_party/WebKit/Source/core/frame/ConsoleBase.cpp |
+++ b/third_party/WebKit/Source/core/frame/ConsoleBase.cpp |
@@ -30,10 +30,9 @@ |
#include "bindings/core/v8/ScriptCallStack.h" |
#include "core/inspector/ConsoleMessage.h" |
-#include "core/inspector/InspectorConsoleInstrumentation.h" |
-#include "core/inspector/InspectorTraceEvents.h" |
#include "core/inspector/ScriptArguments.h" |
#include "platform/TraceEvent.h" |
+#include "wtf/CurrentTime.h" |
#include "wtf/text/CString.h" |
#include "wtf/text/WTFString.h" |
@@ -43,64 +42,6 @@ ConsoleBase::~ConsoleBase() |
{ |
} |
-void ConsoleBase::debug(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(LogMessageType, DebugMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::error(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(LogMessageType, ErrorMessageLevel, scriptState, arguments, false); |
-} |
- |
-void ConsoleBase::info(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(LogMessageType, InfoMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::log(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(LogMessageType, LogMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::warn(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(LogMessageType, WarningMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::dir(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(DirMessageType, LogMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::dirxml(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(DirXMLMessageType, LogMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::table(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(TableMessageType, LogMessageLevel, scriptState, arguments); |
-} |
- |
-void ConsoleBase::clear(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(ClearMessageType, LogMessageLevel, scriptState, arguments, true); |
-} |
- |
-void ConsoleBase::trace(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(TraceMessageType, LogMessageLevel, scriptState, arguments, true); |
-} |
- |
-void ConsoleBase::assertCondition(ScriptState* scriptState, ScriptArguments* arguments, bool condition) |
-{ |
- if (condition) |
- return; |
- |
- internalAddMessage(AssertMessageType, ErrorMessageLevel, scriptState, arguments, true); |
-} |
- |
void ConsoleBase::count(ScriptState* scriptState, ScriptArguments* arguments) |
{ |
RefPtr<ScriptCallStack> callStack(ScriptCallStack::capture(1)); |
@@ -121,21 +62,6 @@ void ConsoleBase::count(ScriptState* scriptState, ScriptArguments* arguments) |
reportMessageToConsole(consoleMessage); |
} |
-void ConsoleBase::markTimeline(const String& title) |
-{ |
- timeStamp(title); |
-} |
- |
-void ConsoleBase::profile(const String& title) |
-{ |
- InspectorInstrumentation::consoleProfile(context(), title); |
-} |
- |
-void ConsoleBase::profileEnd(const String& title) |
-{ |
- InspectorInstrumentation::consoleProfileEnd(context(), title); |
-} |
- |
void ConsoleBase::time(const String& title) |
{ |
TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", title.utf8().data(), this); |
@@ -172,59 +98,4 @@ void ConsoleBase::timeEnd(ScriptState* scriptState, const String& title) |
reportMessageToConsole(consoleMessage); |
} |
-void ConsoleBase::timeStamp(const String& title) |
-{ |
- TRACE_EVENT_INSTANT1("devtools.timeline", "TimeStamp", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTimeStampEvent::data(context(), title)); |
-} |
- |
-static String formatTimelineTitle(const String& title) |
-{ |
- return String::format("Timeline '%s'", title.utf8().data()); |
-} |
- |
-void ConsoleBase::timeline(ScriptState* scriptState, const String& title) |
-{ |
- TRACE_EVENT_COPY_ASYNC_BEGIN0("blink.console", formatTimelineTitle(title).utf8().data(), this); |
-} |
- |
-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, ScriptArguments* arguments) |
-{ |
- internalAddMessage(StartGroupMessageType, LogMessageLevel, scriptState, arguments, true); |
-} |
- |
-void ConsoleBase::groupCollapsed(ScriptState* scriptState, ScriptArguments* arguments) |
-{ |
- internalAddMessage(StartGroupCollapsedMessageType, LogMessageLevel, scriptState, arguments, true); |
-} |
- |
-void ConsoleBase::groupEnd() |
-{ |
- internalAddMessage(EndGroupMessageType, LogMessageLevel, nullptr, nullptr, true); |
-} |
- |
-void ConsoleBase::internalAddMessage(MessageType type, MessageLevel level, ScriptState* scriptState, ScriptArguments* scriptArguments, bool acceptNoArguments) |
-{ |
- ScriptArguments* arguments = scriptArguments; |
- if (!acceptNoArguments && (!arguments || !arguments->argumentCount())) |
- return; |
- |
- if (scriptState && !scriptState->contextIsValid()) |
- arguments = nullptr; |
- String message; |
- if (arguments) |
- arguments->getFirstArgumentAsString(message); |
- |
- ConsoleMessage* consoleMessage = ConsoleMessage::create(ConsoleAPIMessageSource, level, message); |
- consoleMessage->setType(type); |
- consoleMessage->setScriptState(scriptState); |
- consoleMessage->setScriptArguments(arguments); |
- consoleMessage->setCallStack(ScriptCallStack::captureForConsole()); |
- reportMessageToConsole(consoleMessage); |
-} |
- |
} // namespace blink |