Cleanup NativeMetafile (win) interface and EMF class.

printing/emf_win.cc

-// Copyright (c) 2010 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.
 
 #include "printing/emf_win.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
@@ skipping 31 matching lines @@
     ExtEscape(dc, escape, size, reinterpret_cast<LPCSTR>(bits),
               sizeof(supported), reinterpret_cast<LPSTR>(&supported));
   }
   return !!supported;
 }
 
 Emf::Emf() : emf_(NULL), hdc_(NULL) {
 }
 
 Emf::~Emf() {
-  CloseEmf();
+  DCHECK(!hdc_);
+  if (emf_)
+    DeleteEnhMetaFile(emf_);
+}
+
+bool Emf::Init() {
   DCHECK(!emf_ && !hdc_);
+  hdc_ = CreateEnhMetaFile(NULL, NULL, NULL, NULL);
+  DCHECK(hdc_);
+  return hdc_ != NULL;
 }
 
 bool Emf::Init(const void* src_buffer, uint32 src_buffer_size) {
   DCHECK(!emf_ && !hdc_);
   emf_ = SetEnhMetaFileBits(src_buffer_size,
                             reinterpret_cast<const BYTE*>(src_buffer));
   return emf_ != NULL;
 }
 
-bool Emf::CreateDc(HDC sibling, const RECT* rect) {
-  DCHECK(!emf_ && !hdc_);
-  hdc_ = CreateEnhMetaFile(sibling, NULL, rect, NULL);
-  DCHECK(hdc_);
-  return hdc_ != NULL;
-}
-
-bool Emf::CreateFileBackedDc(HDC sibling, const RECT* rect,
-                             const FilePath& path) {
-  DCHECK(!emf_ && !hdc_);
-  DCHECK(!path.empty());
-  hdc_ = CreateEnhMetaFile(sibling, path.value().c_str(), rect, NULL);
-  DCHECK(hdc_);
-  return hdc_ != NULL;
-}
-
-bool Emf::CreateFromFile(const FilePath& metafile_path) {
+bool Emf::Init(const FilePath& metafile_path) {
   DCHECK(!emf_ && !hdc_);
   emf_ = GetEnhMetaFile(metafile_path.value().c_str());
   DCHECK(emf_);
   return emf_ != NULL;
 }
 
-
 bool Emf::Close() {
   DCHECK(!emf_ && hdc_);
   emf_ = CloseEnhMetaFile(hdc_);
   DCHECK(emf_);
   hdc_ = NULL;
   return emf_ != NULL;
 }
 
-void Emf::CloseEmf() {
-  DCHECK(!hdc_);
-  if (emf_) {
-    DeleteEnhMetaFile(emf_);
-    emf_ = NULL;
-  }
-}
-
 bool Emf::Playback(HDC hdc, const RECT* rect) const {
   DCHECK(emf_ && !hdc_);
   RECT bounds;
   if (!rect) {
     // Get the natural bounds of the EMF buffer.
     bounds = GetPageBounds(1).ToRECT();
     rect = &bounds;
   }
   return PlayEnhMetaFile(hdc, emf_, rect) != 0;
 }
@@ skipping 353 matching lines @@
   } else {
     DCHECK_EQ(emf.context_.handle_table, handle_table);
     DCHECK_EQ(emf.context_.objects_count, objects_count);
     DCHECK_EQ(emf.context_.hdc, hdc);
   }
   emf.items_.push_back(Record(&emf.context_, record));
   return 1;
 }
 
 }  // namespace printing