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

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

Issue 2294433002: s/s_fontManager/s_staticFontManager/ to help rewrite_to_chrome_style tool. (Closed)
Patch Set: Created 4 years, 4 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.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/FontCache.cpp b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
index fbff07e7b59ab6e6a4189874d13888a8e86030d4..36433a6b6e83be8542b9b987d2f01463f2d16a2d 100644
--- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp
+++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
@@ -76,7 +76,7 @@ typedef HashMap<FallbackListCompositeKey, std::unique_ptr<ShapeCache>, FallbackL
static FontPlatformDataCache* gFontPlatformDataCache = nullptr;
static FallbackListShaperCache* gFallbackListShaperCache = nullptr;
-SkFontMgr* FontCache::s_fontManager = nullptr;
+SkFontMgr* FontCache::s_staticFontManager = nullptr;
#if OS(WIN)
bool FontCache::s_antialiasedTextEnabled = false;
@@ -187,10 +187,10 @@ FontVerticalDataCache& fontVerticalDataCacheInstance()
void FontCache::setFontManager(const RefPtr<SkFontMgr>& fontManager)
{
- ASSERT(!s_fontManager);
- s_fontManager = fontManager.get();
+ DCHECK(!s_staticFontManager);
+ s_staticFontManager = fontManager.get();
// Explicitly AddRef since we're going to hold on to the object for the life of the program.
- s_fontManager->ref();
+ s_staticFontManager->ref();
}
PassRefPtr<OpenTypeVerticalData> FontCache::getVerticalData(const FontFileKey& key, const FontPlatformData& platformData)

Powered by Google App Engine
This is Rietveld 408576698