Move canvas->surface association to the device subclasses

src/gpu/SkGpuDevice.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
 
 #include "SkGr.h"
 #include "SkBitmap.h"
 #include "SkDevice.h"
 #include "SkPicture.h"
 #include "SkRegion.h"
 #include "SkSurface.h"
 #include "GrContext.h"
 #include "GrSurfacePriv.h"
 
 struct SkDrawProcs;
 struct GrSkDrawProcs;
 
 class GrAccelData;
 struct GrCachedLayer;
 class GrTextContext;
+class SkSurface_Gpu;
 
 /**
  *  Subclass of SkBaseDevice, which directs all drawing to the GrGpu owned by the
  *  canvas.
  */
 class SK_API SkGpuDevice : public SkBaseDevice {
 public:
     enum Flags {
         kNeedClear_Flag = 1 << 0,  //!< Surface requires an initial clear
     };
 
     /**
      * Creates an SkGpuDevice from a GrRenderTarget.
      */
     static SkGpuDevice* Create(GrRenderTarget* target, const SkSurfaceProps*, unsigned flags = 0);
 
     /**
      * New device that will create an offscreen renderTarget based on the ImageInfo and
      * sampleCount. The Budgeted param controls whether the device's backing store counts against
      * the resource cache budget. On failure, returns NULL.
      */
     static SkGpuDevice* Create(GrContext*, SkSurface::Budgeted, const SkImageInfo&,
                                int sampleCount, const SkSurfaceProps*, unsigned flags = 0);
 
     virtual ~SkGpuDevice();
 
+    void setSurface(SkSurface_Gpu* surface) {
+        fSurface = surface;
+    }
+
     /** Creates a render targetthat can be used as the render target of the device. */
     static GrRenderTarget* CreateRenderTarget(GrContext* context, SkSurface::Budgeted budgeted,
                                               const SkImageInfo& info, int sampleCount);
 
     SkGpuDevice* cloneDevice(const SkSurfaceProps& props) {
         SkBaseDevice* dev = this->onCreateCompatibleDevice(CreateInfo(this->imageInfo(),
                                                                       kGeneral_Usage,
                                                                       props.pixelGeometry()));
         return static_cast<SkGpuDevice*>(dev);
     }
 
     GrContext* context() const { return fRenderTarget->getContext(); }
 
     // set all pixels to 0
     void clearAll();
 
-    void swapRenderTarget(GrRenderTarget* newTarget);
+    void detachBackendRenderTarget(bool retainContent);
 
     GrRenderTarget* accessRenderTarget() SK_OVERRIDE;
 
     SkImageInfo imageInfo() const SK_OVERRIDE {
         return fRenderTarget ? fRenderTarget->surfacePriv().info() : SkImageInfo::MakeUnknown();
     }
 
     const SkSurfaceProps& surfaceProps() const { return fSurfaceProps; }
 
+    void discard() SK_OVERRIDE;
+
     void drawPaint(const SkDraw&, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
                             const SkPoint[], const SkPaint& paint) SK_OVERRIDE;
     virtual void drawRect(const SkDraw&, const SkRect& r,
                           const SkPaint& paint) SK_OVERRIDE;
     virtual void drawRRect(const SkDraw&, const SkRRect& r,
                            const SkPaint& paint) SK_OVERRIDE;
     virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
                             const SkRRect& inner, const SkPaint& paint) SK_OVERRIDE;
     virtual void drawOval(const SkDraw&, const SkRect& oval,
@@ skipping 53 matching lines @@
 private:
     GrContext*      fContext;
     GrSkDrawProcs*  fDrawProcs;
     GrClipData      fClipData;
     GrTextContext*  fTextContext;
     SkSurfaceProps  fSurfaceProps;
     GrRenderTarget* fRenderTarget;
     // remove when our clients don't rely on accessBitmap()
     SkBitmap        fLegacyBitmap;
     bool            fNeedClear;
+    SkSurface_Gpu*  fSurface;
 
     SkGpuDevice(GrRenderTarget*, const SkSurfaceProps*, unsigned flags);
 
     SkBaseDevice* onCreateCompatibleDevice(const CreateInfo&) SK_OVERRIDE;
 
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) SK_OVERRIDE;
 
     SkImageFilter::Cache* getImageFilterCache() SK_OVERRIDE;
 
     bool forceConservativeRasterClip() const SK_OVERRIDE { return true; }
@@ skipping 43 matching lines @@
                          bool bicubic);
 
     bool drawDashLine(const SkPoint pts[2], const SkPaint& paint);
 
     static SkPicture::AccelData::Key ComputeAccelDataKey();
 
     typedef SkBaseDevice INHERITED;
 };
 
 #endif