Allow the creation of a skia::PlatformCanvas from a CGContextRef.

skia/ext/platform_canvas.h

Index: skia/ext/platform_canvas.h
diff --git a/skia/ext/platform_canvas.h b/skia/ext/platform_canvas.h
index b602ed46ca3e3aa3417ec7761c0eb9a617c1701d..1be7acf011a68da8656d03de0650f71fa1dc633f 100644
--- a/skia/ext/platform_canvas.h
+++ b/skia/ext/platform_canvas.h
@@ -48,6 +48,7 @@ class PlatformCanvas : public SkCanvas {
 
   // For two-part init, call if you use the no-argument constructor above
   bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
+  bool initialize(CGContextRef context, int width, int height, bool is_opaque);

[brettw, 2010/12/29 21:03:52]

Can you move this before the other one to match the order of the platformCanvas
constructors?

[sjl, 2010/12/31 05:55:49]

Done.

 
 #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
       defined(__Solaris__)
@@ -106,6 +107,9 @@ class PlatformCanvas : public SkCanvas {
   // CoreGraphics.
   virtual SkDevice* setBitmapDevice(const SkBitmap& bitmap);
 
+  // Internal helper.
+  bool initialize(SkDevice* device);

[brettw, 2010/12/29 21:03:52]

We should avoid overloading the initialize function like this. How about calling
it initWithDevice(). Can the comment also say that it's used internally by the
initialize() functions?

Also, you declare this for every platform but only define/use it on Mac. It
looks like this code is copied into all other platforms. Can you move the
implementation to the shared platform_canvas.cc file and make all the platforms
use it instead of the device setting and unrefing code?

[sjl, 2010/12/31 05:55:49]

Done.

+
   // Disallow copy and assign.
   PlatformCanvas(const PlatformCanvas&);
   PlatformCanvas& operator=(const PlatformCanvas&);