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

chrome/renderer/webplugin_delegate_pepper.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #define PEPPER_APIS_ENABLED 1
 
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 
 #include <string>
 #include <vector>
 
 #if defined(OS_LINUX)
 #include <unistd.h>
 #endif
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
 #include "base/md5.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
+#if defined(OS_MACOSX)
+#include "base/mac/scoped_cftyperef.h"
+#endif
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/pepper_widget.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#if defined(OS_LINUX)
+#include "chrome/renderer/renderer_sandbox_support_linux.h"
+#endif
 #include "chrome/renderer/webplugin_delegate_proxy.h"
 #include "ui/gfx/blit.h"
-#include "printing/native_metafile_factory.h"
+#if defined(OS_WIN)
+#include "printing/units.h"
+#include "skia/ext/vector_platform_device.h"
+#include "ui/gfx/codec/jpeg_codec.h"
+#include "ui/gfx/gdi_util.h"
+#endif
 #include "printing/native_metafile.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/npapi/bindings/npapi_extensions_private.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "webkit/glue/webcursor.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/npapi/plugin_host.h"
 #include "webkit/plugins/npapi/plugin_stream_url.h"
 
-#if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
-#include "base/mac/scoped_cftyperef.h"
-#elif defined(OS_LINUX)
-#include "chrome/renderer/renderer_sandbox_support_linux.h"
-#include "printing/pdf_ps_metafile_cairo.h"
-#elif defined(OS_WIN)
-#include "printing/units.h"
-#include "skia/ext/vector_platform_device.h"
-#include "ui/gfx/codec/jpeg_codec.h"
-#include "ui/gfx/gdi_util.h"
-#endif
-
 #if defined(ENABLE_GPU)
 #include "webkit/plugins/npapi/plugin_constants_win.h"
 #endif
 
 #if defined(ENABLE_GPU)
 using gpu::Buffer;
 #endif
 
 using webkit::npapi::WebPlugin;
 using webkit::npapi::WebPluginDelegate;
@@ skipping 1138 matching lines @@
                                                   &pdf_output, &output_size);
   if (err != NPERR_NO_ERROR)
     return false;
 
   bool ret = false;
 #if defined(OS_LINUX)
   // On Linux we need to get the backing PdfPsMetafile and write the bits
   // directly.
   cairo_t* context = canvas->beginPlatformPaint();
   printing::NativeMetafile* metafile =
-      printing::PdfPsMetafile::FromCairoContext(context);
+      printing::NativeMetafile::FromCairoContext(context);
   DCHECK(metafile);
   if (metafile) {
     ret = metafile->SetRawData(pdf_output, output_size);
     if (ret)
       pdf_output_done_ = true;
   }
   canvas->endPlatformPaint();
 #elif defined(OS_MACOSX)
-  scoped_ptr<printing::NativeMetafile> metafile(
-      printing::NativeMetafileFactory::CreateMetafile());
+  printing::NativeMetafile metafile;
   // Create a PDF metafile and render from there into the passed in context.
-  if (metafile->Init(pdf_output, output_size)) {
+  if (metafile.Init(pdf_output, output_size)) {
     // Flip the transform.
     CGContextSaveGState(canvas);
     CGContextTranslateCTM(canvas, 0, current_printable_area_.height());
     CGContextScaleCTM(canvas, 1.0, -1.0);
-    ret = metafile->RenderPage(1, canvas, current_printable_area_.ToCGRect(),
+    ret = metafile.RenderPage(1, canvas, current_printable_area_.ToCGRect(),
                               true, false, true, true);
     CGContextRestoreGState(canvas);
   }
 #elif defined(OS_WIN)
   // On Windows, we now need to render the PDF to the DC that backs the
   // supplied canvas.
   skia::VectorPlatformDevice& device =
       static_cast<skia::VectorPlatformDevice&>(
           canvas->getTopPlatformDevice());
   HDC dc = device.getBitmapDC();
@@ skipping 508 matching lines @@
   CGRect bounds;
   bounds.origin.x = dest_rect.x();
   bounds.origin.y = canvas_height - dest_rect.y() - dest_rect.height();
   bounds.size.width = dest_rect.width();
   bounds.size.height = dest_rect.height();
 
   CGContextDrawImage(canvas, bounds, image);
   CGContextRestoreGState(canvas);
 }
 #endif  // defined(OS_MACOSX)