remove SK_SUPPORT_LEGACY_BITMAPFLATTEN code

include/core/SkBitmap.h

Index: include/core/SkBitmap.h
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index 4f74bd1eb63522c3b91e316e89652771f22bc46f..d87f01d2320b759f01fea4fbb138b7125d330fa9 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -24,8 +24,6 @@ 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
@@ -688,21 +686,6 @@ public:
     bool extractAlpha(SkBitmap* dst, const SkPaint* paint, Allocator* allocator,
                       SkIPoint* offset) const;
 
-#ifdef SK_SUPPORT_LEGACY_BITMAPFLATTEN
-    /** The following two functions provide the means to both flatten and
-        unflatten the bitmap AND its pixels into the provided buffer.
-        It is recommended that you do not call these functions directly,
-        but instead call the write/readBitmap functions on the respective
-        buffers as they can optimize the recording process and avoid recording
-        duplicate bitmaps and pixelRefs.
-     */
-    void flatten(SkWriteBuffer&) const;
-#else
-private:
-#endif
-    void unflatten(SkReadBuffer&);
-public:
-
     SkDEBUGCODE(void validate() const;)
 
     class Allocator : public SkRefCnt {
@@ -799,6 +782,8 @@ private:
     void freePixels();
     void updatePixelsFromRef() const;
 
+    void legacyUnflatten(SkReadBuffer&);
+
     static void WriteRawPixels(SkWriteBuffer*, const SkBitmap&);
     static bool ReadRawPixels(SkReadBuffer*, SkBitmap*);