Changeset 244358 in webkit


Ignore:
Timestamp:
Apr 16, 2019 2:28:24 PM (5 years ago)
Author:
Joseph Pecoraro
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.

Location:
trunk/Source/WebInspectorUI
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebInspectorUI/ChangeLog

    r244354 r244358  
     12019-04-16  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        REGRESSION(r238168) Web Inspector: <iframe src=...> request does not show up in Network Tab
     4        https://bugs.webkit.org/show_bug.cgi?id=193505
     5        <rdar://problem/47325957>
     6
     7        Reviewed by Devin Rousso.
     8
     9        * UserInterface/Views/NetworkTableContentView.js:
     10        (WI.NetworkTableContentView):
     11        (WI.NetworkTableContentView.prototype._handleFrameWasAdded):
     12        Handle new frames by adding the frame's main resource.
     13
    1142019-04-16  Devin Rousso  <drousso@apple.com>
    215
  • trunk/Source/WebInspectorUI/UserInterface/Views/NetworkTableContentView.js

    r243355 r244358  
    163163        WI.Frame.addEventListener(WI.Frame.Event.MainResourceDidChange, this._mainResourceDidChange, this);
    164164        WI.Frame.addEventListener(WI.Frame.Event.ResourceWasAdded, this._handleResourceAdded, this);
     165        WI.Frame.addEventListener(WI.Frame.Event.ChildFrameWasAdded, this._handleFrameWasAdded, this);
    165166        WI.Resource.addEventListener(WI.Resource.Event.LoadingDidFinish, this._resourceLoadingDidFinish, this);
    166167        WI.Resource.addEventListener(WI.Resource.Event.LoadingDidFail, this._resourceLoadingDidFail, this);
     
    16681669    }
    16691670
     1671    _handleFrameWasAdded(event)
     1672    {
     1673        if (this._needsInitialPopulate)
     1674            return;
     1675
     1676        this._runForMainCollection((collection) => {
     1677            let frame = event.data.childFrame;
     1678            let mainResource = frame.provisionalMainResource || frame.mainResource;
     1679            console.assert(mainResource, "Frame should have a main resource.");
     1680            this._insertResourceAndReloadTable(mainResource);
     1681
     1682            console.assert(!frame.resourceCollection.size, "New frame should be empty.");
     1683            console.assert(!frame.childFrameCollection.size, "New frame should be empty.");
     1684        });
     1685    }
     1686
    16701687    _runForMainCollection(callback)
    16711688    {
     
    20582075        if (this._hasURLFilter()) {
    20592076            for (let entry of this._activeCollection.entries)
    2060                 this._checkURLFilterAgainstResource(entry.resource);           
     2077                this._checkURLFilterAgainstResource(entry.resource);
    20612078        }
    20622079    }
Note: See TracChangeset for help on using the changeset viewer.