third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js - Issue 2122353002: [DevTools] Make resource tree model optional

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Comments 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

« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.js ('k') | third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7344dec519d771c0f9e2b6f915150c275467536f..8766ed1496c55b61ce178647ba846e75df31c843 100644

--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js

@@ -187,7 +187,9 @@ WebInspector.ConsoleView.prototype = {

_initConsoleMessages: function()

{

var mainTarget = WebInspector.targetManager.mainTarget();

- if (!mainTarget || !mainTarget.resourceTreeModel.cachedResourcesLoaded()) {

+ var resourceTreeModel = mainTarget && WebInspector.ResourceTreeModel.fromTarget(mainTarget);

+ var resourcesLoaded = !resourceTreeModel || resourceTreeModel.cachedResourcesLoaded();

+ if (!mainTarget || !resourcesLoaded) {

WebInspector.targetManager.addModelListener(WebInspector.ResourceTreeModel, WebInspector.ResourceTreeModel.EventTypes.CachedResourcesLoaded, this._onResourceTreeModelLoaded, this);

return;

}