Cleanup NativeMetafile (win) interface and EMF class.

chrome/utility/utility_thread.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/utility/utility_thread.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 12 matching lines @@
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/idb_bindings.h"
 #include "webkit/glue/image_decoder.h"
 
 #if defined(OS_WIN)
 #include "app/win/iat_patch_function.h"
 #include "base/scoped_ptr.h"
 #include "base/win/scoped_handle.h"
-#include "printing/native_metafile_factory.h"
-#include "printing/native_metafile.h"
+#include "printing/emf_win.h"
 #endif
 
 namespace {
 
 template<typename SRC, typename DEST>
 void ConvertVector(const SRC& src, DEST* dest) {
   dest->reserve(src.size());
   for (typename SRC::const_iterator i = src.begin(); i != src.end(); ++i)
     dest->push_back(typename DEST::value_type(*i));
 }
@@ skipping 205 matching lines @@
   buffer.resize(length);
   DWORD bytes_read = 0;
   if (!ReadFile(pdf_file, &buffer.front(), length, &bytes_read, NULL) ||
       (bytes_read != length))
     return false;
 
   int total_page_count = 0;
   if (!get_info_proc(&buffer.front(), buffer.size(), &total_page_count, NULL))
     return false;
 
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
-  metafile->CreateFileBackedDc(NULL, NULL, metafile_path);
+  printing::Emf metafile;
+  metafile.Init(metafile_path);
   // Since we created the metafile using the screen DPI (but we actually want
   // the PDF DLL to print using the passed in render_dpi, we apply the following
   // transformation.
-  SetGraphicsMode(metafile->context(), GM_ADVANCED);
+  SetGraphicsMode(metafile.context(), GM_ADVANCED);
   XFORM xform = {0};
   int screen_dpi = GetDeviceCaps(GetDC(NULL), LOGPIXELSX);
   xform.eM11 = xform.eM22 =
       static_cast<float>(screen_dpi) / static_cast<float>(render_dpi);
-  ModifyWorldTransform(metafile->context(), &xform, MWT_LEFTMULTIPLY);
+  ModifyWorldTransform(metafile.context(), &xform, MWT_LEFTMULTIPLY);
 
   bool ret = false;
   std::vector<printing::PageRange>::const_iterator iter;
   for (iter = page_ranges.begin(); iter != page_ranges.end(); ++iter) {
     for (int page_number = iter->from; page_number <= iter->to; ++page_number) {
       if (page_number >= total_page_count)
         break;
-      metafile->StartPage();
+      metafile.StartPage();
       if (render_proc(&buffer.front(), buffer.size(), page_number,
-                      metafile->context(), render_dpi, render_dpi,
+                      metafile.context(), render_dpi, render_dpi,
                       render_area.x(), render_area.y(), render_area.width(),
                       render_area.height(), true, false, true, true))
         if (*highest_rendered_page_number < page_number)
           *highest_rendered_page_number = page_number;
         ret = true;
-      metafile->FinishPage();
+      metafile.FinishPage();
     }
   }
-  metafile->Close();
+  metafile.Close();
   return ret;
 }
 #endif  // defined(OS_WIN)
 
 void UtilityThread::OnIDBKeysFromValuesAndKeyPath(
     int id,
     const std::vector<SerializedScriptValue>& serialized_script_values,
     const string16& idb_key_path) {
   std::vector<WebKit::WebSerializedScriptValue> web_values;
   ConvertVector(serialized_script_values, &web_values);
@@ skipping 38 matching lines @@
   } else {
     Send(new UtilityHostMsg_GetPrinterCapsAndDefaults_Failed(printer_name));
   }
   ReleaseProcessIfNeeded();
 }
 
 void UtilityThread::ReleaseProcessIfNeeded() {
   if (!batch_mode_)
     ChildProcess::current()->ReleaseProcess();
 }