Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1345)

Unified Diff: Source/devtools/front_end/components_lazy/FilmStripModel.js

Issue 1326053002: DevTools: negative time on network filmstrip when reloading page while loading. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/devtools/front_end/network/NetworkPanel.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/devtools/front_end/components_lazy/FilmStripModel.js
diff --git a/Source/devtools/front_end/components_lazy/FilmStripModel.js b/Source/devtools/front_end/components_lazy/FilmStripModel.js
index 40f4aa1982684d7a701f7f96df9f5cc55a897d40..362b0c710146da0fb1f214de64d41eb1d4115735 100644
--- a/Source/devtools/front_end/components_lazy/FilmStripModel.js
+++ b/Source/devtools/front_end/components_lazy/FilmStripModel.js
@@ -7,10 +7,12 @@
/**
* @constructor
* @param {!WebInspector.TracingModel} tracingModel
+ * @param {number=} zeroTime
*/
-WebInspector.FilmStripModel = function(tracingModel)
+WebInspector.FilmStripModel = function(tracingModel, zeroTime)
{
this._tracingModel = tracingModel;
+ this._zeroTime = zeroTime || tracingModel.minimumRecordTime();
/** @type {!Array<!WebInspector.FilmStripModel.Frame>} */
this._frames = [];
@@ -24,15 +26,17 @@ WebInspector.FilmStripModel = function(tracingModel)
var events = mainThread.events();
for (var i = 0; i < events.length; ++i) {
- if (!events[i].hasCategory(WebInspector.FilmStripModel._category))
+ var event = events[i];
+ if (event.startTime < this._zeroTime)
continue;
-
- if (events[i].name === WebInspector.FilmStripModel.TraceEvents.CaptureFrame) {
- var data = events[i].args["data"];
+ if (!event.hasCategory(WebInspector.FilmStripModel._category))
+ continue;
+ if (event.name === WebInspector.FilmStripModel.TraceEvents.CaptureFrame) {
+ var data = event.args["data"];
if (data)
- this._frames.push(WebInspector.FilmStripModel.Frame._fromEvent(this, events[i], this._frames.length));
- } else if (events[i].name === WebInspector.FilmStripModel.TraceEvents.Screenshot) {
- this._frames.push(WebInspector.FilmStripModel.Frame._fromSnapshot(this, /** @type {!WebInspector.TracingModel.ObjectSnapshot} */ (events[i]), this._frames.length));
+ this._frames.push(WebInspector.FilmStripModel.Frame._fromEvent(this, event, this._frames.length));
+ } else if (event.name === WebInspector.FilmStripModel.TraceEvents.Screenshot) {
+ this._frames.push(WebInspector.FilmStripModel.Frame._fromSnapshot(this, /** @type {!WebInspector.TracingModel.ObjectSnapshot} */ (event), this._frames.length));
}
}
}
@@ -58,7 +62,7 @@ WebInspector.FilmStripModel.prototype = {
*/
zeroTime: function()
{
- return this._tracingModel.minimumRecordTime();
+ return this._zeroTime;
},
/**
« no previous file with comments | « no previous file | Source/devtools/front_end/network/NetworkPanel.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698