third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.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/ConsoleContextSelector.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

« third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js ('K') | « third_party/WebKit/Source/devtools/front_end/components/ExecutionContextSelector.js ('k') | third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js » ('j') | third_party/WebKit/Source/devtools/front_end/console/ConsoleView.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.js

diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleContextSelector.js

index de1ceda9ada0601dab31484c5a3a3162797ee512..8073bead6351b1c6aa60d160cfd4e4749698734d 100644

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

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

@@ -34,7 +34,8 @@ WebInspector.ConsoleContextSelector.prototype = {

var result;

if (executionContext.isDefault) {

if (executionContext.frameId) {

- var frame = executionContext.target().resourceTreeModel.frameForId(executionContext.frameId);

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

pfeldman 2016/07/13 23:55:57 ditto - this can't use frames.

eostroukhov-old 2016/07/20 23:46:15 Same as my previous comment...

+ var frame = resourceTreeModel && resourceTreeModel.frameForId(executionContext.frameId);

result = frame ? frame.displayName() : executionContext.label();

} else {

result = executionContext.target().decorateLabel(executionContext.label());