Revert of clean up printing::Image and printing::Metafile

printing/image_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 "printing/image.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
-#include "printing/emf_win.h"
+#include "printing/metafile.h"
 #include "skia/ext/skia_utils_win.h"
 #include "ui/gfx/gdi_util.h"  // EMF support
 #include "ui/gfx/geometry/rect.h"
 
 
 namespace {
 
 // A simple class which temporarily overrides system settings.
 // The bitmap image rendered via the PlayEnhMetaFile() function depends on
 // some system settings.
@@ skipping 21 matching lines @@
  private:
   bool enable_again_;
 
   DISALLOW_COPY_AND_ASSIGN(DisableFontSmoothing);
 };
 
 }  // namespace
 
 namespace printing {
 
-bool Image::LoadMetafile(const void* metafile_src_buffer,
-                         size_t metafile_src_buffer_size) {
-  Emf metafile;
-  if (!metafile.InitFromData(metafile_src_buffer, metafile_src_buffer_size)) {
-    return false;
-  }
-  gfx::Rect rect(metafile.GetPageBounds(1));
+bool Image::LoadMetafile(const Metafile& metafile) {
+    gfx::Rect rect(metafile.GetPageBounds(1));
   DisableFontSmoothing disable_in_this_scope;
 
   // Create a temporary HDC and bitmap to retrieve the rendered data.
   base::win::ScopedCreateDC hdc(::CreateCompatibleDC(NULL));
   BITMAPV4HEADER hdr;
   DCHECK_EQ(rect.x(), 0);
   DCHECK_EQ(rect.y(), 0);
   DCHECK_GE(rect.width(), 0);  // Metafile could be empty.
   DCHECK_GE(rect.height(), 0);
 
@@ skipping 16 matching lines @@
   row_length_ = size_.width() * sizeof(uint32_t);
   size_t bytes = row_length_ * size_.height();
   DCHECK(bytes);
 
   data_.assign(bits, bits + bytes);
 
   return success;
 }
 
 }  // namespace printing