ugrr... Fixing printing scaling again.

webkit/plugins/ppapi/ppapi_plugin_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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 20 matching lines @@
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 #include "ppapi/shared_impl/ppb_url_util_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
 #include "ppapi/shared_impl/ppp_instance_combined.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/scoped_pp_resource.h"
 #include "ppapi/shared_impl/time_conversion.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_buffer_api.h"
+#include "printing/custom_scaling.h"
 #include "printing/units.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebElement.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGamepads.h"
@@ skipping 1410 matching lines @@
     gfx::Size size_in_pixels;
     size_in_pixels.set_width(printing::ConvertUnit(
         current_print_settings_.printable_area.size.width,
         static_cast<int>(printing::kPointsPerInch),
         current_print_settings_.dpi));
     size_in_pixels.set_height(printing::ConvertUnit(
         current_print_settings_.printable_area.size.height,
         static_cast<int>(printing::kPointsPerInch),
         current_print_settings_.dpi));
     // We need to scale down DC to fit an entire page into DC available area.
+    // First, we'll try to use default scaling based on the 72dpi that is
+    // used in webkit for printing.
+    // If default scaling is not enough to fit the entire PDF without
     // Current metafile is based on screen DC and have current screen size.
     // Writing outside of those boundaries will result in the cut-off output.
     // On metafiles (this is the case here), scaling down will still record
     // original coordinates and we'll be able to print in full resolution.
     // Before playback we'll need to counter the scaling up that will happen
     // in the browser (printed_document_win.cc).
-    gfx::ScaleDC(dc, gfx::CalculatePageScale(dc, size_in_pixels.width(),
-                                             size_in_pixels.height()));
+    double dynamic_scale = gfx::CalculatePageScale(dc, size_in_pixels.width(),
+                                                   size_in_pixels.height());
+    double page_scale = static_cast<double>(printing::kPointsPerInch) /
+        static_cast<double>(current_print_settings_.dpi);
+
+    if (dynamic_scale < page_scale) {
+      page_scale = dynamic_scale;
+      printing::SetCustomPrintingPageScale(page_scale);
+    }
+
+    gfx::ScaleDC(dc, page_scale);
 
     ret = render_proc(static_cast<unsigned char*>(mapper.data()), mapper.size(),
                       0, dc, current_print_settings_.dpi,
                       current_print_settings_.dpi, 0, 0, size_in_pixels.width(),
                       size_in_pixels.height(), true, false, true, true, true);
     skia::EndPlatformPaint(canvas);
   }
 #endif  // defined(OS_WIN)
 
   return ret;
@@ skipping 569 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit