| 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 6cb2906c272c7e70023133e9f90adb824b59085f..daa15e1e27b1689b53099c9bc449a1a02b43440e 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/FontCache.cpp
|
| @@ -221,7 +221,7 @@ ShapeCache* FontCache::getShapeCache(const FallbackListCompositeKey& key) {
|
| result = it->value.get();
|
| }
|
|
|
| - ASSERT(result);
|
| + DCHECK(result);
|
| return result;
|
| }
|
|
|
| @@ -290,7 +290,7 @@ PassRefPtr<SimpleFontData> FontCache::fontDataFromFontPlatformData(
|
|
|
| #if DCHECK_IS_ON()
|
| if (shouldRetain == DoNotRetain)
|
| - ASSERT(m_purgePreventCount);
|
| + DCHECK(m_purgePreventCount);
|
| #endif
|
|
|
| return gFontDataCache->get(platformData, shouldRetain, subpixelAscentDescent);
|
| @@ -328,7 +328,7 @@ SimpleFontData* FontCache::getNonRetainedLastResortFallbackFont(
|
| }
|
|
|
| void FontCache::releaseFontData(const SimpleFontData* fontData) {
|
| - ASSERT(gFontDataCache);
|
| + DCHECK(gFontDataCache);
|
|
|
| gFontDataCache->release(fontData);
|
| }
|
| @@ -427,7 +427,7 @@ HeapHashSet<WeakMember<FontCacheClient>>& fontCacheClients() {
|
|
|
| void FontCache::addClient(FontCacheClient* client) {
|
| CHECK(client);
|
| - ASSERT(!fontCacheClients().contains(client));
|
| + DCHECK(!fontCacheClients().contains(client));
|
| fontCacheClients().insert(client);
|
| }
|
|
|
| @@ -439,7 +439,7 @@ unsigned short FontCache::generation() {
|
|
|
| void FontCache::invalidate() {
|
| if (!invalidateFontCache) {
|
| - ASSERT(!gFontPlatformDataCache);
|
| + DCHECK(!gFontPlatformDataCache);
|
| return;
|
| }
|
|
|
| @@ -480,7 +480,7 @@ void FontCache::crashWithFontInfo(const FontDescription* fontDescription) {
|
|
|
| void FontCache::dumpFontPlatformDataCache(
|
| base::trace_event::ProcessMemoryDump* memoryDump) {
|
| - ASSERT(isMainThread());
|
| + DCHECK(isMainThread());
|
| if (!gFontPlatformDataCache)
|
| return;
|
| base::trace_event::MemoryAllocatorDump* dump =
|
| @@ -494,7 +494,7 @@ void FontCache::dumpFontPlatformDataCache(
|
|
|
| void FontCache::dumpShapeResultCache(
|
| base::trace_event::ProcessMemoryDump* memoryDump) {
|
| - ASSERT(isMainThread());
|
| + DCHECK(isMainThread());
|
| if (!gFallbackListShaperCache) {
|
| return;
|
| }
|
|
|