store info in basedevice, change getter to non-virtual const&

include/core/SkDevice.h

Index: include/core/SkDevice.h
diff --git a/include/core/SkDevice.h b/include/core/SkDevice.h
index 76549ca5d0e1c1b6ca3d750e84fd0fd4a273e437..44b8791386ff8fde00cfe26cf0bd440bf9bd18ee 100644
--- a/include/core/SkDevice.h
+++ b/include/core/SkDevice.h
@@ -30,7 +30,7 @@ public:
     /**
      *  Construct a new device.
     */
-    explicit SkBaseDevice(const SkSurfaceProps&);
+    explicit SkBaseDevice(const SkImageInfo&, const SkSurfaceProps&);
     virtual ~SkBaseDevice();
 
     SkMetaData& getMetaData();
@@ -39,7 +39,7 @@ public:
      *  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;
+    const SkImageInfo& imageInfo() const { return fInfo; }
 
     /**
      *  Return SurfaceProps for this device.
@@ -371,9 +371,15 @@ private:
 
     virtual SkImageFilterCache* getImageFilterCache() { return NULL; }
 
+    friend class SkBitmapDevice;
+    void privateResize(int w, int h) {
+        *const_cast<SkImageInfo*>(&fInfo) = fInfo.makeWH(w, h);

[bsalomon, 2016/08/20 14:57:29]

why not just make it non-const? Also, there's a whole clique of friends up at
line 343.

+    }
+
     SkIPoint    fOrigin;
     SkMetaData* fMetaData;
-    SkSurfaceProps fSurfaceProps;
+    const SkImageInfo    fInfo;
+    const SkSurfaceProps fSurfaceProps;
 
 #ifdef SK_SUPPORT_LEGACY_ACCESSBITMAP
     SkBitmap    fLegacyBitmap;