pdf: Use the default resource if high-dpi resources are unavailable.

pdf/instance.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/instance.h"
 
 #include <algorithm>  // for min()
 #define _USE_MATH_DEFINES  // for M_PI
 #include <cmath>      // for log() and pow()
 #include <math.h>
@@ skipping 2486 matching lines @@
     for (size_t i = chrome_page_zoom::kPresetZoomFactorsSize; i > 0; --i) {
       double current_zoom = chrome_page_zoom::kPresetZoomFactors[i - 1];
       if (current_zoom + content::kEpsilon < zoom_)
         return current_zoom;
     }
   }
   return zoom_;
 }
 
 pp::ImageData Instance::CreateResourceImage(PP_ResourceImage image_id) {
+  pp::ImageData resource_data;
   if (hidpi_enabled_)
-    return pp::PDF::GetResourceImageForScale(this, image_id, device_scale_);
+    resource_data =

[Lei Zhang, 2014/08/20 04:21:17]

nit: braces around the if block body.

[sadrul, 2014/08/20 04:44:40]

Done.

+        pp::PDF::GetResourceImageForScale(this, image_id, device_scale_);
 
-  return pp::PDF::GetResourceImage(this, image_id);
+  return resource_data.data() ? resource_data
+                              : pp::PDF::GetResourceImage(this, image_id);
 }
 
 std::string Instance::GetLocalizedString(PP_ResourceString id) {
   pp::Var rv(pp::PDF::GetLocalizedString(this, id));
   if (!rv.is_string())
     return std::string();
 
   return rv.AsString();
 }
 
@@ skipping 201 matching lines @@
   return instance_->HasScriptableMethod(name, exception);
 }
 
 pp::Var PDFScriptableObject::Call(const pp::Var& method,
                                   const std::vector<pp::Var>& args,
                                   pp::Var* exception) {
   return instance_->CallScriptableMethod(method, args, exception);
 }
 
 }  // namespace chrome_pdf