Connect the right metafiles for print preview on Linux and Windows.

printing/image.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 "base/file_util.h"
 #include "base/md5.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
-#include "printing/native_metafile_factory.h"
+#include "printing/metafile.h"
+#include "printing/metafile_impl.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace printing {
 
 Image::Image(const FilePath& path)
     : row_length_(0),
       ignore_alpha_(true) {
   std::string data;
   file_util::ReadFileToString(path, &data);
   bool success = false;
   if (path.MatchesExtension(FILE_PATH_LITERAL(".png"))) {
     success = LoadPng(data);
   } else if (path.MatchesExtension(FILE_PATH_LITERAL(".emf"))) {
     success = LoadMetafile(data);
   } else {
     DCHECK(false);
   }
   if (!success) {
     size_.SetSize(0, 0);
     row_length_ = 0;
     data_.clear();
   }
 }
 
-Image::Image(const NativeMetafile& metafile)
+Image::Image(const Metafile& metafile)
     : row_length_(0),
       ignore_alpha_(true) {
   LoadMetafile(metafile);
 }
 
 Image::Image(const Image& image)
     : size_(image.size_),
       row_length_(image.row_length_),
       data_(image.data_),
       ignore_alpha_(image.ignore_alpha_) {
@@ skipping 91 matching lines @@
   bool success = gfx::PNGCodec::Decode(
       reinterpret_cast<const unsigned char*>(compressed.c_str()),
       compressed.size(), gfx::PNGCodec::FORMAT_BGRA, &data_, &w, &h);
   size_.SetSize(w, h);
   row_length_ = size_.width() * sizeof(uint32);
   return success;
 }
 
 bool Image::LoadMetafile(const std::string& data) {
   DCHECK(!data.empty());
-  scoped_ptr<NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateFromData(data.data(),
-                                                      data.size()));
-  if(!metafile.get())
+  printing::NativeMetafile metafile;
+  if (!metafile.InitFromData(data.data(), data.size()))
     return false;
-  return LoadMetafile(*metafile);
+  return LoadMetafile(metafile);
 }
 
 }  // namespace printing