Revert 78859 - Unfork VectorPlatformCanvas.

Unfork VectorPlatformCanvas by making NativeMetafile know how to create an appropriate VectorPlatformDevice. This will also be useful when we have multiple NativeMetafile implemenations (each requiring a different VectorPlatformDevices).

BUG=NONE
TEST=NONE

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78662
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=78663

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=78812
Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=78815

Review URL: http://codereview.chromium.org/6665046

TBR=vandebo@chromium.org
Review URL: http://codereview.chromium.org/6711067

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78860 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 99 insertions, 24 deletions

diff --git a/skia/ext/vector_canvas.cc b/skia/ext/vector_canvas.cc
index 216a2ee..851da79 100644
--- a/skia/ext/vector_canvas.cc
+++ b/skia/ext/vector_canvas.cc
@@ -4,13 +4,13 @@
 
 #include "skia/ext/vector_canvas.h"
 
-#include "skia/ext/vector_platform_device.h"
-
 namespace skia {
 
-VectorCanvas::VectorCanvas(PlatformDevice* device)
-    : PlatformCanvas(device->getDeviceFactory()) {
-  setDevice(device)->unref(); // Created with refcount 1, and setDevice refs.
+VectorCanvas::VectorCanvas()
+    : PlatformCanvas(SkNEW(VectorPlatformDeviceFactory)) {
+}
+
+VectorCanvas::VectorCanvas(SkDeviceFactory* factory) : PlatformCanvas(factory) {
 }
 
 VectorCanvas::~VectorCanvas() {
diff --git a/skia/ext/vector_canvas.h b/skia/ext/vector_canvas.h
index 4b4419d..4f8bc7a 100644
--- a/skia/ext/vector_canvas.h
+++ b/skia/ext/vector_canvas.h
@@ -7,10 +7,13 @@
 #pragma once
 
 #include "skia/ext/platform_canvas.h"
+#include "skia/ext/vector_platform_device.h"
 
-namespace skia {
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+typedef struct _cairo cairo_t;
+#endif
 
-class PlatformDevice;
+namespace skia {
 
 // This class is a specialization of the regular PlatformCanvas. It is designed
 // to work with a VectorDevice to manage platform-specific drawing. It allows
@@ -18,10 +21,24 @@ class PlatformDevice;
 // support reading back from the bitmap backstore since it is not used.
 class SK_API VectorCanvas : public PlatformCanvas {
  public:
-  // Ownership of |device| is transfered to VectorCanvas.
-  explicit VectorCanvas(PlatformDevice* device);
+  VectorCanvas();
+  explicit VectorCanvas(SkDeviceFactory* factory);
+#if defined(WIN32)
+  VectorCanvas(HDC dc, int width, int height);
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+  // Caller owns |context|. Ownership is not transferred.
+  VectorCanvas(cairo_t* context, int width, int height);
+#endif
   virtual ~VectorCanvas();
 
+  // For two-part init, call if you use the no-argument constructor above
+#if defined(WIN32)
+  bool initialize(HDC context, int width, int height);
+#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+  // Ownership of |context| is not transferred.
+  bool initialize(cairo_t* context, int width, int height);
+#endif
+
   virtual SkBounder* setBounder(SkBounder* bounder);
   virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter);
 
diff --git a/skia/ext/vector_canvas_linux.cc b/skia/ext/vector_canvas_linux.cc
new file mode 100644
index 0000000..aff4fbe
--- /dev/null
+++ b/skia/ext/vector_canvas_linux.cc
@@ -0,0 +1,28 @@
+// Copyright (c) 2009 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 "skia/ext/vector_canvas.h"
+
+#include "skia/ext/vector_platform_device.h"
+
+namespace skia {
+
+VectorCanvas::VectorCanvas(cairo_t* context, int width, int height) {
+  bool initialized = initialize(context, width, height);
+
+  SkASSERT(initialized);
+}
+
+bool VectorCanvas::initialize(cairo_t* context, int width, int height) {
+  SkDevice* device = VectorPlatformDeviceFactory::CreateDevice(context, width,
+                                                               height, true);
+  if (!device)
+    return false;
+
+  setDevice(device);
+  device->unref();  // was created with refcount 1, and setDevice also refs
+  return true;
+}
+
+}  // namespace skia
diff --git a/skia/ext/vector_canvas_unittest.cc b/skia/ext/vector_canvas_unittest.cc
index 1066c0c..0266c81 100644
--- a/skia/ext/vector_canvas_unittest.cc
+++ b/skia/ext/vector_canvas_unittest.cc
@@ -14,7 +14,6 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "skia/ext/vector_canvas.h"
-#include "skia/ext/vector_platform_device.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkDashPathEffect.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -387,8 +386,7 @@ class VectorCanvasTest : public ImageTest {
     size_ = size;
     context_ = new Context();
     bitmap_ = new Bitmap(*context_, size_, size_);
-    vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
-        size_, size_, true, context_->context()));
+    vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
     pcanvas_ = new PlatformCanvas(size_, size_, false);
 
     // Clear white.
@@ -454,8 +452,7 @@ TEST_F(VectorCanvasTest, Uninitialized) {
 
   context_ = new Context();
   bitmap_ = new Bitmap(*context_, size_, size_);
-  vcanvas_ = new VectorCanvas(VectorPlatformDeviceFactory::CreateDevice(
-      size_, size_, true, context_->context()));
+  vcanvas_ = new VectorCanvas(context_->context(), size_, size_);
   pcanvas_ = new PlatformCanvas(size_, size_, false);
 
   // VectorCanvas default initialization is black.
diff --git a/skia/ext/vector_canvas_win.cc b/skia/ext/vector_canvas_win.cc
new file mode 100644
index 0000000..400b2a4
--- /dev/null
+++ b/skia/ext/vector_canvas_win.cc
@@ -0,0 +1,30 @@
+// Copyright (c) 2006-2009 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 "skia/ext/vector_canvas.h"
+
+#include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/vector_platform_device.h"
+
+namespace skia {
+
+VectorCanvas::VectorCanvas(HDC dc, int width, int height) {
+  bool initialized = initialize(dc, width, height);
+  if (!initialized)
+    __debugbreak();
+}
+
+bool VectorCanvas::initialize(HDC context, int width, int height) {
+  SkDevice* device = VectorPlatformDeviceFactory::CreateDevice(width, height,
+                                                               true, context);
+  if (!device)
+    return false;
+
+  setDevice(device);
+  device->unref();  // was created with refcount 1, and setDevice also refs
+  return true;
+}
+
+}  // namespace skia
+
diff --git a/skia/ext/vector_platform_device_linux.cc b/skia/ext/vector_platform_device_linux.cc
index bc6a41e..068ae89 100644
--- a/skia/ext/vector_platform_device_linux.cc
+++ b/skia/ext/vector_platform_device_linux.cc
@@ -78,9 +78,9 @@ SkDevice* VectorPlatformDeviceFactory::newDevice(SkCanvas* ignored,
 }
 
 // static
-PlatformDevice* VectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
-                                                          int width, int height,
-                                                          bool isOpaque) {
+SkDevice* VectorPlatformDeviceFactory::CreateDevice(cairo_t* context,
+                                                    int width, int height,
+                                                    bool isOpaque) {
   // TODO(myhuang): Here we might also have similar issues as those on Windows
   // (vector_canvas_win.cc, http://crbug.com/18382 & http://crbug.com/18383).
   // Please note that is_opaque is true when we use this class for printing.
diff --git a/skia/ext/vector_platform_device_linux.h b/skia/ext/vector_platform_device_linux.h
index ae2bafb..222f68f 100644
--- a/skia/ext/vector_platform_device_linux.h
+++ b/skia/ext/vector_platform_device_linux.h
@@ -15,8 +15,8 @@ namespace skia {
 
 class VectorPlatformDeviceFactory : public SkDeviceFactory {
  public:
-  static PlatformDevice* CreateDevice(cairo_t* context, int width, int height,
-                                      bool isOpaque);
+  static SkDevice* CreateDevice(cairo_t* context, int width, int height,
+                                bool isOpaque);
 
   // Overridden from SkDeviceFactory:
   virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
diff --git a/skia/ext/vector_platform_device_win.cc b/skia/ext/vector_platform_device_win.cc
index 90f824e..2476152 100644
--- a/skia/ext/vector_platform_device_win.cc
+++ b/skia/ext/vector_platform_device_win.cc
@@ -22,8 +22,9 @@ SkDevice* VectorPlatformDeviceFactory::newDevice(SkCanvas* unused,
 }
 
 //static
-PlatformDevice* VectorPlatformDeviceFactory::CreateDevice(
-        int width, int height, bool is_opaque, HANDLE shared_section) {
+SkDevice* VectorPlatformDeviceFactory::CreateDevice(int width, int height,
+                                                    bool is_opaque,
+                                                    HANDLE shared_section) {
   if (!is_opaque) {
     // TODO(maruel):  http://crbug.com/18382 When restoring a semi-transparent
     // layer, i.e. merging it, we need to rasterize it because GDI doesn't
diff --git a/skia/ext/vector_platform_device_win.h b/skia/ext/vector_platform_device_win.h
index 83d51f7..6045f24 100644
--- a/skia/ext/vector_platform_device_win.h
+++ b/skia/ext/vector_platform_device_win.h
@@ -13,13 +13,13 @@
 
 namespace skia {
 
-class SK_API VectorPlatformDeviceFactory : public SkDeviceFactory {
+class VectorPlatformDeviceFactory : public SkDeviceFactory {
  public:
   virtual SkDevice* newDevice(SkCanvas* ignored, SkBitmap::Config config,
                               int width, int height,
                               bool isOpaque, bool isForLayer) OVERRIDE;
-  static PlatformDevice* CreateDevice(int width, int height, bool isOpaque,
-                                      HANDLE shared_section);
+  static SkDevice* CreateDevice(int width, int height, bool isOpaque,
+                                HANDLE shared_section);
 };
 
 // A device is basically a wrapper around SkBitmap that provides a surface for
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 628bf9b..f28ffd2 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -642,6 +642,8 @@
         'ext/skia_utils_win.h',
         'ext/vector_canvas.cc',
         'ext/vector_canvas.h',
+        'ext/vector_canvas_linux.cc',
+        'ext/vector_canvas_win.cc',
         'ext/vector_platform_device.h',
         'ext/vector_platform_device_linux.cc',
         'ext/vector_platform_device_linux.h',