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

Unified Diff: third_party/WebKit/Source/platform/fonts/FontCache.h

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)
Patch Set: Rebasing... Created 4 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
Index: third_party/WebKit/Source/platform/fonts/FontCache.h
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.h b/third_party/WebKit/Source/platform/fonts/FontCache.h
index 415700fb6b059e033bda80b32b0c8d07811eb755..3bd9064bbb6134115004c4fa1e1a3a3ec559df6e 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.h
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.h
@@ -35,11 +35,11 @@
#include "platform/fonts/FontCacheKey.h"
#include "platform/fonts/FontFaceCreationParams.h"
#include "platform/fonts/FontFallbackPriority.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
#include "wtf/Allocator.h"
#include "wtf/Forward.h"
#include "wtf/HashMap.h"
#include "wtf/PassRefPtr.h"
-#include "wtf/RefPtr.h"
#include "wtf/text/CString.h"
#include "wtf/text/Unicode.h"
#include "wtf/text/WTFString.h"
@@ -106,7 +106,7 @@ public:
void invalidate();
SkFontMgr* fontManager() { return m_fontManager.get(); }
- static void setFontManager(const RefPtr<SkFontMgr>&);
+ static void setFontManager(const sk_sp<SkFontMgr>&);
#if OS(WIN)
static bool antialiasedTextEnabled() { return s_antialiasedTextEnabled; }
@@ -177,7 +177,7 @@ private:
std::unique_ptr<FontPlatformData> scaleFontPlatformData(const FontPlatformData&, const FontDescription&, const FontFaceCreationParams&, float fontSize);
// Implemented on skia platforms.
- PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
+ sk_sp<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
#if OS(ANDROID) || OS(LINUX)
static AtomicString getFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority);
@@ -188,7 +188,7 @@ private:
// Don't purge if this count is > 0;
int m_purgePreventCount;
- RefPtr<SkFontMgr> m_fontManager;
+ sk_sp<SkFontMgr> m_fontManager;
static SkFontMgr* s_staticFontManager;
@@ -196,7 +196,7 @@ private:
static bool s_antialiasedTextEnabled;
static bool s_lcdTextEnabled;
static float s_deviceScaleFactor;
- static HashMap<String, RefPtr<SkTypeface>>* s_sideloadedFonts;
+ static HashMap<String, sk_sp<SkTypeface>>* s_sideloadedFonts;
// The system font metrics cache.
static AtomicString* s_menuFontFamilyName;
static int32_t s_menuFontHeight;
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/Font.cpp ('k') | third_party/WebKit/Source/platform/fonts/FontCache.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698