Adding CreateFromData to NativeMetafileFactory

printing/native_metafile_factory.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/native_metafile_factory.h"
 
 #if defined(OS_WIN)
 #include "printing/emf_win.h"
 #elif defined(OS_MACOSX)
 #include "printing/pdf_metafile_mac.h"
 #elif defined(OS_POSIX)
 #include "printing/pdf_ps_metafile_cairo.h"
 #endif
 
 namespace printing {
 
 // static
-printing::NativeMetafile* NativeMetafileFactory::Create() {
+NativeMetafile* NativeMetafileFactory::Create() {
+  NativeMetafile* metafile = CreateNewMetafile();
+  if (!metafile->Init()) {
+    delete metafile;
+    return NULL;
+  }
+  return metafile;
+}
+
+// static
+NativeMetafile* NativeMetafileFactory::CreateFromData(
+    const void* src_buffer, uint32 src_buffer_size) {
+  NativeMetafile* metafile = CreateNewMetafile();
+  if (!metafile->InitFromData(src_buffer, src_buffer_size)) {
+    delete metafile;
+    return NULL;
+  }
+  return metafile;
+}
+
+// static
+NativeMetafile* NativeMetafileFactory::CreateNewMetafile(){

[vandebo (ex-Chrome), 2011/03/24 21:21:58]

This doesn't need to be a class member.  We prefer to make these kinds of things
simple functions in an anonymous namespace.

[dpapad, 2011/03/24 22:02:37]

I left it as a class member because this class is a friend of all metafiles (in
order to be able to construct them). By having it as a independent function I
will have to make this function friend (and unfriend the factory). Is that
preferable?

 #if defined(OS_WIN)
   return new printing::Emf;
 #elif defined(OS_MACOSX)
   return new printing::PdfMetafile;
 #elif defined(OS_POSIX)
   return new printing::PdfPsMetafile;
 #endif
 }
 
 }  // namespace printing