Refactor UpdatePrintableSizeInPrintParameters() function in print_web_view_helper.cc

chrome/renderer/print_web_view_helper.cc

 // Copyright (c) 2010 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 "chrome/renderer/print_web_view_helper.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 350 matching lines @@
   double margin_top_in_points;
   double margin_right_in_points;
   double margin_bottom_in_points;
   double margin_left_in_points;
   PrepareFrameAndViewForPrint prepare(*params, frame, frame->view());
   PrintWebViewHelper::GetPageSizeAndMarginsInPoints(frame, 0, *params,
       &content_width_in_points, &content_height_in_points,
       &margin_top_in_points, &margin_right_in_points,
       &margin_bottom_in_points, &margin_left_in_points);
 
+  int dpi = static_cast<int>(params->dpi);

[Lei Zhang, 2011/01/11 22:17:25]

you can rewrite this as:

int dpi =
#if defined(OS_MACOSX)
...
#else
...
#endif

[kmadhusu, 2011/01/11 23:55:54]

Done.

 #if defined(OS_MACOSX)
+  // On the Mac, the printable area is in points, don't do any scaling based
+  // on dpi.
+  dpi = printing::kPointsPerInch;
+#endif  // defined(OS_MACOSX)
+  params->printable_size = gfx::Size(
+      static_cast<int>(ConvertUnitDouble(content_width_in_points,
+          printing::kPointsPerInch, dpi)),
+      static_cast<int>(ConvertUnitDouble(content_height_in_points,
+          printing::kPointsPerInch, dpi)));
+
   params->page_size = gfx::Size(
-      static_cast<int>(content_width_in_points +
-          margin_left_in_points + margin_right_in_points),
-      static_cast<int>(content_height_in_points +
-          margin_top_in_points + margin_bottom_in_points));
+      static_cast<int>(ConvertUnitDouble(content_width_in_points +
+          margin_left_in_points + margin_right_in_points,
+          printing::kPointsPerInch, dpi)),
+      static_cast<int>(ConvertUnitDouble(content_height_in_points +
+          margin_top_in_points + margin_bottom_in_points,
+          printing::kPointsPerInch, dpi)));
 
-  params->printable_size = gfx::Size(static_cast<int>(content_width_in_points),
-      static_cast<int>(content_height_in_points));
-#else
-  params->printable_size = gfx::Size(
-      static_cast<int>(ConvertUnitDouble(
-          content_width_in_points, printing::kPointsPerInch, params->dpi)),
-      static_cast<int>(ConvertUnitDouble(
-          content_height_in_points, printing::kPointsPerInch, params->dpi)));
-#endif
-  params->margin_top = static_cast<int>(margin_top_in_points);
-  params->margin_left = static_cast<int>(margin_left_in_points);
+  params->margin_top = static_cast<int>(ConvertUnitDouble(
+      margin_top_in_points, printing::kPointsPerInch, dpi));
+  params->margin_left = static_cast<int>(ConvertUnitDouble(
+      margin_left_in_points, printing::kPointsPerInch, dpi));
 }
 
 bool PrintWebViewHelper::InitPrintSettings(WebFrame* frame) {
   ViewMsg_PrintPages_Params settings;
   if (GetDefaultPrintSettings(frame, &settings.params)) {
     print_pages_params_.reset(new ViewMsg_PrintPages_Params(settings));
     print_pages_params_->pages.clear();
     return true;
   }
   return false;
@@ skipping 99 matching lines @@
         shared_buf.GiveToProcess(base::GetCurrentProcessHandle(),
                                  shared_mem_handle);
         return true;
       }
     }
   }
   NOTREACHED();
   return false;
 }
 #endif