diff options
author | 2014-05-31 00:15:22 +0000 | |
---|---|---|
committer | 2014-05-31 00:15:22 +0000 | |
commit | f71e8fd0c5d2da9795d00a5b81b716ae585be14a (patch) | |
tree | fe05847a2462ba087f532fdd002c076dbdce541b /src/core/SkLazyPtr.h | |
parent | 56f7cca144c539ec01f00d6382fded362ff193a3 (diff) |
Revert of Port most uses of SkOnce to SkLazyPtr. (https://codereview.chromium.org/304383005/)
Reason for revert:
linux x86-64 release segfault in src/ports/SkFontHost_fontconfig.cpp:107
http://108.170.220.120:10117/builders/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/builds/905/steps/RunTests/logs/stdio
Original issue's description:
> Port most uses of SkOnce to SkLazyPtr.
>
> BUG=skia:
>
> Committed: http://code.google.com/p/skia/source/detail?r=15006
>
> Committed: http://code.google.com/p/skia/source/detail?r=15014
R=reed@google.com, mtklein@chromium.org
TBR=mtklein@chromium.org, reed@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Author: mtklein@google.com
Review URL: https://codereview.chromium.org/306063004
git-svn-id: http://skia.googlecode.com/svn/trunk@15015 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkLazyPtr.h')
-rw-r--r-- | src/core/SkLazyPtr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/SkLazyPtr.h b/src/core/SkLazyPtr.h index fa1a14e033..515086876c 100644 --- a/src/core/SkLazyPtr.h +++ b/src/core/SkLazyPtr.h @@ -64,6 +64,7 @@ // See FIXME below. class SkFontConfigInterface; +class SkTypeface; namespace Private { @@ -99,6 +100,7 @@ public: #ifdef SK_DEBUG // FIXME: We know we leak refs on some classes. For now, let them leak. void cleanup(SkFontConfigInterface*) {} + void cleanup(SkTypeface*) {} template <typename U> void cleanup(U* ptr) { Destroy(ptr); } ~SkLazyPtr() { |