Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Unified Diff: ui/base/native_theme/native_theme_android.cc

Issue 10946019: Don't return unsupported scales frrom GetScaleFactorFromScale() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleaned up Created 8 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
Index: ui/base/native_theme/native_theme_android.cc
diff --git a/ui/base/native_theme/native_theme_android.cc b/ui/base/native_theme/native_theme_android.cc
index 79b1067d4c838b0374540c76e8a2c0eda5479976..e95e5e32aa5dc4b623eb8899cc5bae1b7de7794d 100644
--- a/ui/base/native_theme/native_theme_android.cc
+++ b/ui/base/native_theme/native_theme_android.cc
@@ -669,7 +669,7 @@ void NativeThemeAndroid::DrawImageInt(SkCanvas* sk_canvas,
// TODO(pkotwicz): Do something better and don't infer device
// scale factor from canvas scale.
SkMatrix m = sk_canvas->getTotalMatrix();
- ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
+ ui::ScaleFactor device_scale_factor = ui::GetSupportedScaleFactorFromScale(
SkScalarAbs(m.getScaleX()));
scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
sk_canvas, device_scale_factor));
@@ -690,7 +690,7 @@ void NativeThemeAndroid::DrawTiledImage(SkCanvas* sk_canvas,
// TODO(pkotwicz): Do something better and don't infer device
// scale factor from canvas scale.
SkMatrix m = sk_canvas->getTotalMatrix();
- ui::ScaleFactor device_scale_factor = ui::GetScaleFactorFromScale(
+ ui::ScaleFactor device_scale_factor = ui::GetSupportedScaleFactorFromScale(
SkScalarAbs(m.getScaleX()));
scoped_ptr<gfx::Canvas> canvas(gfx::Canvas::CreateCanvasWithoutScaling(
sk_canvas, device_scale_factor));
« ui/base/layout.cc ('K') | « ui/base/layout_unittest.cc ('k') | ui/ui_unittests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698