Split SkDevice into SkBaseDevice and SkBitmapDevice

include/device/xps/SkXPSDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkXPSDevice_DEFINED
 #define SkXPSDevice_DEFINED
 
 #include "SkTypes.h"
 #include <ObjBase.h>
 #include <XpsObjectModel.h>
 
 #include "SkAutoCoInitialize.h"
+#include "SkBitmapDevice.h"
 #include "SkBitSet.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
-#include "SkDevice.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPoint.h"
 #include "SkShader.h"
 #include "SkSize.h"
 #include "SkTArray.h"
 #include "SkTScopedComPtr.h"
 #include "SkTypeface.h"
 
 /** \class SkXPSDevice
 
     The drawing context for the XPS backend.
 */
-class SkXPSDevice : public SkDevice {
+class SkXPSDevice : public SkBitmapDevice {
 public:
     SK_API SkXPSDevice();
     SK_API virtual ~SkXPSDevice();
 
     virtual bool beginPortfolio(SkWStream* outputStream);
     /**
       @param unitsPerMeter converts geometry units into physical units.
       @param pixelsPerMeter resolution to use when geometry must be rasterized.
       @param trimSize final page size in physical units.
                       The top left of the trim is the origin of physical space.
@@ skipping 83 matching lines @@
         const SkDraw&,
         SkCanvas::VertexMode,
         int vertexCount, const SkPoint verts[],
         const SkPoint texs[], const SkColor colors[],
         SkXfermode* xmode,
         const uint16_t indices[], int indexCount,
         const SkPaint& paint) SK_OVERRIDE;
 
     virtual void drawDevice(
         const SkDraw&,
-        SkDevice* device,
+        SkBaseDevice* device,
         int x, int y,
         const SkPaint& paint) SK_OVERRIDE;
 
     virtual bool onReadPixels(const SkBitmap& bitmap,
                               int x,
                               int y,
                               SkCanvas::Config8888) SK_OVERRIDE;
 
     virtual bool allowImageFilter(SkImageFilter*) SK_OVERRIDE;
 
@@ skipping 152 matching lines @@
         SkMatrix* matrix,
         SkVector* ppuScale,
         const SkIRect& clip, SkIRect* clipIRect);
 
     HRESULT applyMask(
         const SkDraw& d,
         const SkMask& mask,
         const SkVector& ppuScale,
         IXpsOMPath* shadedPath);
 
-    // override from SkDevice
-    virtual SkDevice* onCreateCompatibleDevice(
-        SkBitmap::Config config,
-        int width, int height,
-        bool isOpaque,
-        Usage usage) SK_OVERRIDE;
+    // override from SkBaseDevice
+    virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config config,
+                                                   int width, int height,
+                                                   bool isOpaque,
+                                                   Usage usage) SK_OVERRIDE;
 
     // Disable the default copy and assign implementation.
     SkXPSDevice(const SkXPSDevice&);
     void operator=(const SkXPSDevice&);
 
-    typedef SkDevice INHERITED;
+    typedef SkBitmapDevice INHERITED;
 };
 
 #endif