ui/aura/window_tree_host.cc - Issue 2739113002: Simplify calls for scale factor

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: ui/aura/window_tree_host.cc

Issue 2739113002: Simplify calls for scale factor (Closed)

Patch Set: nit Created 3 years, 9 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:

Index: ui/aura/window_tree_host.cc

diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc

index e624728fb926b8ddee0e7a5d8da5e4cec74773c1..cf223aeda64a6b0a63c99169c07b4ad823c5f4f4 100644

--- a/ui/aura/window_tree_host.cc

+++ b/ui/aura/window_tree_host.cc

@@ -16,6 +16,7 @@

#include "ui/aura/window_tree_host_observer.h"

#include "ui/base/ime/input_method.h"

#include "ui/base/ime/input_method_factory.h"

+#include "ui/base/layout.h"

#include "ui/base/view_prop.h"

#include "ui/compositor/dip_util.h"

#include "ui/compositor/layer.h"

@@ -35,10 +36,7 @@ const char kWindowTreeHostForAcceleratedWidget[] =

"__AURA_WINDOW_TREE_HOST_ACCELERATED_WIDGET__";

float GetDeviceScaleFactorFromDisplay(Window* window) {

- display::Display display =

- display::Screen::GetScreen()->GetDisplayNearestWindow(window);

- DCHECK(display.is_valid());

- return display.device_scale_factor();

+ return ui::GetScaleFactorForNativeView(window);

}

////////////////////////////////////////////////////////////////////////////////

« no previous file with comments | « ui/aura/mus/window_tree_client.cc ('k') | ui/aura/window_tree_host_platform.cc » ('j') | no next file with comments »