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

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: [DevTools] No RTM for non-browser targets Created 4 years, 4 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 1a77e9750f7711779fb9fda5e39656600c8e6b52..1561ef3fe56a999f9ea3764154fe0c205af36df2 100644
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js
@@ -187,11 +187,16 @@ WebInspector.ConsoleView.prototype = {
_initConsoleMessages: function()
{
var mainTarget = WebInspector.targetManager.mainTarget();
- if (!mainTarget || !mainTarget.resourceTreeModel.cachedResourcesLoaded()) {
+ var cachedResources = false;
+ if (mainTarget) {
+ var resourceTreeModel = WebInspector.ResourceTreeModel.fromTarget(mainTarget);
+ cachedResources = resourceTreeModel && resourceTreeModel.cachedResourcesLoaded();
dgozman 2016/08/19 20:23:37 cachedResources should be true when there is no ma
eostroukhov 2016/08/20 01:22:30 Done.
+ }
+ 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