diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-31 00:15:22 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-31 00:15:22 +0000 |
| commit | f71e8fd0c5d2da9795d00a5b81b716ae585be14a (patch) | |
| tree | fe05847a2462ba087f532fdd002c076dbdce541b /include/ports/SkRemotableFontMgr.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 'include/ports/SkRemotableFontMgr.h')
| -rw-r--r-- | include/ports/SkRemotableFontMgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h index bd99497cda..68b4462206 100644 --- a/include/ports/SkRemotableFontMgr.h +++ b/include/ports/SkRemotableFontMgr.h @@ -46,7 +46,7 @@ public: private: SkRemotableFontIdentitySet() : fCount(0), fData() { } - static SkRemotableFontIdentitySet* NewEmptyImpl(); + static void NewEmptyImpl(int); int fCount; SkAutoTMalloc<SkFontIdentity> fData; |