Title: [152688] branches/safari-537-branch/Source/WebInspectorUI
- Revision
- 152688
- Author
- [email protected]
- Date
- 2013-07-15 18:19:11 -0700 (Mon, 15 Jul 2013)
Log Message
Merged r152652. <rdar://problem/14413607>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebInspectorUI/ChangeLog (152687 => 152688)
--- branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-07-16 01:17:24 UTC (rev 152687)
+++ branches/safari-537-branch/Source/WebInspectorUI/ChangeLog 2013-07-16 01:19:11 UTC (rev 152688)
@@ -1,5 +1,23 @@
2013-07-15 Lucas Forschler <[email protected]>
+ Merge r152652
+
+ 2013-07-15 Timothy Hatcher <[email protected]>
+
+ Make sure to add main resources for sub-frames to the Network Timeline.
+
+ https://bugs.webkit.org/show_bug.cgi?id=118649
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/TimelineManager.js:
+ (WebInspector.TimelineManager.prototype._mainResourceDidChange): Remove the
+ call to _clear() and early return for event.target.isMainFrame(). The _clear()
+ is already handled if needed by the call to _startAutoRecording(), so it was
+ redundant here and caused the erroneous addition of isMainFrame() early return.
+
+2013-07-15 Lucas Forschler <[email protected]>
+
Merge r152588
2013-07-12 Seokju Kwon <[email protected]>
Modified: branches/safari-537-branch/Source/WebInspectorUI/UserInterface/TimelineManager.js (152687 => 152688)
--- branches/safari-537-branch/Source/WebInspectorUI/UserInterface/TimelineManager.js 2013-07-16 01:17:24 UTC (rev 152687)
+++ branches/safari-537-branch/Source/WebInspectorUI/UserInterface/TimelineManager.js 2013-07-16 01:19:11 UTC (rev 152688)
@@ -404,16 +404,11 @@
if (!WebInspector.frameResourceManager.mainFrame)
return;
- if (!event.target.isMainFrame())
- return;
-
if (this._startAutoRecording(event))
return;
- if (!this._recording) {
- this._clear();
+ if (!this._recording)
return;
- }
var mainResource = event.target.mainResource;
if (mainResource === this._autoRecordingMainResource)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes