aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkBigPicture.h
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-09-09 07:10:42 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-09-09 07:10:42 -0700
commit2ac6793efc9b33f6104f9c39810bee5714bdc208 (patch)
tree9d7e8e1e89d3fae55e7f6eabc9139fa28989d561 /src/core/SkBigPicture.h
parent62fb1ba1786863e545c89839b5706ad5151cec15 (diff)
Revert of Port uses of SkLazyPtr to SkOncePtr. (patchset #7 id:110001 of https://codereview.chromium.org/1322933005/ )
Reason for revert: Breaks Chrome roll. obj/skia/ext/skia_chrome.skia_memory_dump_provider.o does not have -I include/private on its include path, but transitively includes SkMessageBus.h. Original issue's description: > Port uses of SkLazyPtr to SkOncePtr. > > This gives SkOncePtr a non-trivial destructor that uses std::default_delete > by default. This is overrideable, as seen in SkColorTable. > > SK_DECLARE_STATIC_ONCE_PTR still just leaves its pointers hanging at EOP. > > BUG=skia: > > No public API changes. > TBR=reed@google.com > > Committed: https://skia.googlesource.com/skia/+/a1254acdb344174e761f5061c820559dab64a74c TBR=herb@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1334523002
Diffstat (limited to 'src/core/SkBigPicture.h')
-rw-r--r--src/core/SkBigPicture.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkBigPicture.h b/src/core/SkBigPicture.h
index 2e42213539..dfd6b800ac 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 "SkLazyPtr.h"
#include "SkPicture.h"
#include "SkTemplates.h"
@@ -79,7 +79,7 @@ private:
const SkRect fCullRect;
const size_t fApproxBytesUsedBySubPictures;
- SkOncePtr<const Analysis> fAnalysis;
+ SkLazyPtr<const Analysis> fAnalysis;
SkAutoTUnref<const SkRecord> fRecord;
SkAutoTDelete<const SnapshotArray> fDrawablePicts;
SkAutoTUnref<const SkBBoxHierarchy> fBBH;