diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 20:42:00 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 20:42:00 +0000 |
| commit | 5a70945ddd036b8079987954123ff8f382c285af (patch) | |
| tree | 3bb2d0ee55d6732edc13c04d4f63050deea157e3 /include/core | |
| parent | 2a5cd60bfff32c92cf44a8cfc3e8c017b9aee456 (diff) | |
Port most uses of SkOnce to SkLazyPtr.
BUG=skia:
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/304383005
git-svn-id: http://skia.googlecode.com/svn/trunk@15006 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/core')
| -rw-r--r-- | include/core/SkPathRef.h | 2 | ||||
| -rw-r--r-- | include/core/SkTypeface.h | 3 |
2 files changed, 3 insertions, 2 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; |