diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/inspector/front-end/TimelinePanel.js | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/inspector/front-end/TimelinePanel.js')
-rw-r--r-- | Source/WebCore/inspector/front-end/TimelinePanel.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/WebCore/inspector/front-end/TimelinePanel.js b/Source/WebCore/inspector/front-end/TimelinePanel.js index 1d8b9c9..62c5de0 100644 --- a/Source/WebCore/inspector/front-end/TimelinePanel.js +++ b/Source/WebCore/inspector/front-end/TimelinePanel.js @@ -270,10 +270,10 @@ WebInspector.TimelinePanel.prototype = { _toggleTimelineButtonClicked: function() { if (this.toggleTimelineButton.toggled) - InspectorBackend.stopTimelineProfiler(); + TimelineAgent.stop(); else { this._clearPanel(); - InspectorBackend.startTimelineProfiler(); + TimelineAgent.start(); } }, @@ -865,7 +865,6 @@ WebInspector.TimelinePanel.FormattedRecord = function(record, parentRecord, pane this.endTime = (typeof record.endTime !== "undefined") ? record.endTime / 1000 : this.startTime; this._selfTime = this.endTime - this.startTime; this._lastChildEndTime = this.endTime; - this.originalRecordForTests = record; if (record.stackTrace && record.stackTrace.length) this.stackTrace = record.stackTrace; this.totalHeapSize = record.totalHeapSize; |