Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(587)

Unified Diff: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

Issue 2122353002: [DevTools] Make resource tree model optional (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
index 79457d97b96b8dede3d139c923c36078712fe23c..1e77d77e215921dbc25c1a1f56eebc29f3955990 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
@@ -193,11 +193,16 @@ WebInspector.ConsoleView.prototype = {
_initConsoleMessages: function()
{
var mainTarget = WebInspector.targetManager.mainTarget();
- if (!mainTarget || !mainTarget.resourceTreeModel.cachedResourcesLoaded()) {
+ var cachedResources = false;
pfeldman 2016/07/07 17:44:14 Same, we need to fix it.
eostroukhov-old 2016/07/13 23:30:59 Out of scope for this refactoring?
+ if (mainTarget) {
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(mainTarget);
+ cachedResources = resourceTreeModel && resourceTreeModel.cachedResourcesLoaded();
+ }
+ if (cachedResources) {
+ this._fetchMultitargetMessages();
+ } else {
WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._onResourceTreeModelLoaded, this);
- return;
}
- this._fetchMultitargetMessages();
},
/**

Powered by Google App Engine
This is Rietveld 408576698