Clean up windows printing workflow.

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 383 matching lines @@
   int dpi = printing::kPointsPerInch;
 #else
   int dpi = static_cast<int>(params->dpi);
 #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)));
 
+  double page_width = content_width_in_points + margin_left_in_points +

[Lei Zhang, 2011/01/19 21:44:03]

nit: |page_width| -> |page_width_in_points|

[kmadhusu, 2011/01/19 23:25:12]

Done.

+      margin_right_in_points;
+  double page_height = content_height_in_points + margin_top_in_points +
+      margin_bottom_in_points;
+
   params->page_size = gfx::Size(
-      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)));
+      static_cast<int>(
+          ConvertUnitDouble(page_width, printing::kPointsPerInch, dpi)),
+      static_cast<int>(
+          ConvertUnitDouble(page_height, printing::kPointsPerInch, dpi)));
 
   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,
                                            WebNode* node) {
   ViewMsg_PrintPages_Params settings;
@@ skipping 108 matching lines @@
         shared_buf.GiveToProcess(base::GetCurrentProcessHandle(),
                                  shared_mem_handle);
         return true;
       }
     }
   }
   NOTREACHED();
   return false;
 }
 #endif