Revert of Enable flattening of SkRecordedDrawable

src/core/SkPictureData.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureData_DEFINED
 #define SkPictureData_DEFINED
 
 #include "SkBitmap.h"
-#include "SkDrawable.h"
 #include "SkPicture.h"
 #include "SkPictureContentInfo.h"
 #include "SkPictureFlat.h"
 
 class SkData;
 class SkPictureRecord;
 class SkPixelSerializer;
 class SkReader32;
 class SkStream;
 class SkWStream;
@@ skipping 14 matching lines @@
     char        fMagic[8];
     uint32_t    fVersion;
     SkRect      fCullRect;
     uint32_t    fFlags;
 };
 
 #define SK_PICT_READER_TAG     SkSetFourByteTag('r', 'e', 'a', 'd')
 #define SK_PICT_FACTORY_TAG    SkSetFourByteTag('f', 'a', 'c', 't')
 #define SK_PICT_TYPEFACE_TAG   SkSetFourByteTag('t', 'p', 'f', 'c')
 #define SK_PICT_PICTURE_TAG    SkSetFourByteTag('p', 'c', 't', 'r')
-#define SK_PICT_DRAWABLE_TAG   SkSetFourByteTag('d', 'r', 'a', 'w')
 
 // This tag specifies the size of the ReadBuffer, needed for the following tags
 #define SK_PICT_BUFFER_SIZE_TAG     SkSetFourByteTag('a', 'r', 'a', 'y')
 // these are all inside the ARRAYS tag
 #define SK_PICT_BITMAP_BUFFER_TAG   SkSetFourByteTag('b', 't', 'm', 'p')
 #define SK_PICT_PAINT_BUFFER_TAG    SkSetFourByteTag('p', 'n', 't', ' ')
 #define SK_PICT_PATH_BUFFER_TAG     SkSetFourByteTag('p', 't', 'h', ' ')
 #define SK_PICT_TEXTBLOB_BUFFER_TAG SkSetFourByteTag('b', 'l', 'o', 'b')
 #define SK_PICT_IMAGE_BUFFER_TAG    SkSetFourByteTag('i', 'm', 'a', 'g')
 
@@ skipping 44 matching lines @@
     const SkPath& getPath(SkReadBuffer* reader) const {
         const int index = reader->readInt() - 1;
         return reader->validateIndex(index, fPaths.count()) ? fPaths[index] : fEmptyPath;
     }
 
     const SkPicture* getPicture(SkReadBuffer* reader) const {
         const int index = reader->readInt() - 1;
         return reader->validateIndex(index, fPictureCount) ? fPictureRefs[index] : nullptr;
     }
 
-    SkDrawable* getDrawable(SkReadBuffer* reader) const {
-        int index = reader->readInt();
-        SkASSERT(index > 0 && index <= fDrawableCount);
-        return fDrawableRefs[index - 1];
-    }
-
     const SkPaint* getPaint(SkReadBuffer* reader) const {
         const int index = reader->readInt() - 1;
         return reader->validateIndex(index, fPaints.count()) ? &fPaints[index] : nullptr;
     }
 
     const SkTextBlob* getTextBlob(SkReadBuffer* reader) const {
         const int index = reader->readInt() - 1;
         return reader->validateIndex(index, fTextBlobCount) ? fTextBlobRefs[index] : nullptr;
     }
 
@@ skipping 33 matching lines @@
     SkTArray<SkPaint>  fPaints;
     SkTArray<SkPath>   fPaths;
 
     sk_sp<SkData>   fOpData;    // opcodes and parameters
 
     const SkPath    fEmptyPath;
     const SkBitmap  fEmptyBitmap;
 
     const SkPicture** fPictureRefs;
     int fPictureCount;
-    SkDrawable** fDrawableRefs;
-    int fDrawableCount;
     const SkTextBlob** fTextBlobRefs;
     int fTextBlobCount;
     const SkImage** fImageRefs;
     int fImageCount;
 
     SkPictureContentInfo fContentInfo;
 
     SkTypefacePlayback fTFPlayback;
     SkFactoryPlayback* fFactoryPlayback;
 
     const SkPictInfo fInfo;
 
     static void WriteFactories(SkWStream* stream, const SkFactorySet& rec);
     static void WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec);
 
     void initForPlayback() const;
 };
 
 #endif