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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« chrome/browser/extensions/extension_icon_image.h ('K') | « ui/gfx/image/image_unittest_util.cc ('k') | ui/gfx/skia_util.cc » ('j') | ui/views/controls/button/image_button.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_util.cc
diff --git a/ui/gfx/image/image_util.cc b/ui/gfx/image/image_util.cc
index e230a0b12643f637de72c055bde15f54f059a310..59d631d171df572b7912e4119a2df1966b74798f 100644
--- a/ui/gfx/image/image_util.cc
+++ b/ui/gfx/image/image_util.cc
@@ -26,8 +26,8 @@ Image ImageFrom1xJPEGEncodedData(const unsigned char* input,
bool JPEG1xEncodedDataFromImage(const Image& image, int quality,
std::vector<unsigned char>* dst) {
const gfx::ImageSkiaRep& image_skia_rep =
- image.AsImageSkia().GetRepresentation(ui::SCALE_FACTOR_100P);
- if (image_skia_rep.scale_factor() != ui::SCALE_FACTOR_100P)
+ image.AsImageSkia().GetRepresentation(1.0f);
+ if (image_skia_rep.scale() != 1.0f)
return false;
const SkBitmap& bitmap = image_skia_rep.sk_bitmap();
« chrome/browser/extensions/extension_icon_image.h ('K') | « ui/gfx/image/image_unittest_util.cc ('k') | ui/gfx/skia_util.cc » ('j') | ui/views/controls/button/image_button.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698