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

Unified Diff: chrome/renderer/pepper/pepper_pdf_host.cc

Issue 24175004: Remove dependency on ui::ScaleFactor from ui/gfx (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix new usage of scale in FastShowPickler 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 | « chrome/common/icon_with_badge_image_source.cc ('k') | content/browser/aura/software_output_device_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/pepper/pepper_pdf_host.cc
diff --git a/chrome/renderer/pepper/pepper_pdf_host.cc b/chrome/renderer/pepper/pepper_pdf_host.cc
index 9b78c93d579a3d2c9f4e4c72718c623e53bfbac8..e187c52085b7ac4d440c21f0b459108916ccd7dc 100644
--- a/chrome/renderer/pepper/pepper_pdf_host.cc
+++ b/chrome/renderer/pepper/pepper_pdf_host.cc
@@ -296,18 +296,15 @@ int32_t PepperPDFHost::OnHostMsgGetResourceImage(
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_factor);
+ gfx::ImageSkiaRep image_skia_rep = res_image_skia->GetRepresentation(scale);
- if (image_skia_rep.is_null() || image_skia_rep.scale_factor() != scale_factor)
+ if (image_skia_rep.is_null() || image_skia_rep.scale() != scale)
return PP_ERROR_FAILED;
PP_Size pp_size;
« no previous file with comments | « chrome/common/icon_with_badge_image_source.cc ('k') | content/browser/aura/software_output_device_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698