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

Unified Diff: trunk/src/ui/gfx/image/image_util.cc

Issue 24262008: Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/ui/gfx/image/image_unittest_util.cc ('k') | trunk/src/ui/gfx/skia_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/gfx/image/image_util.cc
===================================================================
--- trunk/src/ui/gfx/image/image_util.cc (revision 224498)
+++ trunk/src/ui/gfx/image/image_util.cc (working copy)
@@ -26,8 +26,8 @@
bool JPEG1xEncodedDataFromImage(const Image& image, int quality,
std::vector<unsigned char>* dst) {
const gfx::ImageSkiaRep& image_skia_rep =
- image.AsImageSkia().GetRepresentation(1.0f);
- if (image_skia_rep.scale() != 1.0f)
+ image.AsImageSkia().GetRepresentation(ui::SCALE_FACTOR_100P);
+ if (image_skia_rep.scale_factor() != ui::SCALE_FACTOR_100P)
return false;
const SkBitmap& bitmap = image_skia_rep.sk_bitmap();
« no previous file with comments | « trunk/src/ui/gfx/image/image_unittest_util.cc ('k') | trunk/src/ui/gfx/skia_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698