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

skia/ext/vector_platform_device_skia.h

 // Copyright (c) 2011 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.
 
 #ifndef SKIA_EXT_VECTOR_PLATFORM_DEVICE_SKIA_H_
 #define SKIA_EXT_VECTOR_PLATFORM_DEVICE_SKIA_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "skia/ext/platform_device.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkTScopedPtr.h"
 #include "third_party/skia/include/pdf/SkPDFDevice.h"
 
 class SkClipStack;
 class SkMatrix;
 struct SkIRect;
 struct SkRect;
 
 namespace skia {
 
 class BitmapPlatformDevice;
 
 class VectorPlatformDeviceSkia : public PlatformDevice {
  public:
   SK_API VectorPlatformDeviceSkia(SkPDFDevice* pdf_device);
   virtual ~VectorPlatformDeviceSkia();
 
-  SkPDFDevice* PdfDevice() { return pdf_device_.get(); }
+#if 0
+  SkPDFDevice* PdfDevice() { return GetOwningDevice();/*pdf_device_.get();*/ }
+#endif
 
   // PlatformDevice methods.
   virtual bool IsNativeFontRenderingAllowed();
 
   virtual PlatformSurface BeginPlatformPaint();
   virtual void EndPlatformPaint();
 #if defined(OS_WIN)
   virtual void DrawToNativeContext(HDC dc, int x, int y, const RECT* src_rect);
 #elif defined(OS_MACOSX)
   virtual void DrawToNativeContext(CGContext* context, int x, int y,
                                    const CGRect* src_rect);
   virtual CGContextRef GetBitmapContext();
 #endif
 
   // SkDevice methods.
+#if 0
   virtual uint32_t getDeviceCapabilities();
   virtual int width() const;
   virtual int height() const;
   virtual void setMatrixClip(const SkMatrix& matrix, const SkRegion& region,
                              const SkClipStack& stack);
   virtual bool readPixels(const SkIRect& srcRect, SkBitmap* bitmap);
 
   virtual void drawPaint(const SkDraw& draw, const SkPaint& paint);
   virtual void drawPoints(const SkDraw& draw, SkCanvas::PointMode mode,
                           size_t count, const SkPoint[], const SkPaint& paint);
@@ skipping 15 matching lines @@
   virtual void drawTextOnPath(const SkDraw& draw, const void* text, size_t len,
                               const SkPath& path, const SkMatrix* matrix,
                               const SkPaint& paint);
   virtual void drawVertices(const SkDraw& draw, SkCanvas::VertexMode,
                             int vertexCount, const SkPoint verts[],
                             const SkPoint texs[], const SkColor colors[],
                             SkXfermode* xmode, const uint16_t indices[],
                             int indexCount, const SkPaint& paint);
   virtual void drawDevice(const SkDraw& draw, SkDevice*, int x, int y,
                           const SkPaint&);
+#endif
 
  protected:
+#if 0
   virtual SkDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, 
                                              int height, bool isOpaque,
                                              Usage usage);
+#endif
 
  private:
-  SkRefPtr<SkPDFDevice> pdf_device_;
-  SkRefPtr<BitmapPlatformDevice> raster_surface_;
+  //SkRefPtr<SkPDFDevice> pdf_device_;
+  //SkRefPtr<BitmapPlatformDevice> raster_surface_;
+  SkRefPtr<SkDevice> raster_surface_;
+  SkRefPtr<SkCanvas> raster_canvas_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorPlatformDeviceSkia);
 };
 
 }  // namespace skia
 
 #endif  // SKIA_EXT_VECTOR_PLATFORM_DEVICE_SKIA_H_