diff options
| author |  mtklein <mtklein@google.com> | 2016-04-27 09:29:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-27 09:29:34 -0700 |
| commit | 569b02151f399628b0c0c0ca825dfe7b6e2795e1 (patch) | |
| tree | 8c10668cf5feee18fbe7fa3e691449753fe875f0 /src/core/SkPictureData.h | |
| parent | d636950e8ecba89c0021ce4e76037c67aa6ee2cd (diff) | |
Revert of Enable flattening of SkRecordedDrawable (patchset #8 id:140001 of https://codereview.chromium.org/1913843002/ )
Reason for revert:
Release mode bots appear to be crashing while loading .skp files in nanobench.
Original issue's description:
> Enable flattening of SkRecordedDrawable
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1913843002
>
> Committed: https://skia.googlesource.com/skia/+/d636950e8ecba89c0021ce4e76037c67aa6ee2cd
TBR=djsollen@google.com,reed@google.com,msarett@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/1923393002
Diffstat (limited to 'src/core/SkPictureData.h')
| -rw-r--r-- | src/core/SkPictureData.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h index 4870305de4..dbb117ef14 100644 --- a/src/core/SkPictureData.h +++ b/src/core/SkPictureData.h @@ -9,7 +9,6 @@ #define SkPictureData_DEFINED #include "SkBitmap.h" -#include "SkDrawable.h" #include "SkPicture.h" #include "SkPictureContentInfo.h" #include "SkPictureFlat.h" @@ -44,7 +43,6 @@ struct SkPictInfo { #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') @@ -109,12 +107,6 @@ public: 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; @@ -168,8 +160,6 @@ private: const SkPicture** fPictureRefs; int fPictureCount; - SkDrawable** fDrawableRefs; - int fDrawableCount; const SkTextBlob** fTextBlobRefs; int fTextBlobCount; const SkImage** fImageRefs; |