Cleanup NativeMetafile (win) interface and EMF class.

printing/emf_win.h

 // 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_EMF_WIN_H_
 #define PRINTING_EMF_WIN_H_
 
 #include <windows.h>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "printing/native_metafile.h"
 
 class FilePath;
 
 namespace gfx {
 class Rect;
 }
 
 namespace printing {
 
 // Simple wrapper class that manage an EMF data stream and its virtual HDC.
 class Emf : public NativeMetafile {
  public:
   class Record;
   class Enumerator;
   struct EnumerationContext;
 
+  // Generates a virtual HDC that will record every GDI commands and compile
+  // it in a EMF data stream.
+  Emf();
   virtual ~Emf();
 
+  // Initializes the Emf with the data in |metafile_path|.
+  virtual bool Init(const FilePath& metafile_path);
+
   // NativeMetafile methods.
-  virtual bool Init() { return true; }
+
+  // Generates a new metafile that will record every GDI command.
+  virtual bool Init();

[M-A Ruel, 2011/03/17 13:19:21]

By style code, we don't allow function overloads. Use a different name on one of
the methods.

[vandebo (ex-Chrome), 2011/03/17 23:38:06]

I was copying the bad existing pattern, Fixed.

And during the fix, I realized that CreateFileBackedDc is actually used. Also
Fixed.

+
+  // Initializes the Emf with the data in |src_buffer|. Returns true on success.
   virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
 
   virtual bool StartPage();
   virtual bool FinishPage();
   virtual bool Close();
 
   virtual uint32 GetDataSize() const;
   virtual bool GetData(void* buffer, uint32 size) const;
 
   // Saves the EMF data to a file as-is. It is recommended to use the .emf file
   // extension but it is not enforced. This function synchronously writes to the
   // file. For testing only.
   virtual bool SaveTo(const FilePath& file_path) const;
 
   // Should be passed to Playback to keep the exact same size.
   virtual gfx::Rect GetPageBounds(unsigned int page_number) const;
 
   virtual unsigned int GetPageCount() const {
     // TODO(dpapad): count the number of times StartPage() is called
     return 1;
   }
 
   virtual HDC context() const {
     return hdc_;
   }
 
-  virtual bool CreateDc(HDC sibling, const RECT* rect);
-  virtual bool CreateFileBackedDc(HDC sibling,
-                                  const RECT* rect,
-                                  const FilePath& path);
-  virtual bool CreateFromFile(const FilePath& file_path);
-
-  virtual void CloseEmf();
-
   virtual bool Playback(HDC hdc, const RECT* rect) const;
   virtual bool SafePlayback(HDC hdc) const;
 
   virtual bool GetData(std::vector<uint8>* buffer) const;
 
   virtual HENHMETAFILE emf() const {
     return emf_;
   }
 
- protected:
-  Emf();
-
  private:
-  friend class NativeMetafileFactory;
-  FRIEND_TEST_ALL_PREFIXES(EmfTest, DC);
-  FRIEND_TEST_ALL_PREFIXES(EmfTest, FileBackedDC);
-  FRIEND_TEST_ALL_PREFIXES(EmfPrintingTest, Enumerate);
-  FRIEND_TEST_ALL_PREFIXES(EmfPrintingTest, PageBreak);
-
   // Playbacks safely one EMF record.
   static int CALLBACK SafePlaybackProc(HDC hdc,
                                        HANDLETABLE* handle_table,
                                        const ENHMETARECORD* record,
                                        int objects_count,
                                        LPARAM param);
 
   // Compiled EMF data handle.
   HENHMETAFILE emf_;
 
@@ skipping 67 matching lines @@
   std::vector<Record> items_;
 
   EnumerationContext context_;
 
   DISALLOW_COPY_AND_ASSIGN(Enumerator);
 };
 
 }  // namespace printing
 
 #endif  // PRINTING_EMF_WIN_H_