diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 21:54:52 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 21:54:52 +0000 |
| commit | d24adc83e7de8b042739c96f37588dee5ba091b3 (patch) | |
| tree | e82cf26051eb22ce33a61a3f2816c39e6135675f /content/browser/renderer_host/render_widget_host_view_browsertest.cc | |
| parent | fc28c977a4969a3ff4c4e8dee98fe67ce111ed86 (diff) | |
| download | chromium_src-d24adc83e7de8b042739c96f37588dee5ba091b3.zip chromium_src-d24adc83e7de8b042739c96f37588dee5ba091b3.tar.gz chromium_src-d24adc83e7de8b042739c96f37588dee5ba091b3.tar.bz2 | |
Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"
> Remove dependency on ui::ScaleFactor from ui/gfx
>
> As part of the work to removed dependencies on ui/base from ui/gfx I have
> changed the public api to Canvas, ImageSkia, ImageSkiaRep and ImagePNGRep
> to take float scale values instead of ui::ScaleFactor.
>
> The notion of supported scale factors has been broken into 2 parts.
> ui::SetSupportedScaleFactors remains and calls the
> new ImageSkia::SetSupportedScales().
>
> The initialization of the supported scale factors has been moved from layout.h
> into ResourceBundle, and is done explicitly in tests that don't use
> ResourceBundle.
>
> BUG=103304
> R=ben@chromium.org, oshima@chromium.org, sky@chromium.org
>
> Review URL: https://codereview.chromium.org/24175004
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/24262008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224499 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_view_browsertest.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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 0db748f..0fe376e 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -57,7 +57,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::GetImageScale( \ + if (ui::GetScaleFactorScale( \ GetScaleFactorForView(GetRenderWidgetHostViewPort())) != factor) { \ LOG(WARNING) << "Blindly passing this test: failed to set up " \ "scale factor: " << factor; \ |