content/common/page_state_serialization.cc - Issue 1608733002: Remove ui/gfx/screen_type_delegate.h

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: content/common/page_state_serialization.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4

Patch Set: and another rebase Created 4 years, 11 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: content/common/page_state_serialization.cc

diff --git a/content/common/page_state_serialization.cc b/content/common/page_state_serialization.cc

index 53ddf098d16b7ba0970d54f6d3734925fdb3e211..68974aebb84dc26aad64a508ebb4445200686aef 100644

--- a/content/common/page_state_serialization.cc

+++ b/content/common/page_state_serialization.cc

@@ -606,8 +606,7 @@ void ReadFrameState(SerializeObject* obj, bool is_top,

float device_scale_factor = g_device_scale_factor_for_testing;

if (!device_scale_factor) {

device_scale_factor =

- gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().

- device_scale_factor();

+ gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();

}

state->scroll_offset =

gfx::Point(state->scroll_offset.x() / state->page_scale_factor,