Revert 78666 - Cleanup NativeMetafile (win) interface and EMF class.

- Rename CreateDc to Init() and remove unused argument (all non-test calls were CreateDc(NULL, NULL).  [This matches cross platform interface.]
- Remove CreateFileBackedDc from the NativeMetafile interface and make InitToFile() in the EMF class.
- Remove CreateFromFile from the NativeMetafile interface and make it InitFromFile() in the EMF class.
- Move the CloseEmf method into the destructor, making the Emf class a use once class (matches actual use).

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6695013

TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/6712030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78669 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index f248da94..72e3399 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -71,7 +71,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
   // Each metafile contains a single page.
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init();
+  metafile->CreateDc(NULL, NULL);
   DCHECK(metafile->context());
   skia::PlatformDevice::InitializeDC(metafile->context());
 
@@ -108,6 +108,7 @@ void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
                                    &(page_params.metafile_data_handle))) {
     page_params.data_size = 0;
   }
+  metafile->CloseEmf();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           page_params.metafile_data_handle,
@@ -138,7 +139,7 @@ void PrintWebViewHelper::CreatePreviewDocument(
   // http://code.google.com/p/chromium/issues/detail?id=62889
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init();
+  metafile->CreateDc(NULL, NULL);
   DCHECK(metafile->context());
   skia::PlatformDevice::InitializeDC(metafile->context());
 
@@ -180,6 +181,7 @@ void PrintWebViewHelper::CreatePreviewDocument(
     preview_params.data_size = 0;
     preview_params.expected_pages_count = 0;
   }
+  metafile->CloseEmf();
   if (!Send(new ViewHostMsg_DuplicateSection(
           routing_id(),
           preview_params.metafile_data_handle,
@@ -287,7 +289,7 @@ void PrintWebViewHelper::RenderPage(
     HBRUSH whiteBrush = static_cast<HBRUSH>(GetStockObject(WHITE_BRUSH));
     FillRect(bitmap_dc, &rect, whiteBrush);
 
-    metafile2->Init();
+    metafile2->CreateDc(NULL, NULL);
     HDC hdc = metafile2->context();
     DCHECK(hdc);
     skia::PlatformDevice::InitializeDC(hdc);