third_party/WebKit/Source/devtools/front_end/emulation/DeviceModeModel.js - Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain

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/DeviceModeModel.js

Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)

Patch Set: rebased bad merge Created 3 years, 8 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/elements/StylesSidebarPane.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/emulation/DeviceModeModel.js

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

index dbd9b6d6824d947eb069b86e2c4687c3a09ed14a..555208d48fffcdc9730ed5eb74b8a3c3cb0ba06c 100644

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

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

@@ -472,8 +472,9 @@ Emulation.DeviceModeModel = class {

this._uaSetting.get() === Emulation.DeviceModeModel.UA.Mobile,

this._uaSetting.get() === Emulation.DeviceModeModel.UA.Mobile);

}

- if (this._target)

- this._target.renderingAgent().setShowViewportSizeOnResize(this._type === Emulation.DeviceModeModel.Type.None);

+ var overlayModel = this._target ? this._target.model(SDK.OverlayModel) : null;

+ if (overlayModel)

+ overlayModel.setShowViewportSizeOnResize(this._type === Emulation.DeviceModeModel.Type.None);

this._updateCallback.call(null);

}

@@ -636,7 +637,9 @@ Emulation.DeviceModeModel = class {

if (!this._emulatedPageSize)

this._calculateAndEmulate(false);

- this._target.renderingAgent().setShowViewportSizeOnResize(false);

+ var overlayModel = this._target ? this._target.model(SDK.OverlayModel) : null;

+ if (overlayModel)

+ overlayModel.setShowViewportSizeOnResize(false);

var pageSize = fullSize ? new UI.Size(metrics.contentWidth, metrics.contentHeight) : this._emulatedPageSize;

var promises = [];