Title: [176049] trunk/Source/WebInspectorUI
- Revision
- 176049
- Author
- [email protected]
- Date
- 2014-11-12 16:27:17 -0800 (Wed, 12 Nov 2014)
Log Message
Web Inspector: Reduce work when activating multiple agents sequentially
https://bugs.webkit.org/show_bug.cgi?id=138677
Patch by Joseph Pecoraro <[email protected]> on 2014-11-12
Reviewed by Timothy Hatcher.
* UserInterface/Base/Main.js:
(WebInspector.activateExtraDomains):
* UserInterface/Controllers/FrameResourceManager.js:
(WebInspector.FrameResourceManager.prototype._extraDomainsActivated):
* UserInterface/Controllers/StorageManager.js:
(WebInspector.StorageManager.prototype._extraDomainsActivated):
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (176048 => 176049)
--- trunk/Source/WebInspectorUI/ChangeLog 2014-11-12 23:51:23 UTC (rev 176048)
+++ trunk/Source/WebInspectorUI/ChangeLog 2014-11-13 00:27:17 UTC (rev 176049)
@@ -1,3 +1,17 @@
+2014-11-12 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: Reduce work when activating multiple agents sequentially
+ https://bugs.webkit.org/show_bug.cgi?id=138677
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Base/Main.js:
+ (WebInspector.activateExtraDomains):
+ * UserInterface/Controllers/FrameResourceManager.js:
+ (WebInspector.FrameResourceManager.prototype._extraDomainsActivated):
+ * UserInterface/Controllers/StorageManager.js:
+ (WebInspector.StorageManager.prototype._extraDomainsActivated):
+
2014-11-11 Joseph Pecoraro <[email protected]>
Web Inspector: Handle activating extra agents properly after inspector has connected
Modified: trunk/Source/WebInspectorUI/UserInterface/Base/Main.js (176048 => 176049)
--- trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-11-12 23:51:23 UTC (rev 176048)
+++ trunk/Source/WebInspectorUI/UserInterface/Base/Main.js 2014-11-13 00:27:17 UTC (rev 176049)
@@ -365,7 +365,7 @@
agent.enable();
}
- this.notifications.dispatchEventToListeners(WebInspector.Notification.ExtraDomainsActivated);
+ this.notifications.dispatchEventToListeners(WebInspector.Notification.ExtraDomainsActivated, {"domains": domains});
WebInspector.CSSCompletions.requestCSSNameCompletions();
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js (176048 => 176049)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2014-11-12 23:51:23 UTC (rev 176048)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/FrameResourceManager.js 2014-11-13 00:27:17 UTC (rev 176049)
@@ -587,9 +587,9 @@
this.dispatchEventToListeners(WebInspector.FrameResourceManager.Event.MainFrameDidChange, {oldMainFrame: oldMainFrame});
},
- _extraDomainsActivated: function()
+ _extraDomainsActivated: function(event)
{
- if (window.PageAgent)
+ if (event.data.domains.contains("Page") && window.PageAgent)
PageAgent.getResourceTree(this._processMainFrameResourceTreePayload.bind(this));
}
};
Modified: trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js (176048 => 176049)
--- trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2014-11-12 23:51:23 UTC (rev 176048)
+++ trunk/Source/WebInspectorUI/UserInterface/Controllers/StorageManager.js 2014-11-13 00:27:17 UTC (rev 176049)
@@ -308,9 +308,10 @@
return null;
},
- _extraDomainsActivated: function()
+ _extraDomainsActivated: function(event)
{
- if (window.DOMStorageAgent && DOMStorageAgent.getDOMStorageItems)
+
+ if (event.data.domains.contains("DOMStorage") && window.DOMStorageAgent && DOMStorageAgent.getDOMStorageItems)
WebInspector.Frame.addEventListener(WebInspector.Frame.Event.SecurityOriginDidChange, this._securityOriginDidChange, this);
}
};
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
