Revert 76553 - Applying factory pattern (through NativeMetafileFactory class)...

chrome/renderer/print_web_view_helper_win.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 "chrome/renderer/print_web_view_helper.h"
 
 #include "base/logging.h"
 #include "base/process_util.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "printing/native_metafile_factory.h"
-#include "printing/native_metafile.h"
 #include "printing/units.h"
 #include "skia/ext/vector_canvas.h"
 #include "skia/ext/vector_platform_device.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "ui/gfx/gdi_util.h"
 
 using printing::ConvertUnitDouble;
 using printing::kPointsPerInch;
 using WebKit::WebFrame;
 
@@ skipping 39 matching lines @@
   return 1;  // Continue enumeration
 }
 
 }  // namespace
 
 void PrintWebViewHelper::PrintPage(const ViewMsg_PrintPage_Params& params,
                                    const gfx::Size& canvas_size,
                                    WebFrame* frame) {
   // Generate a memory-based metafile. It will use the current screen's DPI.
   // Each metafile contains a single page.
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
+  scoped_ptr<printing::NativeMetafile> metafile(new printing::NativeMetafile);
   metafile->CreateDc(NULL, NULL);
   DCHECK(metafile->hdc());
   skia::PlatformDevice::InitializeDC(metafile->hdc());
 
   int page_number = params.page_number;
 
   // Calculate the dpi adjustment.
   float scale_factor = static_cast<float>(params.params.desired_dpi /
                                           params.params.dpi);
 
@@ skipping 45 matching lines @@
   if (!page_count)
     return;
 
   // NOTE: This is an enhanced-format metafile(EMF) which has an appearance of
   // single page metafile. For print preview, we need a metafile with multiple
   // pages.
   // TODO(kmadhusu): Use a PDF metafile to support multiple pages. After "Skia
   // PDF backend" work is completed for windows, make changes to replace this
   // EMF with PDF metafile.
   // http://code.google.com/p/chromium/issues/detail?id=62889
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
+  scoped_ptr<printing::NativeMetafile> metafile(new printing::NativeMetafile);
   metafile->CreateDc(NULL, NULL);
   DCHECK(metafile->hdc());
   skia::PlatformDevice::InitializeDC(metafile->hdc());
 
   // Calculate the dpi adjustment.
   float shrink = static_cast<float>(params.params.desired_dpi /
                                     params.params.dpi);
 
   if (params.pages.empty()) {
     for (int i = 0; i < page_count; ++i) {
@@ skipping 104 matching lines @@
 #endif
 
   skia::VectorPlatformDevice* platform_device =
       static_cast<skia::VectorPlatformDevice*>(canvas.getDevice());
   if (platform_device->alpha_blend_used() && !params.supports_alpha_blend) {
     // Close the device context to retrieve the compiled metafile.
     if (!(*metafile)->CloseDc())
       NOTREACHED();
 
     scoped_ptr<printing::NativeMetafile> metafile2(
-        printing::NativeMetafileFactory::CreateMetafile());
+        new printing::NativeMetafile);
     // Page used alpha blend, but printer doesn't support it.  Rewrite the
     // metafile and flatten out the transparency.
     HDC bitmap_dc = CreateCompatibleDC(GetDC(NULL));
     if (!bitmap_dc)
       NOTREACHED() << "Bitmap DC creation failed";
     SetGraphicsMode(bitmap_dc, GM_ADVANCED);
     void* bits = NULL;
     BITMAPINFO hdr;
     gfx::CreateBitmapHeader(width, height, &hdr.bmiHeader);
     HBITMAP hbitmap = CreateDIBSection(
@@ skipping 49 matching lines @@
   // Copy the bits into shared memory.
   if (!metafile->GetData(shared_buf.memory(), buf_size)) {
     NOTREACHED() << "GetData() failed";
     shared_buf.Unmap();
     return false;
   }
   shared_buf.GiveToProcess(base::GetCurrentProcessHandle(), shared_mem_handle);
   shared_buf.Unmap();
   return true;
 }