Wire up missing functionality in BitmapPlatformContext to allow the creation of a skia::PlatformCanvas

from a CGContextRef.

TEST=test_shell_tests, try (mac,win,linux)

Original review=http://codereview.chromium.org/6064007/
Patch by sjl@chromium.org

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

1 files changed, 11 insertions, 9 deletions

diff --git a/skia/ext/platform_canvas_mac.cc b/skia/ext/platform_canvas_mac.cc
index 7e4c610..9373468 100644
--- a/skia/ext/platform_canvas_mac.cc
+++ b/skia/ext/platform_canvas_mac.cc
@@ -19,7 +19,7 @@ PlatformCanvas::PlatformCanvas(int width,
                                bool is_opaque,
                                CGContextRef context)
     : SkCanvas(SkNEW(BitmapPlatformDeviceFactory)) {
-  initialize(width, height, is_opaque);
+  initialize(context, width, height, is_opaque);
 }
 
 PlatformCanvas::PlatformCanvas(int width,
@@ -37,14 +37,16 @@ bool PlatformCanvas::initialize(int width,
                                 int height,
                                 bool is_opaque,
                                 uint8_t* data) {
-  SkDevice* device = BitmapPlatformDevice::CreateWithData(data, width, height,
-                                                          is_opaque);
-  if (!device)
-    return false;
-
-  setDevice(device);
-  device->unref();  // Was created with refcount 1, and setDevice also refs.
-  return true;
+  return initializeWithDevice(BitmapPlatformDevice::CreateWithData(
+      data, width, height, is_opaque));
+}
+
+bool PlatformCanvas::initialize(CGContextRef context,
+                                int width,
+                                int height,
+                                bool is_opaque) {
+  return initializeWithDevice(BitmapPlatformDevice::Create(
+      context, width, height, is_opaque));
 }
 
 CGContextRef PlatformCanvas::beginPlatformPaint() {