stop calling SkBitmap::flatten

include/core/SkBitmap.h

Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 6ffe1bb6920f5c9999d0f71865c053388092b976..4f94a7081c66f030422357b789e7963e7ffc13c7 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -24,6 +24,8 @@ class SkRegion;
 class SkString;
 class GrTexture;
 
+//#define SK_SUPPORT_LEGACY_BITMAPFLATTEN
+
 /** \class SkBitmap
 
     The SkBitmap class specifies a raster bitmap. A bitmap has an integer width
@@ -698,8 +700,14 @@ public:
         buffers as they can optimize the recording process and avoid recording
         duplicate bitmaps and pixelRefs.
      */
+#ifdef SK_SUPPORT_LEGACY_BITMAPFLATTEN

[scroggo, 2014/05/20 13:27:50]

Could you move these before the comment, so the comment goes with the functions
it describes?

[reed1, 2014/05/20 17:49:58]

Done.

+public:
+#else
+private:
+#endif
     void flatten(SkWriteBuffer&) const;

[scroggo, 2014/05/20 13:27:50]

Can't we remove this entirely when SK_SUPPORT_LEGACY_BITMAPFLATTEN is not
defined?

[reed1, 2014/05/20 17:49:58]

Done.

     void unflatten(SkReadBuffer&);
+public:
 
     SkDEBUGCODE(void validate() const;)
 
@@ -797,6 +805,8 @@ private:
     void freePixels();
     void updatePixelsFromRef() const;
 
+    friend class SkBitmapSource;    // unflatten
+    friend class SkReadBuffer;      // unflatten
     friend struct SkBitmapProcState;
 };