remove SkDeviceProperties

include/core/SkDevice.h

 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkDevice_DEFINED
 #define SkDevice_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkImageFilter.h"
+#include "SkSurfaceProps.h"
 
 class SkClipStack;
 class SkDraw;
 class SkDrawFilter;
 struct SkIRect;
 class SkMatrix;
 class SkMetaData;
 class SkRegion;
-struct SkDeviceProperties;
 class GrRenderTarget;
 
 class SK_API SkBaseDevice : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(SkBaseDevice)
 
     /**
      *  Construct a new device.
     */
     SkBaseDevice();
-    explicit SkBaseDevice(const SkDeviceProperties&);
+    explicit SkBaseDevice(const SkSurfaceProps&);
     virtual ~SkBaseDevice();
 
     SkMetaData& getMetaData();
 
     /**
      *  Return ImageInfo for this device. If the canvas is not backed by pixels
      *  (cpu or gpu), then the info's ColorType will be kUnknown_SkColorType.
      */
     virtual SkImageInfo imageInfo() const;
 
@@ skipping 262 matching lines @@
     virtual bool onWritePixels(const SkImageInfo&, const void*, size_t, int x, int y);
 
     virtual bool onAccessPixels(SkPixmap*) { return false; }
 
     /**
      *  Leaky properties are those which the device should be applying but it isn't.
      *  These properties will be applied by the draw, when and as it can.
      *  If the device does handle a property, that property should be set to the identity value
      *  for that property, effectively making it non-leaky.
      */
-    const SkDeviceProperties& getLeakyProperties() const {
-        return *fLeakyProperties;
+    const SkSurfaceProps& getLeakyProperties() const {
+        return fLeakyProperties;
     }
 
     /**
      *  PRIVATE / EXPERIMENTAL -- do not call
      *  This entry point gives the backend an opportunity to take over the rendering
      *  of 'picture'. If optimization data is available (due to an earlier
      *  'optimize' call) this entry point should make use of it and return true
      *  if all rendering has been done. If false is returned, SkCanvas will
      *  perform its own rendering pass. It is acceptable for the backend
      *  to perform some device-specific warm up tasks and then let SkCanvas
@@ skipping 62 matching lines @@
     void setOrigin(int x, int y) { fOrigin.set(x, y); }
 
     /** Causes any deferred drawing to the device to be completed.
      */
     virtual void flush() {}
 
     virtual SkImageFilter::Cache* getImageFilterCache() { return NULL; }
 
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
-    SkDeviceProperties* fLeakyProperties;   // will always exist.
+    SkSurfaceProps fLeakyProperties;
 
 #ifdef SK_DEBUG
     bool        fAttachedToCanvas;
 #endif
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif