content/browser/renderer_host/render_widget_host_view_browsertest.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_browsertest.cc

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

Patch Set: Rename methods and vars to make image_scale more clear 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_info_util.cc ('K') | « content/browser/renderer_host/render_widget_host_view_android.cc ('k') | content/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | ui/gfx/canvas.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_browsertest.cc

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

index 9adc504be7bd0e346b7c5b9f150eedf7300603da..33e3d18d6b1f392fe8983b7afe7f064ba107e5f5 100644

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

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

@@ -56,7 +56,7 @@ namespace {

// Convenience macro: Short-circuit a pass for platforms where setting up

// high-DPI fails.

#define PASS_TEST_IF_SCALE_FACTOR_NOT_SUPPORTED(factor) \

- if (ui::GetScaleFactorScale( \

+ if (ui::GetImageScale( \

GetScaleFactorForView(GetRenderWidgetHostViewPort())) != factor) { \

LOG(WARNING) << "Blindly passing this test: failed to set up " \

"scale factor: " << factor; \