| Index: src/core/SkBigPicture.h
|
| diff --git a/src/core/SkBigPicture.h b/src/core/SkBigPicture.h
|
| index 0834709f8a626075ba88dc48201f2f5ecf778675..f9997f705b3261e1874ab1a18a7ba26d907bb118 100644
|
| --- a/src/core/SkBigPicture.h
|
| +++ b/src/core/SkBigPicture.h
|
| @@ -8,7 +8,7 @@
|
| #ifndef SkBigPicture_DEFINED
|
| #define SkBigPicture_DEFINED
|
|
|
| -#include "SkOncePtr.h"
|
| +#include "SkOnce.h"
|
| #include "SkPicture.h"
|
| #include "SkRect.h"
|
| #include "SkTemplates.h"
|
| @@ -65,7 +65,7 @@ public:
|
|
|
| private:
|
| struct Analysis {
|
| - explicit Analysis(const SkRecord&);
|
| + void init(const SkRecord&);
|
|
|
| bool suitableForGpuRasterization(const char** reason) const;
|
|
|
| @@ -81,7 +81,8 @@ private:
|
|
|
| const SkRect fCullRect;
|
| const size_t fApproxBytesUsedBySubPictures;
|
| - SkOncePtr<const Analysis> fAnalysis;
|
| + mutable SkOnce fAnalysisOnce;
|
| + mutable Analysis fAnalysis;
|
| SkAutoTUnref<const SkRecord> fRecord;
|
| SkAutoTDelete<const SnapshotArray> fDrawablePicts;
|
| SkAutoTUnref<const SkBBoxHierarchy> fBBH;
|
|
|