Modified: branches/safari-608.1.5.1-branch/Source/WebInspectorUI/ChangeLog (241354 => 241355)
--- branches/safari-608.1.5.1-branch/Source/WebInspectorUI/ChangeLog 2019-02-13 09:02:20 UTC (rev 241354)
+++ branches/safari-608.1.5.1-branch/Source/WebInspectorUI/ChangeLog 2019-02-13 09:02:22 UTC (rev 241355)
@@ -1,5 +1,44 @@
2019-02-13 Babak Shafiei <[email protected]>
+ Cherry-pick r240952. rdar://problem/47559021
+
+ Web Inspector: Resources: missing resource data for document on reload
+ https://bugs.webkit.org/show_bug.cgi?id=194243
+ <rdar://problem/47559021>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WI.ResourceDetailsSidebarPanel.prototype.set resource):
+ (WI.ResourceDetailsSidebarPanel.prototype._applyResourceEventListeners):
+
+ * UserInterface/Base/Object.js:
+ (WI.Object.removeEventListener):
+ Drive-by: there's no need to iterate over the entire table to check if `thisObject` exists,
+ as that is handled for us by `ListMultimap`, which we later call anyways.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-02-04 Devin Rousso <[email protected]>
+
+ Web Inspector: Resources: missing resource data for document on reload
+ https://bugs.webkit.org/show_bug.cgi?id=194243
+ <rdar://problem/47559021>
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/ResourceDetailsSidebarPanel.js:
+ (WI.ResourceDetailsSidebarPanel.prototype.set resource):
+ (WI.ResourceDetailsSidebarPanel.prototype._applyResourceEventListeners):
+
+ * UserInterface/Base/Object.js:
+ (WI.Object.removeEventListener):
+ Drive-by: there's no need to iterate over the entire table to check if `thisObject` exists,
+ as that is handled for us by `ListMultimap`, which we later call anyways.
+
+2019-02-13 Babak Shafiei <[email protected]>
+
Cherry-pick r240947. rdar://problem/47743864
Web Inspector: REGRESSION: clicking a selected call frame doesn't re-scroll
Modified: branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Base/Object.js (241354 => 241355)
--- branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2019-02-13 09:02:20 UTC (rev 241354)
+++ branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Base/Object.js 2019-02-13 09:02:22 UTC (rev 241355)
@@ -79,12 +79,7 @@
if (thisObject && !eventType) {
this._listeners.forEach(function(listenersTable) {
- let listenerPairs = listenersTable.toArray();
- for (let i = 0, length = listenerPairs.length; i < length; ++i) {
- let existingThisObject = listenerPairs[i][0];
- if (existingThisObject === thisObject)
- listenersTable.deleteAll(existingThisObject);
- }
+ listenersTable.deleteAll(thisObject);
});
return;
Modified: branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js (241354 => 241355)
--- branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2019-02-13 09:02:20 UTC (rev 241354)
+++ branches/safari-608.1.5.1-branch/Source/WebInspectorUI/UserInterface/Views/ResourceDetailsSidebarPanel.js 2019-02-13 09:02:22 UTC (rev 241355)
@@ -82,16 +82,7 @@
return;
if (this._resource && this._needsToRemoveResourceEventListeners) {
- this._resource.removeEventListener(WI.Resource.Event.URLDidChange, this._refreshURL, this);
- this._resource.removeEventListener(WI.Resource.Event.MIMETypeDidChange, this._refreshMIMEType, this);
- this._resource.removeEventListener(WI.Resource.Event.TypeDidChange, this._refreshResourceType, this);
- this._resource.removeEventListener(WI.Resource.Event.LoadingDidFail, this._refreshErrorReason, this);
- this._resource.removeEventListener(WI.Resource.Event.RequestHeadersDidChange, this._refreshRequestHeaders, this);
- this._resource.removeEventListener(WI.Resource.Event.ResponseReceived, this._refreshRequestAndResponse, this);
- this._resource.removeEventListener(WI.Resource.Event.CacheStatusDidChange, this._refreshRequestAndResponse, this);
- this._resource.removeEventListener(WI.Resource.Event.SizeDidChange, this._refreshDecodedSize, this);
- this._resource.removeEventListener(WI.Resource.Event.TransferSizeDidChange, this._refreshTransferSize, this);
- this._resource.removeEventListener(WI.Resource.Event.InitiatedResourcesDidChange, this._refreshRelatedResourcesSection, this);
+ this._resource.removeEventListener(null, null, this);
this._needsToRemoveResourceEventListeners = false;
}
@@ -99,7 +90,7 @@
this._resource = resource;
if (this._resource) {
- if (this.parentSidebar)
+ if (this.didInitialLayout)
this._applyResourceEventListeners();
else
this._needsToApplyResourceEventListeners = true;
@@ -621,6 +612,7 @@
this._resource.addEventListener(WI.Resource.Event.RequestHeadersDidChange, this._refreshRequestHeaders, this);
this._resource.addEventListener(WI.Resource.Event.ResponseReceived, this._refreshRequestAndResponse, this);
this._resource.addEventListener(WI.Resource.Event.CacheStatusDidChange, this._refreshRequestAndResponse, this);
+ this._resource.addEventListener(WI.Resource.Event.MetricsDidChange, this._refreshRequestAndResponse, this);
this._resource.addEventListener(WI.Resource.Event.SizeDidChange, this._refreshDecodedSize, this);
this._resource.addEventListener(WI.Resource.Event.TransferSizeDidChange, this._refreshTransferSize, this);
this._resource.addEventListener(WI.Resource.Event.InitiatedResourcesDidChange, this._refreshRelatedResourcesSection, this);
