Diff
Modified: trunk/LayoutTests/ChangeLog (91060 => 91061)
--- trunk/LayoutTests/ChangeLog 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/ChangeLog 2011-07-15 10:06:31 UTC (rev 91061)
@@ -1,3 +1,23 @@
+2011-07-15 Mike West <[email protected]>
+
+ 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 <[email protected]>
Clear the content of a search input form when 'Escape' is pressed.
Modified: trunk/LayoutTests/inspector/timeline/resources/timeline-iframe-data.html (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/resources/timeline-iframe-data.html 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/resources/timeline-iframe-data.html 2011-07-15 10:06:31 UTC (rev 91061)
@@ -1,7 +1,7 @@
<html>
<head>
<script>
-console.markTimeline("SCRIPT TAG");
+console.timeStamp("SCRIPT TAG");
function iframeOnload()
{
Modified: trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-enum-stability-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -14,7 +14,7 @@
XHRReadyStateChange : "XHRReadyStateChange"
XHRLoad : "XHRLoad"
EvaluateScript : "EvaluateScript"
- MarkTimeline : "MarkTimeline"
+ TimeStamp : "TimeStamp"
MarkLoad : "MarkLoad"
MarkDOMContent : "MarkDOMContent"
ScheduleResourceRequest : "ScheduleResourceRequest"
Modified: trunk/LayoutTests/inspector/timeline/timeline-event-dispatch.html (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-event-dispatch.html 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-event-dispatch.html 2011-07-15 10:06:31 UTC (rev 91061)
@@ -6,7 +6,7 @@
function handleMouseDown(event)
{
- console.markTimeline("Handling mousedown");
+ console.timeStamp("Handling mousedown");
}
function performActions()
Modified: trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-mark-timeline-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -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>
}
Modified: trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html 2011-07-15 10:06:31 UTC (rev 91061)
@@ -11,7 +11,7 @@
function test()
{
- InspectorTest.performActionsAndPrint("performActions()", "MarkTimeline");
+ InspectorTest.performActionsAndPrint("performActions()", "TimeStamp");
}
</script>
Modified: trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-script-tag-1-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -5,7 +5,7 @@
ParseHTML
ParseHTML
----> EvaluateScript
---------> MarkTimeline : SCRIPT TAG
+--------> TimeStamp : SCRIPT TAG
EvaluateScript Properties:
{
startTime : <number>
Modified: trunk/LayoutTests/inspector/timeline/timeline-test.js (91060 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/inspector/timeline/timeline-test.js 2011-07-15 10:06:31 UTC (rev 91061)
@@ -83,7 +83,7 @@
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);
Added: trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt (0 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-time-stamp-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -0,0 +1,13 @@
+Tests the Timeline API timeStamp feature
+
+TimeStamp Properties:
+{
+ startTime : <number>
+ data : {
+ message : "TIME STAMP"
+ }
+ type : "TimeStamp"
+ usedHeapSize : <number>
+ totalHeapSize : <number>
+}
+
Copied: trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html (from rev 91060, trunk/LayoutTests/inspector/timeline/timeline-mark-timeline.html) (0 => 91061)
--- trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html (rev 0)
+++ trunk/LayoutTests/inspector/timeline/timeline-time-stamp.html 2011-07-15 10:06:31 UTC (rev 91061)
@@ -0,0 +1,26 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<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>
Modified: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt (91060 => 91061)
--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -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>
}
Copied: trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt (from rev 91060, trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-mark-timeline-expected.txt) (0 => 91061)
--- trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/inspector/timeline/timeline-time-stamp-expected.txt 2011-07-15 10:06:31 UTC (rev 91061)
@@ -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>
+}
+
Modified: trunk/Source/WebCore/ChangeLog (91060 => 91061)
--- trunk/Source/WebCore/ChangeLog 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/ChangeLog 2011-07-15 10:06:31 UTC (rev 91061)
@@ -1,3 +1,41 @@
+2011-07-15 Mike West <[email protected]>
+
+ 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 <[email protected]>
LocalStorage: Changed the value type of ItemTable from TEXT to BLOB
Modified: trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h (91060 => 91061)
--- trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/InspectorConsoleInstrumentation.h 2011-07-15 10:06:31 UTC (rev 91061)
@@ -78,12 +78,12 @@
#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
}
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (91060 => 91061)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2011-07-15 10:06:31 UTC (rev 91061)
@@ -692,12 +692,12 @@
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);
}
}
Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (91060 => 91061)
--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2011-07-15 10:06:31 UTC (rev 91061)
@@ -148,7 +148,7 @@
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 @@
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);
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp (91060 => 91061)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.cpp 2011-07-15 10:06:31 UTC (rev 91061)
@@ -65,8 +65,9 @@
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";
static const char ResourceReceiveResponse[] = "ResourceReceiveResponse";
@@ -326,12 +327,12 @@
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()
Modified: trunk/Source/WebCore/inspector/InspectorTimelineAgent.h (91060 => 91061)
--- trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/InspectorTimelineAgent.h 2011-07-15 10:06:31 UTC (rev 91061)
@@ -107,7 +107,7 @@
void willEvaluateScript(const String&, int);
void didEvaluateScript();
- void didMarkTimeline(const String&);
+ void didTimeStamp(const String&);
void didMarkDOMContentEvent();
void didMarkLoadEvent();
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp (91060 => 91061)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.cpp 2011-07-15 10:06:31 UTC (rev 91061)
@@ -115,7 +115,7 @@
return data.release();
}
-PassRefPtr<InspectorObject> TimelineRecordFactory::createMarkTimelineData(const String& message)
+PassRefPtr<InspectorObject> TimelineRecordFactory::createTimeStampData(const String& message)
{
RefPtr<InspectorObject> data = ""
data->setString("message", message);
Modified: trunk/Source/WebCore/inspector/TimelineRecordFactory.h (91060 => 91061)
--- trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/TimelineRecordFactory.h 2011-07-15 10:06:31 UTC (rev 91061)
@@ -62,7 +62,7 @@
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&);
Modified: trunk/Source/WebCore/inspector/front-end/TimelineAgent.js (91060 => 91061)
--- trunk/Source/WebCore/inspector/front-end/TimelineAgent.js 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/front-end/TimelineAgent.js 2011-07-15 10:06:31 UTC (rev 91061)
@@ -32,7 +32,7 @@
// 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 @@
Paint: "Paint",
ParseHTML: "ParseHTML",
+
TimerInstall: "TimerInstall",
TimerRemove: "TimerRemove",
TimerFire: "TimerFire",
@@ -48,7 +49,8 @@
XHRLoad: "XHRLoad",
EvaluateScript: "EvaluateScript",
- MarkTimeline: "MarkTimeline",
+ TimeStamp: "TimeStamp",
+
MarkLoad: "MarkLoad",
MarkDOMContent: "MarkDOMContent",
Modified: trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js (91060 => 91061)
--- trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/front-end/TimelineOverviewPane.js 2011-07-15 10:06:31 UTC (rev 91061)
@@ -140,7 +140,7 @@
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 @@
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) {
Modified: trunk/Source/WebCore/inspector/front-end/TimelinePanel.js (91060 => 91061)
--- trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/inspector/front-end/TimelinePanel.js 2011-07-15 10:06:31 UTC (rev 91061)
@@ -97,7 +97,7 @@
// 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
_clearPanel: function()
{
- this._markTimelineRecords = [];
+ this._timeStampRecords = [];
this._sendRequestRecords = {};
this._scheduledResourceRequests = {};
this._timerRecords = {};
@@ -1036,7 +1036,7 @@
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;
Modified: trunk/Source/WebCore/page/Console.cpp (91060 => 91061)
--- trunk/Source/WebCore/page/Console.cpp 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/page/Console.cpp 2011-07-15 10:06:31 UTC (rev 91061)
@@ -253,9 +253,9 @@
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 @@
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);
Modified: trunk/Source/WebCore/page/Console.h (91060 => 91061)
--- trunk/Source/WebCore/page/Console.h 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/page/Console.h 2011-07-15 10:06:31 UTC (rev 91061)
@@ -77,6 +77,7 @@
#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();
Modified: trunk/Source/WebCore/page/Console.idl (91060 => 91061)
--- trunk/Source/WebCore/page/Console.idl 2011-07-15 08:35:16 UTC (rev 91060)
+++ trunk/Source/WebCore/page/Console.idl 2011-07-15 10:06:31 UTC (rev 91061)
@@ -54,6 +54,7 @@
void time(in [ConvertUndefinedOrNullToNullString] DOMString title);
[CustomArgumentHandling] void timeEnd(in [ConvertUndefinedOrNullToNullString] DOMString title);
+ [CustomArgumentHandling] void timeStamp();
[CustomArgumentHandling] void group();
[CustomArgumentHandling] void groupCollapsed();
void groupEnd();
