diff options
| author |  mtklein <mtklein@chromium.org> | 2014-06-02 08:44:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-06-02 08:44:27 -0700 |
| commit | 78358bf624c7e7c09ffccf638c50870808d884d6 (patch) | |
| tree | 71a7dfbae1429f457cd5c31eb4469925991cf245 /include | |
| parent | 309e86912445879651d52ebbedb67b4ff3f1516c (diff) | |
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@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/304383005
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkPathRef.h | 2 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 3 | ||||
| -rw-r--r-- | include/ports/SkFontMgr.h | 2 | ||||
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 1 | ||||
| -rw-r--r-- | include/ports/SkRemotableFontMgr.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/include/core/SkPathRef.h b/include/core/SkPathRef.h index 8802714243..47a69b7e73 100644 --- a/include/core/SkPathRef.h +++ b/include/core/SkPathRef.h @@ -418,7 +418,7 @@ private: /** * Called the first time someone calls CreateEmpty to actually create the singleton. */ - static void CreateEmptyImpl(int/*unused*/); + static SkPathRef* CreateEmptyImpl(); void setIsOval(bool isOval) { fIsOval = isOval; } diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h index 0be97eb4f7..0b1c1f24ac 100644 --- a/include/core/SkTypeface.h +++ b/include/core/SkTypeface.h @@ -339,7 +339,8 @@ private: uint32_t glyphIDsCount = 0) const; private: - static void create_default_typeface(Style style); + static SkTypeface* CreateDefault(int style); // SkLazyPtr requires an int, not a Style. + static void DeleteDefault(SkTypeface*); SkFontID fUniqueID; Style fStyle; diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h index a2fad9aba6..bb8c7b7d98 100644 --- a/include/ports/SkFontMgr.h +++ b/include/ports/SkFontMgr.h @@ -131,7 +131,7 @@ protected: unsigned styleBits) const = 0; private: static SkFontMgr* Factory(); // implemented by porting layer - friend void set_up_default(SkFontMgr** singleton); + static SkFontMgr* CreateDefault(); typedef SkRefCnt INHERITED; }; diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 6d497ee4f8..b9ce344a73 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -11,7 +11,6 @@ #include "SkDataTable.h" #include "SkFontMgr.h" #include "SkFontStyle.h" -#include "SkOnce.h" #include "SkRemotableFontMgr.h" #include "SkTArray.h" #include "SkTypeface.h" diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h index 68b4462206..bd99497cda 100644 --- a/include/ports/SkRemotableFontMgr.h +++ b/include/ports/SkRemotableFontMgr.h @@ -46,7 +46,7 @@ public: private: SkRemotableFontIdentitySet() : fCount(0), fData() { } - static void NewEmptyImpl(int); + static SkRemotableFontIdentitySet* NewEmptyImpl(); int fCount; SkAutoTMalloc<SkFontIdentity> fData; |