content/browser/renderer_host/render_widget_host_view_android.cc - Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx

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/browser/renderer_host/render_widget_host_view_android.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix new usage of scale in FastShowPickler Created 7 years, 3 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/browser/renderer_host/render_widget_host_view_android.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc

index ae2806e715333df1cd7df7ec65186a8de7357c39..2e01e95325cf7cb7cf87814b661da2f142fc7369 100644

--- a/content/browser/renderer_host/render_widget_host_view_android.cc

+++ b/content/browser/renderer_host/render_widget_host_view_android.cc

@@ -567,7 +567,7 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(

float device_scale_factor = display.device_scale_factor();

DCHECK_EQ(device_scale_factor,

- ui::GetScaleFactorScale(GetScaleFactorForView(this)));

+ ui::GetImageScale(GetScaleFactorForView(this)));

const gfx::Size& dst_size_in_pixel = ConvertViewSizeToPixel(this, dst_size);

gfx::Rect src_subrect_in_pixel =