Title: [244358] trunk/Source/WebInspectorUI
- Revision
- 244358
- Author
- [email protected]
- Date
- 2019-04-16 14:28:24 -0700 (Tue, 16 Apr 2019)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (244357 => 244358)
--- trunk/Source/WebInspectorUI/ChangeLog 2019-04-16 20:52:20 UTC (rev 244357)
+++ trunk/Source/WebInspectorUI/ChangeLog 2019-04-16 21:28:24 UTC (rev 244358)
@@ -1,3 +1,16 @@
+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-16 Devin Rousso <[email protected]>
Web Inspector: Uncaught Exception: TypeError: null is not an object (evaluating 'this._contentViewContainer.currentContentView.selectionPathComponents')
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js (244357 => 244358)
--- trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2019-04-16 20:52:20 UTC (rev 244357)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js 2019-04-16 21:28:24 UTC (rev 244358)
@@ -162,6 +162,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);
@@ -1667,6 +1668,22 @@
});
}
+ _handleFrameWasAdded(event)
+ {
+ if (this._needsInitialPopulate)
+ return;
+
+ this._runForMainCollection((collection) => {
+ 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.");
+ });
+ }
+
_runForMainCollection(callback)
{
let currentCollection = this._activeCollection;
@@ -2057,7 +2074,7 @@
if (this._hasURLFilter()) {
for (let entry of this._activeCollection.entries)
- this._checkURLFilterAgainstResource(entry.resource);
+ this._checkURLFilterAgainstResource(entry.resource);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
