third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.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/sources/NavigatorView.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/sdk/TargetManager.js ('k') | third_party/WebKit/Source/devtools/front_end/timeline/TimelineController.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

diff --git a/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js b/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

index 8f852d49c1a245fb696a005dbc9c9b4b8937f34a..371a605607825bc18d3c220a390f88b43a5f4a4c 100644

--- a/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

+++ b/third_party/WebKit/Source/devtools/front_end/sources/NavigatorView.js

@@ -193,10 +193,13 @@ WebInspector.NavigatorView.prototype = {

_uiSourceCodeFrame: function(uiSourceCode)

{

- var target = WebInspector.NetworkProject.targetForProject(uiSourceCode.project());

- if (!target)

- return null;

- return WebInspector.NetworkProject.frameForProject(uiSourceCode.project()) || target.resourceTreeModel.mainFrame;

+ var frame = WebInspector.NetworkProject.frameForProject(uiSourceCode.project());

+ if (!frame) {

+ var target = WebInspector.NetworkProject.targetForProject(uiSourceCode.project());

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

+ frame = resourceTreeModel && resourceTreeModel.mainFrame;

+ }

+ return frame;

/**