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

printing/image.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef PRINTING_IMAGE_H_
 #define PRINTING_IMAGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
-#include "printing/native_metafile.h"
+#include "printing/metafile.h"

[Lei Zhang, 2011/04/11 02:51:10]

forward declare instead?

[vandebo (ex-Chrome), 2011/04/11 06:16:08]

Done.

 #include "ui/gfx/size.h"
 
 class FilePath;
 
 namespace printing {
 
 // Lightweight raw-bitmap management. The image, once initialized, is immutable.
 // The main purpose is testing image contents.
 class Image {
  public:
   // Creates the image from the given file on disk.  Uses extension to
   // defer file type. PNG and EMF (on Windows) currently supported.
   // If image loading fails size().IsEmpty() will be true.
   explicit Image(const FilePath& path);
 
   // Creates the image from the metafile.  Deduces bounds based on bounds in
   // metafile.  If loading fails size().IsEmpty() will be true.
-  explicit Image(const NativeMetafile& metafile);
+  explicit Image(const Metafile& metafile);
 
   // Copy constructor.
   explicit Image(const Image& image);
 
   ~Image();
 
   const gfx::Size& size() const {
     return size_;
   }
 
@@ skipping 24 matching lines @@
 
  private:
   // Construct from metafile.  This is kept internal since it's ambiguous what
   // kind of data is used (png, bmp, metafile etc).
   Image(const void* data, size_t size);
 
   bool LoadPng(const std::string& compressed);
 
   bool LoadMetafile(const std::string& data);
 
-  bool LoadMetafile(const NativeMetafile& metafile);
+  bool LoadMetafile(const Metafile& metafile);
 
   // Pixel dimensions of the image.
   gfx::Size size_;
 
   // Length of a line in bytes.
   int row_length_;
 
   // Actual bitmap data in arrays of RGBAs (so when loaded as uint32, it's
   // 0xABGR).
   std::vector<unsigned char> data_;
 
   // Flag to signal if the comparison functions should ignore the alpha channel.
   const bool ignore_alpha_;  // Currently always true.
 
   // Prevent operator= (this function has no implementation)
   Image& operator=(const Image& image);
 };
 
 }  // namespace printing
 
 #endif  // PRINTING_IMAGE_H_