Reduce ConsoleMessage API surface.

third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
index b2273600e75863031e5ab4d2ca7c9371b78e568c..33fde210dc2b34cb6086764971ecac24eb76ffd9 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorConsoleAgent.cpp
@@ -64,8 +64,8 @@ void InspectorConsoleAgent::enable(ErrorString*)
     ConsoleMessageStorage* storage = messageStorage();
     if (storage->expiredCount()) {
         ConsoleMessage* expiredMessage = ConsoleMessage::create(OtherMessageSource, WarningMessageLevel, String::format("%d console messages are not shown.", storage->expiredCount()));
-        expiredMessage->setTimestamp(0);
-        sendConsoleMessageToFrontend(expiredMessage, false);
+        double timestamp = 0;
+        sendConsoleMessageToFrontend(expiredMessage, false, &timestamp);
     }
 
     size_t messageCount = storage->size();
@@ -154,13 +154,13 @@ static String messageLevelValue(MessageLevel level)
     return protocol::Console::ConsoleMessage::LevelEnum::Log;
 }
 
-void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* consoleMessage, bool generatePreview)
+void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* consoleMessage, bool generatePreview, double* timestamp)
 {
     OwnPtr<protocol::Console::ConsoleMessage> jsonObj = protocol::Console::ConsoleMessage::create()
         .setSource(messageSourceValue(consoleMessage->source()))
         .setLevel(messageLevelValue(consoleMessage->level()))
         .setText(consoleMessage->message())
-        .setTimestamp(consoleMessage->timestamp()).build();
+        .setTimestamp(timestamp ? *timestamp : consoleMessage->timestamp()).build();
     // FIXME: only send out type for ConsoleAPI source messages.
     jsonObj->setType(messageTypeValue(consoleMessage->type()));
     jsonObj->setLine(static_cast<int>(consoleMessage->lineNumber()));
@@ -168,12 +168,11 @@ void InspectorConsoleAgent::sendConsoleMessageToFrontend(ConsoleMessage* console
     if (consoleMessage->scriptId())
         jsonObj->setScriptId(String::number(consoleMessage->scriptId()));
     jsonObj->setUrl(consoleMessage->url());
-    ScriptState* scriptState = consoleMessage->getScriptState();
-    if (scriptState)
-        jsonObj->setExecutionContextId(scriptState->contextIdInDebugger());
     if (consoleMessage->source() == NetworkMessageSource && consoleMessage->requestIdentifier())
         jsonObj->setNetworkRequestId(IdentifiersFactory::requestId(consoleMessage->requestIdentifier()));
     ScriptArguments* arguments = consoleMessage->scriptArguments();
+    if (arguments && arguments->getScriptState())
+        jsonObj->setExecutionContextId(arguments->getScriptState()->contextIdInDebugger());
     if (arguments && arguments->argumentCount()) {
         ScriptState::Scope scope(arguments->getScriptState());
         v8::Local<v8::Context> context = arguments->getScriptState()->context();