Revert of Enable flattening of SkRecordedDrawable

src/core/SkPictureRecord.h

Index: src/core/SkPictureRecord.h
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index 59bd92dc77d27562dbdfc023023bfc724c3243f6..129f94f9b3477d5254f58e97ad84a23c88e9afd8 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -33,10 +33,6 @@
 
     const SkTDArray<const SkPicture* >& getPictureRefs() const {
         return fPictureRefs;
-    }
-
-    const SkTDArray<SkDrawable* >& getDrawableRefs() const {
-        return fDrawableRefs;
     }
 
     const SkTDArray<const SkTextBlob* >& getTextBlobRefs() const {
@@ -135,7 +131,6 @@
     void addPatch(const SkPoint cubics[12]);
     void addPath(const SkPath& path);
     void addPicture(const SkPicture* picture);
-    void addDrawable(SkDrawable* picture);
     void addPoint(const SkPoint& point);
     void addPoints(const SkPoint pts[], int count);
     void addRect(const SkRect& rect);
@@ -209,7 +204,6 @@
     void onClipRegion(const SkRegion&, SkRegion::Op) override;
 
     void onDrawPicture(const SkPicture*, const SkMatrix*, const SkPaint*) override;
-    void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     void onDrawAnnotation(const SkRect&, const char[], SkData*) override;
 
     int addPathToHeap(const SkPath& path);  // does not write to ops stream
@@ -244,7 +238,6 @@
     // we ref each item in these arrays
     SkTDArray<const SkImage*>    fImageRefs;
     SkTDArray<const SkPicture*>  fPictureRefs;
-    SkTDArray<SkDrawable*>       fDrawableRefs;
     SkTDArray<const SkTextBlob*> fTextBlobRefs;
 
     uint32_t fRecordFlags;