Changeset 244831 in webkit

Timestamp:

May 1, 2019, 10:36:45 AM (7 years ago)

Author:

Alan Coon

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

Location:

branches/safari-607-branch/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/NetworkTableContentView.js (modified) (2 diffs)

branches/safari-607-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2019-04-30  Alan Coon  <alancoon@apple.com>
+
+        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  <pecoraro@apple.com>
+
+            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  <alancoon@apple.com>
 

branches/safari-607-branch/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

@@ -137 +137 @@
         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);
@@ -1527 +1528 @@
     }
 
+    _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()
     {