Title: [244831] branches/safari-607-branch/Source/WebInspectorUI
- Revision
- 244831
- Author
- [email protected]
- Date
- 2019-05-01 10:36:45 -0700 (Wed, 01 May 2019)
Log Message
Cherry-pick r244358. rdar://problem/50352725
REGRESSION(r238168) Web Inspector: <iframe src="" request does not show up in Network Tab
https://bugs.webkit.org/show_bug.cgi?id=193505
<rdar://problem/47325957>
Reviewed by Devin Rousso.
* UserInterface/Views/NetworkTableContentView.js:
(WI.NetworkTableContentView):
(WI.NetworkTableContentView.prototype._handleFrameWasAdded):
Handle new frames by adding the frame's main resource.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244358 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebInspectorUI/ChangeLog (244830 => 244831)
--- branches/safari-607-branch/Source/WebInspectorUI/ChangeLog 2019-05-01 17:36:43 UTC (rev 244830)
+++ branches/safari-607-branch/Source/WebInspectorUI/ChangeLog 2019-05-01 17:36:45 UTC (rev 244831)
@@ -1,5 +1,35 @@
2019-04-30 Alan Coon <[email protected]>
+ Cherry-pick r244358. rdar://problem/50352725
+
+ REGRESSION(r238168) Web Inspector: <iframe src="" request does not show up in Network Tab
+ https://bugs.webkit.org/show_bug.cgi?id=193505
+ <rdar://problem/47325957>
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/NetworkTableContentView.js:
+ (WI.NetworkTableContentView):
+ (WI.NetworkTableContentView.prototype._handleFrameWasAdded):
+ Handle new frames by adding the frame's main resource.
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@244358 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-04-16 Joseph Pecoraro <[email protected]>
+
+ REGRESSION(r238168) Web Inspector: <iframe src="" request does not show up in Network Tab
+ https://bugs.webkit.org/show_bug.cgi?id=193505
+ <rdar://problem/47325957>
+
+ Reviewed by Devin Rousso.
+
+ * UserInterface/Views/NetworkTableContentView.js:
+ (WI.NetworkTableContentView):
+ (WI.NetworkTableContentView.prototype._handleFrameWasAdded):
+ Handle new frames by adding the frame's main resource.
+
+2019-04-30 Alan Coon <[email protected]>
+
Cherry-pick r242772. rdar://problem/50352729
Web Inspector: REGRESSION: Network Cookies Table does not load
Modified: branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (244830 => 244831)
--- branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2019-05-01 17:36:43 UTC (rev 244830)
+++ branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2019-05-01 17:36:45 UTC (rev 244831)
@@ -136,6 +136,7 @@
WI.Target.addEventListener(WI.Target.Event.ResourceAdded, this._handleResourceAdded, this);
WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
WI.Frame.addEventListener(WI.Frame.Event.ResourceWasAdded, this._handleResourceAdded, this);
+ WI.Frame.addEventListener(WI.Frame.Event.ChildFrameWasAdded, this._handleFrameWasAdded, this);
WI.Resource.addEventListener(WI.Resource.Event.LoadingDidFinish, this._resourceLoadingDidFinish, this);
WI.Resource.addEventListener(WI.Resource.Event.LoadingDidFail, this._resourceLoadingDidFail, this);
WI.Resource.addEventListener(WI.Resource.Event.TransferSizeDidChange, this._resourceTransferSizeDidChange, this);
@@ -1526,6 +1527,20 @@
this._insertResourceAndReloadTable(event.data.resource);
}
+ _handleFrameWasAdded(event)
+ {
+ if (this._needsInitialPopulate)
+ return;
+
+ let frame = event.data.childFrame;
+ let mainResource = frame.provisionalMainResource || frame.mainResource;
+ console.assert(mainResource, "Frame should have a main resource.");
+ this._insertResourceAndReloadTable(mainResource);
+
+ console.assert(!frame.resourceCollection.size, "New frame should be empty.");
+ console.assert(!frame.childFrameCollection.size, "New frame should be empty.");
+ }
+
_isDefaultSort()
{
return this._table.sortColumnIdentifier === "waterfall" && this._table.sortOrder === WI.Table.SortOrder.Ascending;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
