remove SkDeviceProperties

include/core/SkBitmapDevice.h

Index: include/core/SkBitmapDevice.h
diff --git a/include/core/SkBitmapDevice.h b/include/core/SkBitmapDevice.h
index a2101a2dd9aaa8e54ef90311f930c8b2bbc325f1..3ce06b0cc3e90b64ed4516b4b2a9dbc2db8fee2e 100644
--- a/include/core/SkBitmapDevice.h
+++ b/include/core/SkBitmapDevice.h
@@ -22,14 +22,15 @@ public:
      *  any drawing to this device will have no effect.
     */
     SkBitmapDevice(const SkBitmap& bitmap);
-private:
+protected:
     /**
      *  Construct a new device with the specified bitmap as its backend. It is
      *  valid for the bitmap to have no pixels associated with it. In that case,
      *  any drawing to this device will have no effect.
     */
-    SkBitmapDevice(const SkBitmap& bitmap, const SkDeviceProperties& deviceProperties);
-    static SkBitmapDevice* Create(const SkImageInfo&, const SkDeviceProperties*);
+    SkBitmapDevice(const SkBitmap& bitmap, const SkSurfaceProps& surfaceProps);
+private:
+    static SkBitmapDevice* Create(const SkImageInfo&, const SkSurfaceProps*);
 public:
     static SkBitmapDevice* Create(const SkImageInfo& info) {
         return Create(info, NULL);