CL removing inheritance of SkDevice from PlatformDevice. Flavours of PlatformDevice classes now ...

skia/ext/vector_platform_device_skia.cc

Index: skia/ext/vector_platform_device_skia.cc
===================================================================
--- skia/ext/vector_platform_device_skia.cc	(revision 97282)
+++ skia/ext/vector_platform_device_skia.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "skia/ext/vector_platform_device_skia.h"
 
 #include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkClipStack.h"
 #include "third_party/skia/include/core/SkDraw.h"
 #include "third_party/skia/include/core/SkRect.h"
@@ -20,8 +21,8 @@
 }
 
 VectorPlatformDeviceSkia::VectorPlatformDeviceSkia(SkPDFDevice* pdf_device)
-    : PlatformDevice(makeABitmap(pdf_device->width(), pdf_device->height())),
-      pdf_device_(pdf_device) {
+    : PlatformDevice(pdf_device) {
+  SetPlatformDevice(pdf_device, this, true);

[vandebo (ex-Chrome), 2011/08/19 21:54:22]

This is the only place where ownership is transfered.  Would making
VectorPlatformDeviceSkia inherit from SkPDFDevice instead of taking one,
eliminate the third arg?  If so, I think that's doable... looks like the only
call site for the constructor is pdf_metafile_skia, which makes the SkPDFDevice
immediately prior.

I think that would also solve the drawSprite issue...

[Jeff Timanus, 2011/08/20 02:31:04]

Yes, that's a very good suggestion.  It clears up a lot of the issues.

Done.

 }
 
 VectorPlatformDeviceSkia::~VectorPlatformDeviceSkia() {
@@ -39,164 +40,41 @@
   // image in EndPlatformPaint.
   DCHECK(raster_surface_ == NULL);
 #if defined(OS_WIN)
-  raster_surface_ = BitmapPlatformDevice::create(pdf_device_->width(),
-                                                 pdf_device_->height(),
+  raster_surface_ = BitmapPlatformDevice::create(GetOwningDevice()->width(),
+                                                 GetOwningDevice()->height(),
                                                  false, /* not opaque */
                                                  NULL);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
-  raster_surface_ = BitmapPlatformDevice::Create(pdf_device_->width(),
-                                                 pdf_device_->height(),
+  raster_surface_ = BitmapPlatformDevice::Create(GetOwningDevice()->width(),
+                                                 GetOwningDevice()->height(),
                                                  false /* not opaque */);
 #endif
   raster_surface_->unref();  // SkRefPtr and create both took a reference.
 
-  SkCanvas canvas(raster_surface_.get());
-  return raster_surface_->BeginPlatformPaint();
+  raster_canvas_ = new SkCanvas(raster_surface_.get());
+  return skia::BeginPlatformPaint(raster_canvas_.get());
 }
 
 void VectorPlatformDeviceSkia::EndPlatformPaint() {
   DCHECK(raster_surface_ != NULL);
+
   SkPaint paint;
   // SkPDFDevice checks the passed SkDraw for an empty clip (only).  Fake
   // it out by setting a non-empty clip.
   SkDraw draw;
-  SkRegion clip(SkIRect::MakeWH(pdf_device_->width(), pdf_device_->height()));
+  SkRegion clip(SkIRect::MakeWH(GetOwningDevice()->width(),
+                                GetOwningDevice()->height()));
   draw.fClip=&clip;
-  pdf_device_->drawSprite(draw, raster_surface_->accessBitmap(false), 0, 0,
-                          paint);
+
+  SkCanvas pdf_canvas(GetOwningDevice());
+  pdf_canvas.drawSprite(raster_surface_->accessBitmap(false), 0, 0, &paint);
+
   // BitmapPlatformDevice matches begin and end calls.
-  raster_surface_->EndPlatformPaint();
+  skia::EndPlatformPaint(raster_canvas_.get());
+  raster_canvas_ = NULL;
   raster_surface_ = NULL;
 }
 
-uint32_t VectorPlatformDeviceSkia::getDeviceCapabilities() {
-  return SkDevice::getDeviceCapabilities() | kVector_Capability;
-}
-
-int VectorPlatformDeviceSkia::width() const {
-  return pdf_device_->width();
-}
-
-int VectorPlatformDeviceSkia::height() const {
-  return pdf_device_->height();
-}
-
-void VectorPlatformDeviceSkia::setMatrixClip(const SkMatrix& matrix,
-                                             const SkRegion& region,
-                                             const SkClipStack& stack) {
-  pdf_device_->setMatrixClip(matrix, region, stack);
-}
-
-bool VectorPlatformDeviceSkia::readPixels(const SkIRect& srcRect,
-                                          SkBitmap* bitmap) {
-  return false;
-}
-
-void VectorPlatformDeviceSkia::drawPaint(const SkDraw& draw,
-                                         const SkPaint& paint) {
-  pdf_device_->drawPaint(draw, paint);
-}
-
-void VectorPlatformDeviceSkia::drawPoints(const SkDraw& draw,
-                                          SkCanvas::PointMode mode,
-                                          size_t count, const SkPoint pts[],
-                                          const SkPaint& paint) {
-  pdf_device_->drawPoints(draw, mode, count, pts, paint);
-}
-
-void VectorPlatformDeviceSkia::drawRect(const SkDraw& draw,
-                                        const SkRect& rect,
-                                        const SkPaint& paint) {
-  pdf_device_->drawRect(draw, rect, paint);
-}
-
-void VectorPlatformDeviceSkia::drawPath(const SkDraw& draw,
-                                        const SkPath& path,
-                                        const SkPaint& paint,
-                                        const SkMatrix* prePathMatrix,
-                                        bool pathIsMutable) {
-  pdf_device_->drawPath(draw, path, paint, prePathMatrix, pathIsMutable);
-}
-
-void VectorPlatformDeviceSkia::drawBitmap(const SkDraw& draw,
-                                          const SkBitmap& bitmap,
-                                          const SkIRect* srcRectOrNull,
-                                          const SkMatrix& matrix,
-                                          const SkPaint& paint) {
-  pdf_device_->drawBitmap(draw, bitmap, srcRectOrNull, matrix, paint);
-}
-
-void VectorPlatformDeviceSkia::drawSprite(const SkDraw& draw,
-                                          const SkBitmap& bitmap,
-                                          int x, int y,
-                                          const SkPaint& paint) {
-  pdf_device_->drawSprite(draw, bitmap, x, y, paint);
-}
-
-void VectorPlatformDeviceSkia::drawText(const SkDraw& draw,
-                                        const void* text,
-                                        size_t byteLength,
-                                        SkScalar x,
-                                        SkScalar y,
-                                        const SkPaint& paint) {
-  pdf_device_->drawText(draw, text, byteLength, x, y, paint);
-}
-
-void VectorPlatformDeviceSkia::drawPosText(const SkDraw& draw,
-                                           const void* text,
-                                           size_t len,
-                                           const SkScalar pos[],
-                                           SkScalar constY,
-                                           int scalarsPerPos,
-                                           const SkPaint& paint) {
-  pdf_device_->drawPosText(draw, text, len, pos, constY, scalarsPerPos, paint);
-}
-
-void VectorPlatformDeviceSkia::drawTextOnPath(const SkDraw& draw,
-                                              const void* text,
-                                              size_t len,
-                                              const SkPath& path,
-                                              const SkMatrix* matrix,
-                                              const SkPaint& paint) {
-  pdf_device_->drawTextOnPath(draw, text, len, path, matrix, paint);
-}
-
-void VectorPlatformDeviceSkia::drawVertices(const SkDraw& draw,
-                                            SkCanvas::VertexMode vmode,
-                                            int vertexCount,
-                                            const SkPoint vertices[],
-                                            const SkPoint texs[],
-                                            const SkColor colors[],
-                                            SkXfermode* xmode,
-                                            const uint16_t indices[],
-                                            int indexCount,
-                                            const SkPaint& paint) {
-  pdf_device_->drawVertices(draw, vmode, vertexCount, vertices, texs, colors,
-                            xmode, indices, indexCount, paint);
-}
-
-void VectorPlatformDeviceSkia::drawDevice(const SkDraw& draw,
-                                          SkDevice* device,
-                                          int x,
-                                          int y,
-                                          const SkPaint& paint) {
-  SkDevice* real_device = device;
-  if ((device->getDeviceCapabilities() & kVector_Capability)) {
-    // Assume that a vectorial device means a VectorPlatformDeviceSkia, we need
-    // to unwrap the embedded SkPDFDevice.
-    VectorPlatformDeviceSkia* vector_device =
-        static_cast<VectorPlatformDeviceSkia*>(device);
-    vector_device->pdf_device_->setOrigin(vector_device->getOrigin().fX,
-                                          vector_device->getOrigin().fY);
-    real_device = vector_device->pdf_device_.get();
-  }
-  pdf_device_->drawDevice(draw, real_device, x, y, paint);
-}
-
-void VectorPlatformDeviceSkia::setDrawingArea(SkPDFDevice::DrawingArea area) {
-  pdf_device_->setDrawingArea(area);
-}
-
 #if defined(OS_WIN)
 void VectorPlatformDeviceSkia::DrawToNativeContext(HDC dc,
                                                    int x,
@@ -217,13 +95,4 @@
 
 #endif
 
-SkDevice* VectorPlatformDeviceSkia::onCreateCompatibleDevice(
-    SkBitmap::Config config, int width, int height, bool isOpaque, 
-    Usage /*usage*/) {
-  SkAutoTUnref<SkDevice> dev(pdf_device_->createCompatibleDevice(config, width,
-                                                                 height,
-                                                                 isOpaque));
-  return new VectorPlatformDeviceSkia(static_cast<SkPDFDevice*>(dev.get()));
-}
-
 }  // namespace skia