summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/renderer/pepper/ppb_pdf_impl.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/pepper/ppb_pdf_impl.cc b/chrome/renderer/pepper/ppb_pdf_impl.cc
index d0c9341..3f03f71 100644
--- a/chrome/renderer/pepper/ppb_pdf_impl.cc
+++ b/chrome/renderer/pepper/ppb_pdf_impl.cc
@@ -360,10 +360,6 @@ void SaveAs(PP_Instance instance_id) {
PP_Bool IsFeatureEnabled(PP_Instance instance, PP_PDFFeature feature) {
switch (feature) {
case PP_PDFFEATURE_HIDPI:
-#if defined(OS_WIN)
- // Disable this for Windows until scaled resources become available.
- return PP_FALSE;
-#endif
return PP_TRUE;
case PP_PDFFEATURE_PRINTING:
return IsPrintingEnabled(instance) ? PP_TRUE : PP_FALSE;
@@ -374,6 +370,10 @@ PP_Bool IsFeatureEnabled(PP_Instance instance, PP_PDFFeature feature) {
PP_Resource GetResourceImageForScale(PP_Instance instance_id,
PP_ResourceImage image_id,
float scale) {
+ ui::ScaleFactor supported_scale_factor = ui::GetSupportedScaleFactor(scale);
+ DCHECK(supported_scale_factor != ui::SCALE_FACTOR_NONE);
+ float supported_scale = ui::GetImageScale(supported_scale_factor);
+
int res_id = 0;
for (size_t i = 0; i < arraysize(kResourceImageMap); ++i) {
if (kResourceImageMap[i].pp_id == image_id) {
@@ -396,7 +396,7 @@ PP_Resource GetResourceImageForScale(PP_Instance instance_id,
if (!res_image_skia)
return 0;
- return instance->CreateImage(res_image_skia, scale);
+ return instance->CreateImage(res_image_skia, supported_scale);
}
PP_Resource GetResourceImage(PP_Instance instance_id,