Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: include/core/SkTypeface.h

Issue 1322933005: Port uses of SkLazyPtr to SkOncePtr. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: name Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/core/SkLazyPtr.h ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkTypeface.h
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
index c4242181fb27cff117fef660776b4edf45a81e8b..0b1ca6a4bdaf02c231fa61fe2e62a68f24b94672 100644
--- a/include/core/SkTypeface.h
+++ b/include/core/SkTypeface.h
@@ -10,11 +10,11 @@
#ifndef SkTypeface_DEFINED
#define SkTypeface_DEFINED
+#include "../private/SkOncePtr.h"
+#include "../private/SkWeakRefCnt.h"
#include "SkFontStyle.h"
-#include "SkLazyPtr.h"
#include "SkRect.h"
#include "SkString.h"
-#include "../private/SkWeakRefCnt.h"
class SkDescriptor;
class SkFontData;
@@ -398,10 +398,7 @@ private:
static SkTypeface* CreateDefault(int style); // SkLazyPtr requires an int, not a Style.
static void DeleteDefault(SkTypeface*);
- struct BoundsComputer;
-// friend struct BoundsComputer;
-
- SkLazyPtr<SkRect> fLazyBounds;
+ SkOncePtr<SkRect> fLazyBounds;
SkFontID fUniqueID;
SkFontStyle fStyle;
bool fIsFixedPitch;
« no previous file with comments | « include/core/SkLazyPtr.h ('k') | include/private/SkOncePtr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698