Title: [193068] branches/safari-601-branch/Source/WebInspectorUI
- Revision
- 193068
- Author
- [email protected]
- Date
- 2015-12-03 10:42:41 -0800 (Thu, 03 Dec 2015)
Log Message
Merge r188015. rdar://problem/23221163
Modified Paths
Diff
Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193067 => 193068)
--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:36 UTC (rev 193067)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog 2015-12-03 18:42:41 UTC (rev 193068)
@@ -1,5 +1,23 @@
2015-12-02 Timothy Hatcher <[email protected]>
+ Merge r188015. rdar://problem/23221163
+
+ 2015-08-05 Matt Baker <[email protected]>
+
+ Web Inspector: REGRESSION (r187634): Script time is missing from the frames timeline
+ https://bugs.webkit.org/show_bug.cgi?id=147654
+
+ Reviewed by Brian Burg.
+
+ Use the current stack entry's parent record when pushing a new stack entry, if no
+ TimelineRecord was generated from the parent record payload.
+
+ * UserInterface/Controllers/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype.eventRecorded):
+ Don't create a stack entry when record payload children array is empty.
+
+2015-12-02 Timothy Hatcher <[email protected]>
+
Merge r188007. rdar://problem/23221163
2015-08-05 Matt Baker <[email protected]>
Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js (193067 => 193068)
--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 18:42:36 UTC (rev 193067)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Controllers/TimelineManager.js 2015-12-03 18:42:41 UTC (rev 193068)
@@ -202,8 +202,8 @@
entry.parentRecord.children.push(record);
}
- if (recordPayload.children)
- stack.push({array: recordPayload.children, parent: recordPayload, parentRecord: record, index: 0});
+ if (recordPayload.children && recordPayload.children.length)
+ stack.push({array: recordPayload.children, parent: recordPayload, parentRecord: record || entry.parentRecord, index: 0});
++entry.index;
} else
stack.pop();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
