diff options
| author |  mtklein <mtklein@google.com> | 2015-09-09 07:10:42 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-09 07:10:42 -0700 |
| commit | 2ac6793efc9b33f6104f9c39810bee5714bdc208 (patch) | |
| tree | 9d7e8e1e89d3fae55e7f6eabc9139fa28989d561 /src/pdf/SkPDFShader.cpp | |
| parent | 62fb1ba1786863e545c89839b5706ad5151cec15 (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/pdf/SkPDFShader.cpp')
| -rw-r--r-- | src/pdf/SkPDFShader.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp index fe6e47c1db..645091dad2 100644 --- a/src/pdf/SkPDFShader.cpp +++ b/src/pdf/SkPDFShader.cpp @@ -10,7 +10,6 @@ #include "SkPDFShader.h" #include "SkData.h" -#include "SkOncePtr.h" #include "SkPDFCanon.h" #include "SkPDFDevice.h" #include "SkPDFFormXObject.h" @@ -678,7 +677,8 @@ static bool split_perspective(const SkMatrix in, SkMatrix* affine, return true; } -static SkPDFObject* create_range_object() { +namespace { +SkPDFObject* create_range_object() { SkPDFArray* range = new SkPDFArray; range->reserve(6); range->appendInt(0); @@ -689,7 +689,12 @@ static SkPDFObject* create_range_object() { range->appendInt(1); return range; } -SK_DECLARE_STATIC_ONCE_PTR(SkPDFObject, rangeObject); + +template <typename T> void unref(T* ptr) { ptr->unref();} +} // namespace + +SK_DECLARE_STATIC_LAZY_PTR(SkPDFObject, rangeObject, + create_range_object, unref<SkPDFObject>); static SkPDFStream* make_ps_function(const SkString& psCode, SkPDFArray* domain) { @@ -698,7 +703,7 @@ static SkPDFStream* make_ps_function(const SkString& psCode, SkPDFStream* result = new SkPDFStream(funcData.get()); result->insertInt("FunctionType", 4); result->insertObject("Domain", SkRef(domain)); - result->insertObject("Range", SkRef(rangeObject.get(create_range_object))); + result->insertObject("Range", SkRef(rangeObject.get())); return result; } |