Title: [194944] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 194944
- Author
- matthew_han...@apple.com
- Date
- 2016-01-12 17:41:33 -0800 (Tue, 12 Jan 2016)
Log Message
Merge r194602. rdar://problem/24101260
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (194943 => 194944)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:30 UTC (rev 194943)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2016-01-13 01:41:33 UTC (rev 194944)
@@ -1,5 +1,23 @@
2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r194602. rdar://problem/24101260
+
+ 2016-01-05 Joseph Pecoraro <pecor...@apple.com>
+
+ REGRESSION(r187929): Web Inspector: Forced Layout and Style Recalculation records do not show up in Layout & Rendering timeline DataGrid
+ https://bugs.webkit.org/show_bug.cgi?id=152747
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/LayoutTimelineView.js:
+ (WebInspector.LayoutTimelineView.prototype._layoutTimelineRecordAdded):
+ We want top-level Layout records. Not necessarily Layout records that are
+ at the top of all records. Layout events such as style recalculation
+ and forced layout may be triggered by script and therefore not be at
+ the top of all records.
+
+2016-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r194083. rdar://problem/24101257
2015-12-14 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js (194943 => 194944)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2016-01-13 01:41:30 UTC (rev 194943)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayoutTimelineView.js 2016-01-13 01:41:33 UTC (rev 194944)
@@ -225,7 +225,7 @@
console.assert(layoutTimelineRecord instanceof WebInspector.LayoutTimelineRecord);
// Only add top-level records, to avoid processing child records multiple times.
- if (!(layoutTimelineRecord.parent instanceof WebInspector.RenderingFrameTimelineRecord))
+ if (layoutTimelineRecord.parent instanceof WebInspector.LayoutTimelineRecord)
return;
this._pendingRecords.push(layoutTimelineRecord);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
