Unifying NativeMetafile class interface (as much as possible) for Linux, Mac, Win

chrome/renderer/print_web_view_helper_win.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/process_util.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ skipping 90 matching lines @@
   page_params.page_size = params.params.page_size;
   page_params.content_area = gfx::Rect(params.params.margin_left,
       params.params.margin_top, params.params.printable_size.width(),
       params.params.printable_size.height());
   page_params.has_visible_overlays = frame->isPageBoxVisible(page_number);
 
   if (!CopyMetafileDataToSharedMem(metafile.get(),
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
-  metafile->CloseEmf();
+  metafile->Close();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           page_params.metafile_data_handle,
           &page_params.metafile_data_handle))) {
     NOTREACHED() << "Send message failed.";
   }
   Send(new ViewHostMsg_DidPrintPage(routing_id(), page_params));
 }
 
 void PrintWebViewHelper::CreatePreviewDocument(
@@ skipping 51 matching lines @@
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.data_size = buf_size;
   preview_params.metafile_data_handle = NULL;
   preview_params.expected_pages_count = page_count;
 
   if (!CopyMetafileDataToSharedMem(metafile.get(),
                                    &(preview_params.metafile_data_handle))) {
     preview_params.data_size = 0;
     preview_params.expected_pages_count = 0;
   }
-  metafile->CloseEmf();
+  metafile->Close();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           preview_params.metafile_data_handle,
           &preview_params.metafile_data_handle))) {
     NOTREACHED() << "Send message failed.";
   }
   Send(new ViewHostMsg_PagesReadyForPreview(routing_id(), preview_params));
 }
 
 void PrintWebViewHelper::RenderPage(
@@ skipping 86 matching lines @@
     HGDIOBJ old_bitmap = SelectObject(bitmap_dc, hbitmap);
     RECT rect = {0, 0, width, height };
     HBRUSH whiteBrush = static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH));
     FillRect(bitmap_dc, &rect, whiteBrush);
 
     metafile2->CreateDc(NULL, NULL);
     HDC hdc = metafile2->hdc();
     DCHECK(hdc);
     skia::PlatformDevice::InitializeDC(hdc);
 
-    RECT metafile_bounds = (*metafile)->GetBounds().ToRECT();
+    RECT metafile_bounds = (*metafile)->GetPageBounds(1).ToRECT();
     // Process the old metafile, placing all non-AlphaBlend calls into the
     // new metafile, and copying the results of all the AlphaBlend calls
     // from the bitmap DC.
     EnumEnhMetaFile(hdc,
                     (*metafile)->emf(),
                     EnhMetaFileProc,
                     &bitmap_dc,
                     &metafile_bounds);
 
     SelectObject(bitmap_dc, old_bitmap);
@@ skipping 24 matching lines @@
   // Copy the bits into shared memory.
   if (!metafile->GetData(shared_buf.memory(), buf_size)) {
     NOTREACHED() << "GetData() failed";
     shared_buf.Unmap();
     return false;
   }
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
   shared_buf.Unmap();
   return true;
 }