| Index: include/core/SkPicture.h
|
| diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
|
| index d57af50611ca3f98a25a8d5dfe218862d4ffb1b3..6c486c978900683ab35b1adeaafc253864b30374 100644
|
| --- a/include/core/SkPicture.h
|
| +++ b/include/core/SkPicture.h
|
| @@ -14,6 +14,7 @@
|
| #include "SkDrawPictureCallback.h"
|
| #include "SkImageDecoder.h"
|
| #include "SkRefCnt.h"
|
| +#include "SkTDArray.h"
|
|
|
| #if SK_SUPPORT_GPU
|
| class GrContext;
|
| @@ -261,15 +262,15 @@ private:
|
| // stream along with the CTMs needed for those operation.
|
| class OperationList : ::SkNoncopyable {
|
| public:
|
| - virtual ~OperationList() {}
|
| -
|
| // The following three entry points should only be accessed if
|
| // 'valid' returns true.
|
| - virtual int numOps() const { SkASSERT(false); return 0; };
|
| + int numOps() const { return fOps.count(); }
|
| // The offset in the picture of the operation to execute.
|
| - virtual uint32_t offset(int index) const { SkASSERT(false); return 0; };
|
| + uint32_t offset(int index) const;
|
| // The CTM that must be installed for the operation to behave correctly
|
| - virtual const SkMatrix& matrix(int index) const { SkASSERT(false); return SkMatrix::I(); }
|
| + const SkMatrix& matrix(int index) const;
|
| +
|
| + SkTDArray<void*> fOps;
|
| };
|
|
|
| /** PRIVATE / EXPERIMENTAL -- do not call
|
|
|