Revert of Enable flattening of SkRecordedDrawable

src/core/SkPictureRecord.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPictureRecord.h"
 #include "SkImage_Base.h"
 #include "SkPatchUtils.h"
@@ skipping 15 matching lines @@
 
 SkPictureRecord::SkPictureRecord(const SkISize& dimensions, uint32_t flags)
     : INHERITED(dimensions.width(), dimensions.height())
     , fRecordFlags(flags)
     , fInitialSaveCount(kNoInitialSave) {
 }
 
 SkPictureRecord::~SkPictureRecord() {
     fImageRefs.unrefAll();
     fPictureRefs.unrefAll();
-    fDrawableRefs.unrefAll();
     fTextBlobRefs.unrefAll();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 void SkPictureRecord::willSave() {
     // record the offset to us, making it non-positive to distinguish a save
     // from a clip entry.
     fRestoreOffsetStack.push(-(int32_t)fWriter.bytesWritten());
     this->recordSave();
@@ skipping 583 matching lines @@
     } else {
         const SkMatrix& m = matrix ? *matrix : SkMatrix::I();
         size += m.writeToMemory(nullptr) + kUInt32Size;    // matrix + paint
         initialOffset = this->addDraw(DRAW_PICTURE_MATRIX_PAINT, &size);
         this->addPaintPtr(paint);
         this->addMatrix(m);
         this->addPicture(picture);
     }
     this->validate(initialOffset, size);
 }
-
-void SkPictureRecord::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {
-    // op + drawable index
-    size_t size = 2 * kUInt32Size;
-    size_t initialOffset;
-
-    if (nullptr == matrix) {
-        initialOffset = this->addDraw(DRAW_DRAWABLE, &size);
-        this->addDrawable(drawable);
-    } else {
-        size += matrix->writeToMemory(nullptr);    // matrix
-        initialOffset = this->addDraw(DRAW_DRAWABLE_MATRIX, &size);
-        this->addMatrix(*matrix);
-        this->addDrawable(drawable);
-    }
-    this->validate(initialOffset, size);
-}
 
 void SkPictureRecord::onDrawVertices(VertexMode vmode, int vertexCount,
                                      const SkPoint vertices[], const SkPoint texs[],
                                      const SkColor colors[], SkXfermode* xfer,
                                      const uint16_t indices[], int indexCount,
                                      const SkPaint& paint) {
     uint32_t flags = 0;
     if (texs) {
         flags |= DRAW_VERTICES_HAS_TEXS;
     }
@@ skipping 262 matching lines @@
     int index = fPictureRefs.find(picture);
     if (index < 0) {    // not found
         index = fPictureRefs.count();
         *fPictureRefs.append() = picture;
         picture->ref();
     }
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
 
-void SkPictureRecord::addDrawable(SkDrawable* drawable) {
-    int index = fDrawableRefs.find(drawable);
-    if (index < 0) {    // not found
-        index = fDrawableRefs.count();
-        *fDrawableRefs.append() = drawable;
-        drawable->ref();
-    }
-    // follow the convention of recording a 1-based index
-    this->addInt(index + 1);
-}
-
 void SkPictureRecord::addPoint(const SkPoint& point) {
     fWriter.writePoint(point);
 }
 
 void SkPictureRecord::addPoints(const SkPoint pts[], int count) {
     fWriter.writeMul4(pts, count * sizeof(SkPoint));
 }
 
 void SkPictureRecord::addNoOp() {
     size_t size = kUInt32Size; // op
@@ skipping 36 matching lines @@
 
 void SkPictureRecord::addTextBlob(const SkTextBlob *blob) {
     int index = fTextBlobRefs.count();
     *fTextBlobRefs.append() = blob;
     blob->ref();
     // follow the convention of recording a 1-based index
     this->addInt(index + 1);
 }
 
 ///////////////////////////////////////////////////////////////////////////////