Title: [200683] branches/safari-602.1.32-branch/Source/WebInspectorUI
- Revision
- 200683
- Author
- bshaf...@apple.com
- Date
- 2016-05-11 01:18:36 -0700 (Wed, 11 May 2016)
Log Message
Merged r200644. rdar://problem/26204033
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog (200682 => 200683)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:17:49 UTC (rev 200682)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/ChangeLog 2016-05-11 08:18:36 UTC (rev 200683)
@@ -1,5 +1,23 @@
2016-05-11 Babak Shafiei <bshaf...@apple.com>
+ Merge r200644.
+
+ 2016-05-10 Matt Baker <mattba...@apple.com>
+
+ Web Inspector: TimelineOverview assertion failed: Missing overview graph for timeline type undefined
+ https://bugs.webkit.org/show_bug.cgi?id=157533
+ <rdar://problem/26204033>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineRecordingContentView.js:
+ (WebInspector.TimelineRecordingContentView.prototype._recordWasFiltered):
+ The OverviewTimelineView's represented object is the entire recording,
+ and TimelineOverview.recordWasFiltered expects a timeline. Return early
+ since no graph in the overview needs updating.
+
+2016-05-11 Babak Shafiei <bshaf...@apple.com>
+
Merge r200643.
2016-05-10 Matt Baker <mattba...@apple.com>
Modified: branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (200682 => 200683)
--- branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-11 08:17:49 UTC (rev 200682)
+++ branches/safari-602.1.32-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js 2016-05-11 08:18:36 UTC (rev 200683)
@@ -719,9 +719,15 @@
if (event.target !== this.currentTimelineView)
return;
+ console.assert(this.currentTimelineView);
+
+ let timeline = this.currentTimelineView.representedObject;
+ if (!(timeline instanceof WebInspector.Timeline))
+ return;
+
let record = event.data.record;
let filtered = event.data.filtered;
- this._timelineOverview.recordWasFiltered(this.currentTimelineView.representedObject, record, filtered);
+ this._timelineOverview.recordWasFiltered(timeline, record, filtered);
}
_updateProgressView()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
