Use DPI from Print Preview on Windows, handle non square

components/printing/renderer/print_web_view_helper.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 "components/printing/renderer/print_web_view_helper.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 271 matching lines @@
 }
 
 void ComputeWebKitPrintParamsInDesiredDpi(
     const PrintMsg_Print_Params& print_params,
     blink::WebPrintParams* webkit_print_params) {
   int dpi = GetDPI(&print_params);
   webkit_print_params->printerDPI = dpi;
   webkit_print_params->rasterizePDF = print_params.rasterize_pdf;
   webkit_print_params->printScalingOption = print_params.print_scaling_option;
 
-  webkit_print_params->printContentArea.width = ConvertUnit(
-      print_params.content_size.width(), dpi, print_params.desired_dpi);
-  webkit_print_params->printContentArea.height = ConvertUnit(
-      print_params.content_size.height(), dpi, print_params.desired_dpi);
+  webkit_print_params->printContentArea.width =
+      ConvertUnit(print_params.content_size.width(), dpi, kPointsPerInch);

[Lei Zhang, 2017/03/31 22:21:13]

By doing this, I don't think there are any more users of the desired_dpi field
in PrintMsg_Print_Params.

[rbpotter, 2017/04/01 00:08:01]

Acknowledged.

+  webkit_print_params->printContentArea.height =
+      ConvertUnit(print_params.content_size.height(), dpi, kPointsPerInch);
 
-  webkit_print_params->printableArea.x = ConvertUnit(
-      print_params.printable_area.x(), dpi, print_params.desired_dpi);
-  webkit_print_params->printableArea.y = ConvertUnit(
-      print_params.printable_area.y(), dpi, print_params.desired_dpi);
-  webkit_print_params->printableArea.width = ConvertUnit(
-      print_params.printable_area.width(), dpi, print_params.desired_dpi);
-  webkit_print_params->printableArea.height = ConvertUnit(
-      print_params.printable_area.height(), dpi, print_params.desired_dpi);
+  webkit_print_params->printableArea.x =
+      ConvertUnit(print_params.printable_area.x(), dpi, kPointsPerInch);
+  webkit_print_params->printableArea.y =
+      ConvertUnit(print_params.printable_area.y(), dpi, kPointsPerInch);
+  webkit_print_params->printableArea.width =
+      ConvertUnit(print_params.printable_area.width(), dpi, kPointsPerInch);
+  webkit_print_params->printableArea.height =
+      ConvertUnit(print_params.printable_area.height(), dpi, kPointsPerInch);
 
-  webkit_print_params->paperSize.width = ConvertUnit(
-      print_params.page_size.width(), dpi, print_params.desired_dpi);
-  webkit_print_params->paperSize.height = ConvertUnit(
-      print_params.page_size.height(), dpi, print_params.desired_dpi);
+  webkit_print_params->paperSize.width =
+      ConvertUnit(print_params.page_size.width(), dpi, kPointsPerInch);
+  webkit_print_params->paperSize.height =
+      ConvertUnit(print_params.page_size.height(), dpi, kPointsPerInch);
 }
 
 blink::WebPlugin* GetPlugin(const blink::WebLocalFrame* frame) {
   return frame->document().isPluginDocument()
              ? frame->document().to<blink::WebPluginDocument>().plugin()
              : NULL;
 }
 
 bool PrintingNodeOrPdfFrame(const blink::WebLocalFrame* frame,
                             const blink::WebNode& node) {
@@ skipping 2049 matching lines @@
       blink::WebConsoleMessage::LevelWarning, message));
   return false;
 }
 
 void PrintWebViewHelper::ScriptingThrottler::Reset() {
   // Reset counter on successful print.
   count_ = 0;
 }
 
 }  // namespace printing