third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.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/emulation/DeviceModeView.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/elements/ElementsTreeOutline.js ('K') | « third_party/WebKit/Source/devtools/front_end/elements/ElementsTreeOutline.js ('k') | third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js » ('j') | third_party/WebKit/Source/devtools/front_end/extensions/ExtensionServer.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js

diff --git a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js

index 486429cc3f224f0c0076684bcaf36d59ff928061..77a42d3bbe5562997a634e94040166fb3f0b3418 100644

--- a/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js

+++ b/third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeView.js

@@ -472,7 +472,8 @@ WebInspector.DeviceModeView.prototype = {

visiblePageRect.top,

Math.min(pageImage.naturalWidth, screenRect.width),

Math.min(pageImage.naturalHeight, screenRect.height));

- var mainFrame = mainTarget.resourceTreeModel.mainFrame;

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

+ var mainFrame = resourceTreeModel && resourceTreeModel.mainFrame;

var fileName = mainFrame ? mainFrame.url.trimURL().removeURLFragment() : "";

if (this._model.type() === WebInspector.DeviceModeModel.Type.Device)

fileName += WebInspector.UIString("(%s)", this._model.device().title);