Index: third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp |
diff --git a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp |
index 8e28035b86059d7b51df440fffc7887b2d9bcea2..43217f81a95f77ce290d8fc1513179618a342315 100644 |
--- a/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/FontFallbackList.cpp |
@@ -63,7 +63,7 @@ void FontFallbackList::releaseFontData() { |
unsigned numFonts = m_fontList.size(); |
for (unsigned i = 0; i < numFonts; ++i) { |
if (!m_fontList[i]->isCustomFont()) { |
- ASSERT(!m_fontList[i]->isSegmented()); |
+ DCHECK(!m_fontList[i]->isSegmented()); |
FontCache::fontCache()->releaseFontData(toSimpleFontData(m_fontList[i])); |
} |
} |
@@ -110,7 +110,7 @@ const SimpleFontData* FontFallbackList::determinePrimarySimpleFontData( |
FontCache::fontCache() |
->getLastResortFallbackFont(fontDescription) |
.get(); |
- ASSERT(lastResortFallback); |
+ DCHECK(lastResortFallback); |
return lastResortFallback; |
} |
@@ -120,7 +120,7 @@ const SimpleFontData* FontFallbackList::determinePrimarySimpleFontData( |
const SimpleFontData* fontDataForSpace = |
fontData->fontDataForCharacter(spaceCharacter); |
- ASSERT(fontDataForSpace); |
+ DCHECK(fontDataForSpace); |
// When a custom font is loading, we should use the correct fallback font to |
// layout the text. Here skip the temporary font for the loading custom |
@@ -220,7 +220,7 @@ const FontData* FontFallbackList::fontDataAt( |
.get(); // This fallback font is already in our list. |
// Make sure we're not passing in some crazy value here. |
- ASSERT(realizedFontIndex == m_fontList.size()); |
+ DCHECK_EQ(realizedFontIndex, m_fontList.size()); |
if (m_familyIndex == cAllFamiliesScanned) |
return 0; |
@@ -230,7 +230,7 @@ const FontData* FontFallbackList::fontDataAt( |
// families we've looked at before in |m_familyIndex|, so that we never scan |
// the same spot in the list twice. getFontData will adjust our |
// |m_familyIndex| as it scans for the right font to make. |
- ASSERT(FontCache::fontCache()->generation() == m_generation); |
+ DCHECK_EQ(FontCache::fontCache()->generation(), m_generation); |
RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); |
if (result) { |
m_fontList.push_back(result); |