Revert of Enable flattening of SkRecordedDrawable

tests/FlattenDrawableTest.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkDrawable.h"
 #include "SkOnce.h"
@@ skipping 228 matching lines @@
 
     // Note that we can still recognize the generic drawable as an IntDrawable
     SkDrawable* generic = rootOut->drawable();
     REPORTER_ASSERT(r, !strcmp("IntDrawable", generic->getTypeName()));
     IntDrawable* integer = (IntDrawable*) generic;
     REPORTER_ASSERT(r, 1 == integer->a());
     REPORTER_ASSERT(r, 2 == integer->b());
     REPORTER_ASSERT(r, 3 == integer->c());
     REPORTER_ASSERT(r, 4 == integer->d());
 }
-
-DEF_TEST(FlattenRecordedDrawable, r) {
-    // Record a set of canvas draw commands
-    SkPictureRecorder recorder;
-    SkCanvas* canvas = recorder.beginRecording(1000.0f, 1000.0f);
-    canvas->drawPoint(42.0f, 17.0f, SK_ColorGREEN);
-    SkPaint paint;
-    paint.setColor(SK_ColorRED);
-    canvas->drawPaint(paint);
-    SkPaint textPaint;
-    textPaint.setColor(SK_ColorBLUE);
-    canvas->drawText("TEXT", 4, 467.0f, 100.0f, textPaint);
-
-    // Draw some drawables as well
-    SkAutoTUnref<SkDrawable> drawable(new IntDrawable(1, 2, 3, 4));
-    SkAutoTUnref<RootDrawable> root(new RootDrawable(5, 6, 7, 8, paint, 9, 10, 11, 12, drawable));
-    canvas->drawDrawable(root, 747.0f, 242.0f);
-    SkAutoTUnref<PaintDrawable> paintDrawable(new PaintDrawable(paint));
-    canvas->drawDrawable(paintDrawable, 500.0, 500.0f);
-    SkAutoTUnref<CompoundDrawable> comDrawable(new CompoundDrawable(13, 14, 15, 16, textPaint));
-    canvas->drawDrawable(comDrawable, 10.0f, 10.0f);
-
-    // Serialize the recorded drawable
-    sk_sp<SkDrawable> recordedDrawable = recorder.finishRecordingAsDrawable();
-    SkWriteBuffer writeBuffer;
-    writeBuffer.writeFlattenable(recordedDrawable.get());
-
-    // Copy the contents of the write buffer into a read buffer
-    sk_sp<SkData> data = SkData::MakeUninitialized(writeBuffer.bytesWritten());
-    writeBuffer.writeToMemory(data->writable_data());
-    SkReadBuffer readBuffer(data->data(), data->size());
-    register_test_drawables(readBuffer);
-
-    // Deserialize and verify the drawable
-    SkAutoTUnref<SkDrawable> out((SkDrawable*)
-            readBuffer.readFlattenable(SkFlattenable::kSkDrawable_Type));
-    REPORTER_ASSERT(r, out);
-    REPORTER_ASSERT(r, !strcmp("SkRecordedDrawable", out->getTypeName()));
-}