Remove desired DPI

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 102 matching lines @@
   // on dpi.
   return kPointsPerInch;
 #else
   return static_cast<int>(print_params->dpi);
 #endif  // defined(OS_MACOSX)
 }
 
 bool PrintMsg_Print_Params_IsValid(const PrintMsg_Print_Params& params) {
   return !params.content_size.IsEmpty() && !params.page_size.IsEmpty() &&
          !params.printable_area.IsEmpty() && params.document_cookie &&
-         params.desired_dpi && params.dpi && params.margin_top >= 0 &&
-         params.margin_left >= 0 && params.dpi > kMinDpi &&
-         params.document_cookie != 0;
+         params.dpi && params.margin_top >= 0 && params.margin_left >= 0 &&
+         params.dpi > kMinDpi && params.document_cookie != 0;
 }
 
 // Helper function to check for fit to page
 bool IsWebPrintScalingOptionFitToPage(const PrintMsg_Print_Params& params) {
   return params.print_scaling_option ==
          blink::WebPrintScalingOptionFitToPrintableArea;
 }
 
 PrintMsg_Print_Params GetCssPrintParams(
     blink::WebLocalFrame* frame,
@@ skipping 146 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);
+  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