Changeset 246798 in webkit for trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp

Timestamp:

Jun 25, 2019, 11:36:29 AM (6 years ago)

Author:

Joseph Pecoraro

Message:

Web Inspector: Implement console.timeLog
​https://bugs.webkit.org/show_bug.cgi?id=199184

Reviewed by Devin Rousso.

Source/JavaScriptCore:

• inspector/JSGlobalObjectConsoleClient.cpp:

(Inspector::JSGlobalObjectConsoleClient::timeLog):

• inspector/JSGlobalObjectConsoleClient.h:
• inspector/agents/InspectorConsoleAgent.cpp:

(Inspector::InspectorConsoleAgent::logTiming):
(Inspector::InspectorConsoleAgent::stopTiming):

• inspector/agents/InspectorConsoleAgent.h:
• runtime/ConsoleClient.h:
• runtime/ConsoleObject.cpp:

(JSC::ConsoleObject::finishCreation):
(JSC::consoleProtoFuncTimeLog):

Source/WebCore:

Updated existing tests.

• inspector/InspectorInstrumentation.cpp:

(WebCore::InspectorInstrumentation::logConsoleTimingImpl):

• inspector/InspectorInstrumentation.h:

(WebCore::InspectorInstrumentation::logConsoleTiming):

• page/PageConsoleClient.cpp:

(WebCore::PageConsoleClient::timeLog):

• page/PageConsoleClient.h:
• workers/WorkerConsoleClient.cpp:

(WebCore::WorkerConsoleClient::timeLog):

• workers/WorkerConsoleClient.h:
• worklets/WorkletConsoleClient.cpp:

(WebCore::WorkletConsoleClient::timeLog):

• worklets/WorkletConsoleClient.h:

Source/WebInspectorUI:

• UserInterface/Views/ConsoleMessageView.js:

(WI.ConsoleMessageView.prototype._appendMessageTextAndArguments):
Time messages (like timeLog) do not include their messageText
in their parameters list. So to behave more like normal logs
build a parameter list that includes it at the front.

LayoutTests:

• inspector/console/console-time-expected.txt:
• inspector/console/console-time.html:

Add new timeLog tests.

• js/console-expected.txt:

New timeLog method.

• platform/gtk/TestExpectations:
• platform/mac/TestExpectations:

Unskip test.

File:

• trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/runtime/ConsoleObject.cpp

@@ -53 +53 @@
 static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTakeHeapSnapshot(ExecState*);
 static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTime(ExecState*);
+static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeLog(ExecState*);
 static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeEnd(ExecState*);
 static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeStamp(ExecState*);
@@ -93 +94 @@
     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("profileEnd", consoleProtoFuncProfileEnd, static_cast<unsigned>(PropertyAttribute::None), 0);
     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("time", consoleProtoFuncTime, static_cast<unsigned>(PropertyAttribute::None), 0);
+    JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("timeLog", consoleProtoFuncTimeLog, static_cast<unsigned>(PropertyAttribute::None), 0);
     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("timeEnd", consoleProtoFuncTimeEnd, static_cast<unsigned>(PropertyAttribute::None), 0);
     JSC_NATIVE_FUNCTION_WITHOUT_TRANSITION("timeStamp", consoleProtoFuncTimeStamp, static_cast<unsigned>(PropertyAttribute::None), 0);
@@ -314 +316 @@
 }
 
-static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeEnd(ExecState* exec)
+static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeLog(ExecState* exec)
 {
     VM& vm = exec->vm();
@@ -330 +332 @@
     }
 
+    client->timeLog(exec, title, Inspector::createScriptArguments(exec, 1));
+    return JSValue::encode(jsUndefined());
+}
+
+static EncodedJSValue JSC_HOST_CALL consoleProtoFuncTimeEnd(ExecState* exec)
+{
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+    ConsoleClient* client = exec->lexicalGlobalObject()->consoleClient();
+    if (!client)
+        return JSValue::encode(jsUndefined());
+
+    String title;
+    if (exec->argumentCount() < 1)
+        title =  "default"_s;
+    else {
+        title = valueOrDefaultLabelString(exec, exec->argument(0));
+        RETURN_IF_EXCEPTION(scope, encodedJSValue());
+    }
+
     client->timeEnd(exec, title);
     return JSValue::encode(jsUndefined());