stop calling SkBitmap::flatten

tests/FlatDataTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
 #include "SkGradientShader.h"
 #include "SkPaint.h"
 #include "SkPictureFlat.h"
 #include "SkShader.h"
 #include "SkXfermode.h"
 #include "Test.h"
 
 struct SkFlattenableTraits {
     static void Flatten(SkWriteBuffer& buffer, const SkFlattenable& flattenable) {
         buffer.writeFlattenable(&flattenable);
     }
 };
-struct SkBitmapTraits {
-    static void Flatten(SkWriteBuffer& buffer, const SkBitmap& bitmap) {
-        bitmap.flatten(buffer);
-    }
-};
 
 class Controller : public SkChunkFlatController {
 public:
     Controller() : INHERITED(1024) {
         this->INHERITED::setNamedFactorySet(SkNEW(SkNamedFactorySet))->unref();
     }
 private:
     typedef SkChunkFlatController INHERITED;
 };
 
@@ skipping 19 matching lines @@
     points[0].set(0, 0);
     points[1].set(SkIntToScalar(20), SkIntToScalar(20));
     SkColor colors[2];
     colors[0] = SK_ColorRED;
     colors[1] = SK_ColorBLUE;
 
     SkAutoTUnref<SkShader> shader(SkGradientShader::CreateLinear(points, colors, NULL, 2,
                                                                  SkShader::kRepeat_TileMode));
     testCreate<SkFlattenableTraits>(reporter, *shader);
 
-    // Test SkBitmap
-    {
-        SkBitmap bm;
-        bm.allocN32Pixels(50, 50);
-        SkCanvas canvas(bm);
-        SkPaint paint;
-        paint.setShader(shader);
-        canvas.drawPaint(paint);
-        testCreate<SkBitmapTraits>(reporter, bm);
-    }
-
     // Test SkColorFilter
     SkAutoTUnref<SkColorFilter> cf(SkColorFilter::CreateLightingFilter(SK_ColorBLUE, SK_ColorRED));
     testCreate<SkFlattenableTraits>(reporter, *cf);
 
     // Test SkXfermode
     SkAutoTUnref<SkXfermode> xfer(SkXfermode::Create(SkXfermode::kDstOver_Mode));
     testCreate<SkFlattenableTraits>(reporter, *xfer);
 }