Web Inspector: Rename console.markTimeline() to console.timeStamp() for Firebug compa...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2011 10:06:31 +0000 (10:06 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2011 10:06:31 +0000 (10:06 +0000)
https://bugs.webkit.org/show_bug.cgi?id=63317

Patch by Mike West <mkwst@chromium.org> on 2011-07-15
Reviewed by Pavel Feldman.

Source/WebCore:

Test: inspector/timeline/timeline-time-stamp.html

* inspector/InspectorConsoleInstrumentation.h:
(WebCore::InspectorInstrumentation::consoleTimeStamp):
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::consoleTimeStampImpl):
* inspector/InspectorInstrumentation.h:
* inspector/InspectorTimelineAgent.cpp:
(WebCore::InspectorTimelineAgent::didTimeStamp):
* inspector/InspectorTimelineAgent.h:
* inspector/TimelineRecordFactory.cpp:
(WebCore::TimelineRecordFactory::createTimeStampData):
* inspector/TimelineRecordFactory.h:
* inspector/front-end/TimelineAgent.js:
* inspector/front-end/TimelineOverviewPane.js:
(WebInspector.TimelineOverviewPane.prototype.update.markPercentagesForRecord):
(WebInspector.TimelineOverviewPane.prototype.update):
* inspector/front-end/TimelinePanel.js:
(WebInspector.TimelinePanel):
(WebInspector.TimelinePanel.prototype.get _recordStyles):
(WebInspector.TimelinePanel.prototype._updateEventDividers):
(WebInspector.TimelinePanel.prototype._createEventDivider):
(WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
(WebInspector.TimelinePanel.prototype._clearPanel):
(WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
* page/Console.cpp:
(WebCore::Console::markTimeline):
(WebCore::Console::timeStamp):
* page/Console.h:
* page/Console.idl:

LayoutTests:

* inspector/timeline/resources/timeline-iframe-data.html:
* inspector/timeline/timeline-enum-stability-expected.txt:
* inspector/timeline/timeline-event-dispatch.html:
* inspector/timeline/timeline-mark-timeline-expected.txt:
* inspector/timeline/timeline-mark-timeline.html:
* inspector/timeline/timeline-script-tag-1-expected.txt:
* inspector/timeline/timeline-test.js:
(initialize_Timeline.InspectorTest.dumpTimelineRecord):
* inspector/timeline/timeline-time-stamp-expected.txt: Added.
* inspector/timeline/timeline-time-stamp.html: Copied from LayoutTests/inspector/timeline/timeline-mark-timeline.html.
* platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt:
* platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt: Copied from LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@91061 268f45cc-cd09-0410-ab3c-d52691b4dbfc

26 files changed:
LayoutTests/ChangeLog
LayoutTests/inspector/timeline/resources/timeline-iframe-data.html
LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt
LayoutTests/inspector/timeline/timeline-event-dispatch.html
LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt
LayoutTests/inspector/timeline/timeline-mark-timeline.html
LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt
LayoutTests/inspector/timeline/timeline-test.js
LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt [new file with mode: 0644]
LayoutTests/inspector/timeline/timeline-time-stamp.html [new file with mode: 0644]
LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt
LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt [new file with mode: 0644]
Source/WebCore/ChangeLog
Source/WebCore/inspector/InspectorConsoleInstrumentation.h
Source/WebCore/inspector/InspectorInstrumentation.cpp
Source/WebCore/inspector/InspectorInstrumentation.h
Source/WebCore/inspector/InspectorTimelineAgent.cpp
Source/WebCore/inspector/InspectorTimelineAgent.h
Source/WebCore/inspector/TimelineRecordFactory.cpp
Source/WebCore/inspector/TimelineRecordFactory.h
Source/WebCore/inspector/front-end/TimelineAgent.js
Source/WebCore/inspector/front-end/TimelineOverviewPane.js
Source/WebCore/inspector/front-end/TimelinePanel.js
Source/WebCore/page/Console.cpp
Source/WebCore/page/Console.h
Source/WebCore/page/Console.idl

index 849b1c4..f0cd591 100644 (file)
@@ -1,3 +1,23 @@
+2011-07-15  Mike West  <mkwst@chromium.org>
+
+        Web Inspector: Rename console.markTimeline() to console.timeStamp() for Firebug compatibility.
+        https://bugs.webkit.org/show_bug.cgi?id=63317
+
+        Reviewed by Pavel Feldman.
+
+        * inspector/timeline/resources/timeline-iframe-data.html:
+        * inspector/timeline/timeline-enum-stability-expected.txt:
+        * inspector/timeline/timeline-event-dispatch.html:
+        * inspector/timeline/timeline-mark-timeline-expected.txt:
+        * inspector/timeline/timeline-mark-timeline.html:
+        * inspector/timeline/timeline-script-tag-1-expected.txt:
+        * inspector/timeline/timeline-test.js:
+        (initialize_Timeline.InspectorTest.dumpTimelineRecord):
+        * inspector/timeline/timeline-time-stamp-expected.txt: Added.
+        * inspector/timeline/timeline-time-stamp.html: Copied from LayoutTests/inspector/timeline/timeline-mark-timeline.html.
+        * platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt:
+        * platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt: Copied from LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt.
+
 2011-07-15  Kentaro Hara  <haraken@google.com>
 
         Clear the content of a search input form when 'Escape' is pressed.
index 3595680..ffdaa21 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 <head>
 <script>
-console.markTimeline("SCRIPT TAG");
+console.timeStamp("SCRIPT TAG");
 
 function iframeOnload()
 {
index 3dd3aa7..9b880d2 100644 (file)
@@ -14,7 +14,7 @@ Applications outside of WebKit depend on the stability of the mapping of these t
     XHRReadyStateChange : "XHRReadyStateChange"
     XHRLoad : "XHRLoad"
     EvaluateScript : "EvaluateScript"
-    MarkTimeline : "MarkTimeline"
+    TimeStamp : "TimeStamp"
     MarkLoad : "MarkLoad"
     MarkDOMContent : "MarkDOMContent"
     ScheduleResourceRequest : "ScheduleResourceRequest"
index 7633d0f..9265f36 100644 (file)
@@ -6,7 +6,7 @@
 
 function handleMouseDown(event) 
 {
-    console.markTimeline("Handling mousedown");
+    console.timeStamp("Handling mousedown");
 }
 
 function performActions()
index c93bf36..0bb4449 100644 (file)
@@ -1,12 +1,12 @@
 Tests the Timeline API mark feature
 
-MarkTimeline Properties:
+TimeStamp Properties:
 {
     startTime : <number>
     data : {
         message : "MARK TIMELINE"
     }
-    type : "MarkTimeline"
+    type : "TimeStamp"
     usedHeapSize : <number>
     totalHeapSize : <number>
 }
index f0f4068..c0d487e 100644 (file)
@@ -11,7 +11,7 @@ function performActions()
 
 function test()
 {
-    InspectorTest.performActionsAndPrint("performActions()", "MarkTimeline");
+    InspectorTest.performActionsAndPrint("performActions()", "TimeStamp");
 }
 
 </script>
index d8fed35..ad9b864 100644 (file)
@@ -5,7 +5,7 @@ Tests the Timeline API instrumentation of an HTML script tag.
 ParseHTML
 ParseHTML
 ----> EvaluateScript
---------> MarkTimeline : SCRIPT TAG
+--------> TimeStamp : SCRIPT TAG
 EvaluateScript Properties:
 {
     startTime : <number>
index ca1b0cc..ce6a9c3 100644 (file)
@@ -83,7 +83,7 @@ InspectorTest.dumpTimelineRecord = function(record, level)
         prefix = "----" + prefix;
     if (level > 0)
         prefix = prefix + "> ";
-    if (record.type === WebInspector.TimelineAgent.RecordType.MarkTimeline) {
+    if (record.type === WebInspector.TimelineAgent.RecordType.TimeStamp) {
         suffix = " : " + record.data.message;
     }
     InspectorTest.addResult(prefix + InspectorTest._timelineAgentTypeToString(record.type) + suffix);
diff --git a/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt b/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt
new file mode 100644 (file)
index 0000000..6f0846a
--- /dev/null
@@ -0,0 +1,13 @@
+Tests the Timeline API timeStamp feature
+
+TimeStamp Properties:
+{
+    startTime : <number>
+    data : {
+        message : "TIME STAMP"
+    }
+    type : "TimeStamp"
+    usedHeapSize : <number>
+    totalHeapSize : <number>
+}
+
diff --git a/LayoutTests/inspector/timeline/timeline-time-stamp.html b/LayoutTests/inspector/timeline/timeline-time-stamp.html
new file mode 100644 (file)
index 0000000..5722619
--- /dev/null
@@ -0,0 +1,26 @@
+<html>
+<head>
+<script src="../../http/tests/inspector/inspector-test.js"></script>
+<script src="timeline-test.js"></script>
+<script>
+
+function performActions()
+{
+    console.timeStamp("TIME STAMP");
+}
+
+function test()
+{
+    InspectorTest.performActionsAndPrint("performActions()", "TimeStamp");
+}
+
+</script>
+</head>
+
+<body onload="runTest()">
+<p>
+Tests the Timeline API timeStamp feature
+</p>
+
+</body>
+</html>
index 771bcc9..0db5a97 100644 (file)
@@ -1,13 +1,13 @@
 Tests the Timeline API mark feature
 
-MarkTimeline Properties:
+TimeStamp Properties:
 {
     startTime : <number>
     stackTrace : <object>
     data : {
         message : "MARK TIMELINE"
     }
-    type : "MarkTimeline"
+    type : "TimeStamp"
     usedHeapSize : <number>
     totalHeapSize : <number>
 }
diff --git a/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt b/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt
new file mode 100644 (file)
index 0000000..2afcd4e
--- /dev/null
@@ -0,0 +1,14 @@
+Tests the Timeline API timeStamp feature
+
+TimeStamp Properties:
+{
+    startTime : <number>
+    stackTrace : <object>
+    data : {
+        message : "TIME STAMP"
+    }
+    type : "TimeStamp"
+    usedHeapSize : <number>
+    totalHeapSize : <number>
+}
+
index abb9e84..8f7bea3 100644 (file)
@@ -1,3 +1,41 @@
+2011-07-15  Mike West  <mkwst@chromium.org>
+
+        Web Inspector: Rename console.markTimeline() to console.timeStamp() for Firebug compatibility.
+        https://bugs.webkit.org/show_bug.cgi?id=63317
+
+        Reviewed by Pavel Feldman.
+
+        Test: inspector/timeline/timeline-time-stamp.html
+
+        * inspector/InspectorConsoleInstrumentation.h:
+        (WebCore::InspectorInstrumentation::consoleTimeStamp):
+        * inspector/InspectorInstrumentation.cpp:
+        (WebCore::InspectorInstrumentation::consoleTimeStampImpl):
+        * inspector/InspectorInstrumentation.h:
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::didTimeStamp):
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/TimelineRecordFactory.cpp:
+        (WebCore::TimelineRecordFactory::createTimeStampData):
+        * inspector/TimelineRecordFactory.h:
+        * inspector/front-end/TimelineAgent.js:
+        * inspector/front-end/TimelineOverviewPane.js:
+        (WebInspector.TimelineOverviewPane.prototype.update.markPercentagesForRecord):
+        (WebInspector.TimelineOverviewPane.prototype.update):
+        * inspector/front-end/TimelinePanel.js:
+        (WebInspector.TimelinePanel):
+        (WebInspector.TimelinePanel.prototype.get _recordStyles):
+        (WebInspector.TimelinePanel.prototype._updateEventDividers):
+        (WebInspector.TimelinePanel.prototype._createEventDivider):
+        (WebInspector.TimelinePanel.prototype._innerAddRecordToTimeline):
+        (WebInspector.TimelinePanel.prototype._clearPanel):
+        (WebInspector.TimelinePanel.FormattedRecord.prototype._getRecordDetails):
+        * page/Console.cpp:
+        (WebCore::Console::markTimeline):
+        (WebCore::Console::timeStamp):
+        * page/Console.h:
+        * page/Console.idl:
+
 2011-07-15  Jonathan Dong  <jonathan.dong@torchmobile.com.cn>
 
         LocalStorage: Changed the value type of ItemTable from TEXT to BLOB
index d45e9e4..de4317d 100644 (file)
@@ -78,12 +78,12 @@ inline void InspectorInstrumentation::stopConsoleTiming(Page* page, const String
 #endif
 }
 
-inline void InspectorInstrumentation::consoleMarkTimeline(Page* page, PassRefPtr<ScriptArguments> arguments)
+inline void InspectorInstrumentation::consoleTimeStamp(Page* page, PassRefPtr<ScriptArguments> arguments)
 {
 #if ENABLE(INSPECTOR)
     FAST_RETURN_IF_NO_FRONTENDS(void());
     if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForPage(page))
-        consoleMarkTimelineImpl(instrumentingAgents, arguments);
+        consoleTimeStampImpl(instrumentingAgents, arguments);
 #endif
 }
 
index 6264c41..baea82a 100644 (file)
@@ -692,12 +692,12 @@ void InspectorInstrumentation::stopConsoleTimingImpl(InstrumentingAgents* instru
         consoleAgent->stopTiming(title, stack);
 }
 
-void InspectorInstrumentation::consoleMarkTimelineImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<ScriptArguments> arguments)
+void InspectorInstrumentation::consoleTimeStampImpl(InstrumentingAgents* instrumentingAgents, PassRefPtr<ScriptArguments> arguments)
 {
     if (InspectorTimelineAgent* timelineAgent = instrumentingAgents->inspectorTimelineAgent()) {
         String message;
         arguments->getFirstArgumentAsString(message);
-        timelineAgent->didMarkTimeline(message);
+        timelineAgent->didTimeStamp(message);
      }
 }
 
index 5e606cc..2360312 100644 (file)
@@ -148,7 +148,7 @@ public:
     static void consoleCount(Page*, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
     static void startConsoleTiming(Page*, const String& title);
     static void stopConsoleTiming(Page*, const String& title, PassRefPtr<ScriptCallStack>);
-    static void consoleMarkTimeline(Page*, PassRefPtr<ScriptArguments>);
+    static void consoleTimeStamp(Page*, PassRefPtr<ScriptArguments>);
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     static void addStartProfilingMessageToConsole(Page*, const String& title, unsigned lineNumber, const String& sourceURL);
@@ -276,7 +276,7 @@ private:
     static void consoleCountImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
     static void startConsoleTimingImpl(InstrumentingAgents*, const String& title);
     static void stopConsoleTimingImpl(InstrumentingAgents*, const String& title, PassRefPtr<ScriptCallStack>);
-    static void consoleMarkTimelineImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>);
+    static void consoleTimeStampImpl(InstrumentingAgents*, PassRefPtr<ScriptArguments>);
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
     static void addStartProfilingMessageToConsoleImpl(InstrumentingAgents*, const String& title, unsigned lineNumber, const String& sourceURL);
index 2faad67..a81d454 100644 (file)
@@ -65,7 +65,8 @@ static const char EvaluateScript[] = "EvaluateScript";
 
 static const char MarkLoad[] = "MarkLoad";
 static const char MarkDOMContent[] = "MarkDOMContent";
-static const char MarkTimeline[] = "MarkTimeline";
+
+static const char TimeStamp[] = "TimeStamp";
 
 static const char ScheduleResourceRequest[] = "ScheduleResourceRequest";
 static const char ResourceSendRequest[] = "ResourceSendRequest";
@@ -326,12 +327,12 @@ void InspectorTimelineAgent::didFinishLoadingResource(unsigned long identifier,
     m_frontend->eventRecorded(record.release());
 }
 
-void InspectorTimelineAgent::didMarkTimeline(const String& message)
+void InspectorTimelineAgent::didTimeStamp(const String& message)
 {
     pushGCEventRecords();
     RefPtr<InspectorObject> record = TimelineRecordFactory::createGenericRecord(WTF::currentTimeMS());
-    record->setObject("data", TimelineRecordFactory::createMarkTimelineData(message));
-    addRecordToTimeline(record.release(), TimelineRecordType::MarkTimeline);
+    record->setObject("data", TimelineRecordFactory::createTimeStampData(message));
+    addRecordToTimeline(record.release(), TimelineRecordType::TimeStamp);
 }
 
 void InspectorTimelineAgent::didMarkDOMContentEvent()
index 3d8e973..816dce9 100644 (file)
@@ -107,7 +107,7 @@ public:
     void willEvaluateScript(const String&, int);
     void didEvaluateScript();
 
-    void didMarkTimeline(const String&);
+    void didTimeStamp(const String&);
     void didMarkDOMContentEvent();
     void didMarkLoadEvent();
 
index ff47ed4..f5e9dc1 100644 (file)
@@ -115,7 +115,7 @@ PassRefPtr<InspectorObject> TimelineRecordFactory::createEvaluateScriptData(cons
     return data.release();
 }
 
-PassRefPtr<InspectorObject> TimelineRecordFactory::createMarkTimelineData(const String& message)
+PassRefPtr<InspectorObject> TimelineRecordFactory::createTimeStampData(const String& message)
 {
     RefPtr<InspectorObject> data = InspectorObject::create();
     data->setString("message", message);
index fafeae6..258ef64 100644 (file)
@@ -62,7 +62,7 @@ namespace WebCore {
 
         static PassRefPtr<InspectorObject> createEvaluateScriptData(const String&, double lineNumber);
 
-        static PassRefPtr<InspectorObject> createMarkTimelineData(const String&);
+        static PassRefPtr<InspectorObject> createTimeStampData(const String&);
 
         static PassRefPtr<InspectorObject> createResourceSendRequestData(unsigned long identifier, const ResourceRequest&);
 
index 5c5ca41..728660a 100644 (file)
@@ -32,7 +32,7 @@ WebInspector.TimelineAgent = function() {
     // Not implemented.
 }
 
-// Must be kept in sync with TimelineItem.h
+// Must be kept in sync with InspectorTimelineAgent.h
 WebInspector.TimelineAgent.RecordType = {
     EventDispatch: "EventDispatch",
     Layout: "Layout",
@@ -40,6 +40,7 @@ WebInspector.TimelineAgent.RecordType = {
     Paint: "Paint",
     ParseHTML: "ParseHTML",
 
+
     TimerInstall: "TimerInstall",
     TimerRemove: "TimerRemove",
     TimerFire: "TimerFire",
@@ -48,7 +49,8 @@ WebInspector.TimelineAgent.RecordType = {
     XHRLoad: "XHRLoad",
     EvaluateScript: "EvaluateScript",
 
-    MarkTimeline: "MarkTimeline",
+    TimeStamp: "TimeStamp",
+
     MarkLoad: "MarkLoad",
     MarkDOMContent: "MarkDOMContent",
 
index 0a33cb4..800d388 100644 (file)
@@ -140,7 +140,7 @@ WebInspector.TimelineOverviewPane.prototype = {
         this._overviewCalculator.reset();
         this._forAllRecords(records, this._overviewCalculator.updateBoundaries.bind(this._overviewCalculator));
 
-        function markTimeline(record)
+        function markPercentagesForRecord(record)
         {
             if (!(this._showShortEvents || record.isLong()))
                 return;
@@ -151,7 +151,7 @@ WebInspector.TimelineOverviewPane.prototype = {
             for (var j = Math.round(percentages.start); j <= end; ++j)
                 timelines[categoryName][j] = true;
         }
-        this._forAllRecords(records, markTimeline.bind(this));
+        this._forAllRecords(records, markPercentagesForRecord.bind(this));
 
         // Convert sparse arrays to continuous segments, render graphs for each.
         for (var category in this._categories) {
index 66e6c8b..90ba41f 100644 (file)
@@ -97,7 +97,7 @@ WebInspector.TimelinePanel = function()
     // Disable short events filter by default.
     this.toggleFilterButton.toggled = true;
     this._calculator._showShortEvents = this.toggleFilterButton.toggled;
-    this._markTimelineRecords = [];
+    this._timeStampRecords = [];
     this._expandOffset = 15;
 
     WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.EventTypes.TimelineEventRecorded, this._onTimelineEventRecorded, this);
@@ -184,7 +184,7 @@ WebInspector.TimelinePanel.prototype = {
             recordStyles[recordTypes.XHRReadyStateChange] = { title: WebInspector.UIString("XHR Ready State Change"), category: this.categories.scripting };
             recordStyles[recordTypes.XHRLoad] = { title: WebInspector.UIString("XHR Load"), category: this.categories.scripting };
             recordStyles[recordTypes.EvaluateScript] = { title: WebInspector.UIString("Evaluate Script"), category: this.categories.scripting };
-            recordStyles[recordTypes.MarkTimeline] = { title: WebInspector.UIString("Mark"), category: this.categories.scripting };
+            recordStyles[recordTypes.TimeStamp] = { title: WebInspector.UIString("Stamp"), category: this.categories.scripting };
             recordStyles[recordTypes.ResourceSendRequest] = { title: WebInspector.UIString("Send Request"), category: this.categories.loading };
             recordStyles[recordTypes.ResourceReceiveResponse] = { title: WebInspector.UIString("Receive Response"), category: this.categories.loading };
             recordStyles[recordTypes.ResourceFinish] = { title: WebInspector.UIString("Finish Loading"), category: this.categories.loading };
@@ -227,8 +227,8 @@ WebInspector.TimelinePanel.prototype = {
         this._timelineGrid.removeEventDividers();
         var clientWidth = this._graphRowsElement.offsetWidth - this._expandOffset;
         var dividers = [];
-        for (var i = 0; i < this._markTimelineRecords.length; ++i) {
-            var record = this._markTimelineRecords[i];
+        for (var i = 0; i < this._timeStampRecords.length; ++i) {
+            var record = this._timeStampRecords[i];
             var positions = this._calculator.computeBarGraphWindowPosition(record, clientWidth);
             var dividerPosition = Math.round(positions.left);
             if (dividerPosition < 0 || dividerPosition >= clientWidth || dividers[dividerPosition])
@@ -238,7 +238,7 @@ WebInspector.TimelinePanel.prototype = {
             dividers[dividerPosition] = divider;
         }
         this._timelineGrid.addEventDividers(dividers);
-        this._overviewPane.updateEventDividers(this._markTimelineRecords, this._createEventDivider.bind(this));
+        this._overviewPane.updateEventDividers(this._timeStampRecords, this._createEventDivider.bind(this));
     },
 
     _createEventDivider: function(record)
@@ -255,7 +255,7 @@ WebInspector.TimelinePanel.prototype = {
             eventDivider.className += " resources-blue-divider";
         else if (record.type === recordTypes.MarkLoad)
             eventDivider.className += " resources-red-divider";
-        else if (record.type === recordTypes.MarkTimeline) {
+        else if (record.type === recordTypes.TimeStamp) {
             eventDivider.className += " resources-orange-divider";
             eventDividerPadding.title = record.data.message;
         }
@@ -369,7 +369,7 @@ WebInspector.TimelinePanel.prototype = {
         var formattedRecord = new WebInspector.TimelinePanel.FormattedRecord(record, parentRecord, this, scriptDetails);
 
         if (record.type === recordTypes.MarkDOMContent || record.type === recordTypes.MarkLoad) {
-            this._markTimelineRecords.push(formattedRecord);
+            this._timeStampRecords.push(formattedRecord);
             return;
         }
 
@@ -398,8 +398,8 @@ WebInspector.TimelinePanel.prototype = {
                 parentRecord._selfTime -= formattedRecord.endTime - formattedRecord.startTime;
 
         // Keep bar entry for mark timeline since nesting might be interesting to the user.
-        if (record.type === recordTypes.MarkTimeline)
-            this._markTimelineRecords.push(formattedRecord);
+        if (record.type === recordTypes.TimeStamp)
+            this._timeStampRecords.push(formattedRecord);
     },
 
     setSidebarWidth: function(width)
@@ -434,7 +434,7 @@ WebInspector.TimelinePanel.prototype = {
 
     _clearPanel: function()
     {
-        this._markTimelineRecords = [];
+        this._timeStampRecords = [];
         this._sendRequestRecords = {};
         this._scheduledResourceRequests = {};
         this._timerRecords = {};
@@ -1036,7 +1036,7 @@ WebInspector.TimelinePanel.FormattedRecord.prototype = {
             case WebInspector.TimelineAgent.RecordType.ResourceReceiveResponse:
             case WebInspector.TimelineAgent.RecordType.ResourceFinish:
                 return WebInspector.displayNameForURL(this.url);
-            case WebInspector.TimelineAgent.RecordType.MarkTimeline:
+            case WebInspector.TimelineAgent.RecordType.TimeStamp:
                 return this.data.message;
             default:
                 return null;
index 6c9ace2..70cf474 100644 (file)
@@ -253,9 +253,9 @@ void Console::count(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCall
     InspectorInstrumentation::consoleCount(page(), arguments, callStack);
 }
 
-void Console::markTimeline(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack>)
+void Console::markTimeline(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack)
 {
-    InspectorInstrumentation::consoleMarkTimeline(page(), arguments);
+    InspectorInstrumentation::consoleTimeStamp(page(), arguments);
 }
 
 #if ENABLE(JAVASCRIPT_DEBUGGER)
@@ -309,6 +309,11 @@ void Console::timeEnd(const String& title, PassRefPtr<ScriptArguments>, PassRefP
     InspectorInstrumentation::stopConsoleTiming(page(), title, callStack);
 }
 
+void Console::timeStamp(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack>)
+{
+    InspectorInstrumentation::consoleTimeStamp(page(), arguments);
+}
+
 void Console::group(PassRefPtr<ScriptArguments> arguments, PassRefPtr<ScriptCallStack> callStack)
 {
     InspectorInstrumentation::addMessageToConsole(page(), JSMessageSource, StartGroupMessageType, LogMessageLevel, String(), arguments, callStack);
index 070eef2..782e625 100644 (file)
@@ -77,6 +77,7 @@ public:
 #endif
     void time(const String&);
     void timeEnd(const String&, PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
+    void timeStamp(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
     void group(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
     void groupCollapsed(PassRefPtr<ScriptArguments>, PassRefPtr<ScriptCallStack>);
     void groupEnd();
index 76a816e..bb88e9d 100644 (file)
@@ -54,6 +54,7 @@ module window {
 
         void time(in [ConvertUndefinedOrNullToNullString] DOMString title);
         [CustomArgumentHandling] void timeEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
+        [CustomArgumentHandling] void timeStamp();
         [CustomArgumentHandling] void group();
         [CustomArgumentHandling] void groupCollapsed();
         void groupEnd();