Cleanup PrintWebViewHelper.

chrome/renderer/print_web_view_helper_win.cc

Index: chrome/renderer/print_web_view_helper_win.cc
===================================================================
--- chrome/renderer/print_web_view_helper_win.cc	(revision 75320)
+++ chrome/renderer/print_web_view_helper_win.cc	(working copy)
@@ -8,21 +8,18 @@
 #include "base/process_util.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "chrome/renderer/render_view.h"
-#include "grit/generated_resources.h"
-#include "printing/native_metafile.h"
 #include "printing/units.h"
 #include "skia/ext/vector_canvas.h"
 #include "skia/ext/vector_platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "ui/gfx/gdi_util.h"
-#include "ui/gfx/size.h"
 
 using printing::ConvertUnitDouble;
 using printing::kPointsPerInch;
 using WebKit::WebFrame;
-using WebKit::WebString;
 
+namespace {
+
 int CALLBACK EnhMetaFileProc(HDC dc,
                              HANDLETABLE* handle_table,
                              const ENHMETARECORD *record,
@@ -63,6 +60,8 @@
   return 1;  // Continue enumeration
 }
 
+}  // namespace
+
 void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
                                    const gfx::Size& canvas_size,
                                    WebFrame* frame) {
@@ -92,7 +91,6 @@
 
   ViewHostMsg_DidPrintPage_Params page_params;
   page_params.data_size = buf_size;
-  page_params.metafile_data_handle = NULL;

[Lei Zhang, 2011/02/18 06:55:34]

Already initialized to INVALID_HANDLE_VALUE.

   page_params.page_number = page_number;
   page_params.document_cookie = params.params.document_cookie;
   page_params.actual_shrink = scale_factor;
@@ -169,7 +167,6 @@
   ViewHostMsg_DidPreviewDocument_Params preview_params;
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.data_size = buf_size;
-  preview_params.metafile_data_handle = NULL;
 
   if (!CopyMetafileDataToSharedMem(metafile.get(),
                                    &(preview_params.metafile_data_handle))) {
@@ -261,18 +258,16 @@
     // Page used alpha blend, but printer doesn't support it.  Rewrite the
     // metafile and flatten out the transparency.
     HDC bitmap_dc = CreateCompatibleDC(GetDC(NULL));
-    if (!bitmap_dc) {
+    if (!bitmap_dc)
       NOTREACHED() << "Bitmap DC creation failed";
-    }
     SetGraphicsMode(bitmap_dc, GM_ADVANCED);
     void* bits = NULL;
     BITMAPINFO hdr;
     gfx::CreateBitmapHeader(width, height, &hdr.bmiHeader);
     HBITMAP hbitmap = CreateDIBSection(
         bitmap_dc, &hdr, DIB_RGB_COLORS, &bits, NULL, 0);
-    if (!hbitmap) {
+    if (!hbitmap)
       NOTREACHED() << "Raster bitmap creation for printing failed";
-    }
 
     HGDIOBJ old_bitmap = SelectObject(bitmap_dc, hbitmap);
     RECT rect = {0, 0, width, height };