remove SK_SUPPORT_LEGACY_BITMAPFLATTEN code

src/core/SkBitmap.cpp

 
 /*
  * Copyright 2008 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.
  */
 
 
 #include "SkBitmap.h"
@@ skipping 1329 matching lines @@
     bitmap->setConfig(pr->info());
     bitmap->setPixelRef(pr, 0, 0);
     return true;
 }
 
 enum {
     SERIALIZE_PIXELTYPE_NONE,
     SERIALIZE_PIXELTYPE_REF_DATA
 };
 
-#ifdef SK_SUPPORT_LEGACY_BITMAPFLATTEN
-void SkBitmap::flatten(SkWriteBuffer& buffer) const {
-    fInfo.flatten(buffer);
-    buffer.writeInt(fRowBytes);
-
-    if (fPixelRef) {
-        if (fPixelRef->getFactory()) {
-            buffer.writeInt(SERIALIZE_PIXELTYPE_REF_DATA);
-            buffer.writeInt(fPixelRefOrigin.fX);
-            buffer.writeInt(fPixelRefOrigin.fY);
-            buffer.writeFlattenable(fPixelRef);
-            return;
-        }
-        // if we get here, we can't record the pixels
-        buffer.writeInt(SERIALIZE_PIXELTYPE_NONE);
-    } else {
-        buffer.writeInt(SERIALIZE_PIXELTYPE_NONE);
-    }
-}
-#endif
-
-void SkBitmap::unflatten(SkReadBuffer& buffer) {
+void SkBitmap::legacyUnflatten(SkReadBuffer& buffer) {
     this->reset();
 
     SkImageInfo info;
     info.unflatten(buffer);
     size_t rowBytes = buffer.readInt();
     if (!buffer.validate((info.width() >= 0) && (info.height() >= 0) &&
                          SkColorTypeIsValid(info.fColorType) &&
                          SkAlphaTypeIsValid(info.fAlphaType) &&
                          validate_alphaType(info.fColorType, info.fAlphaType) &&
                          info.validRowBytes(rowBytes))) {
@@ skipping 119 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef SK_DEBUG
 void SkImageInfo::validate() const {
     SkASSERT(fWidth >= 0);
     SkASSERT(fHeight >= 0);
     SkASSERT(SkColorTypeIsValid(fColorType));
     SkASSERT(SkAlphaTypeIsValid(fAlphaType));
 }
 #endif