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

Unified Diff: trunk/src/chrome/renderer/pepper/pepper_pdf_host.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
Index: trunk/src/chrome/renderer/pepper/pepper_pdf_host.cc
===================================================================
--- trunk/src/chrome/renderer/pepper/pepper_pdf_host.cc (revision 224498)
+++ trunk/src/chrome/renderer/pepper/pepper_pdf_host.cc (working copy)
@@ -296,15 +296,18 @@
if (res_id == 0)
return PP_ERROR_FAILED;
+ ui::ScaleFactor scale_factor = ui::GetScaleFactorFromScale(scale);
+
gfx::ImageSkia* res_image_skia =
ResourceBundle::GetSharedInstance().GetImageSkiaNamed(res_id);
if (!res_image_skia)
return PP_ERROR_FAILED;
- gfx::ImageSkiaRep image_skia_rep = res_image_skia->GetRepresentation(scale);
+ gfx::ImageSkiaRep image_skia_rep = res_image_skia->GetRepresentation(
+ scale_factor);
- if (image_skia_rep.is_null() || image_skia_rep.scale() != scale)
+ if (image_skia_rep.is_null() || image_skia_rep.scale_factor() != scale_factor)
return PP_ERROR_FAILED;
PP_Size pp_size;
« no previous file with comments | « trunk/src/chrome/common/icon_with_badge_image_source.cc ('k') | trunk/src/content/browser/aura/software_output_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698