Merge https://codereview.chromium.org/935663003/ to XFA branch.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/946103003

1 files changed, 3 insertions, 5 deletions

diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index 10515946b3..d861f2f5c9 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -501,14 +501,12 @@ void RenderPdf(const std::string& name, const char* pBuf, size_t len,
     FORM_OnAfterLoadPage(page, form);
     FORM_DoPageAAction(page, form, FPDFPAGE_AACTION_OPEN);
 
-    int width = static_cast<int>(FPDF_GetPageWidth(page));
-    int height = static_cast<int>(FPDF_GetPageHeight(page));
+    double scale = 1.0;
     if (!options.scale_factor_as_string.empty()) {
-      double scale = 1.0;
       std::stringstream(options.scale_factor_as_string) >> scale;
-      width *= scale;
-      height *= scale;
     }
+    int width = static_cast<int>(FPDF_GetPageWidth(page) * scale);
+    int height = static_cast<int>(FPDF_GetPageHeight(page) * scale);
 
     FPDF_BITMAP bitmap = FPDFBitmap_Create(width, height, 0);
     FPDFBitmap_FillRect(bitmap, 0, 0, width, height, 0xFFFFFFFF);