| Index: third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
|
| index 2fb8c9e698bf63aa71aeb8b8494db3dd8eb20bd3..83b9d49ab7a1a4f893c1cfaf49b853da7084ca02 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp
|
| @@ -114,7 +114,7 @@ struct HarfBuzzFontData {
|
| class HbFontCacheEntry : public RefCounted<HbFontCacheEntry> {
|
| public:
|
| static PassRefPtr<HbFontCacheEntry> create(hb_font_t* hbFont) {
|
| - ASSERT(hbFont);
|
| + DCHECK(hbFont);
|
| return adoptRef(new HbFontCacheEntry(hbFont));
|
| }
|
|
|
| @@ -159,7 +159,7 @@ HarfBuzzFace::HarfBuzzFace(FontPlatformData* platformData, uint64_t uniqueID)
|
| HarfBuzzFace::~HarfBuzzFace() {
|
| HarfBuzzFontCache::iterator result = harfBuzzFontCache()->find(m_uniqueID);
|
| SECURITY_DCHECK(result != harfBuzzFontCache()->end());
|
| - ASSERT(result.get()->value->refCount() > 1);
|
| + DCHECK_GT(result.get()->value->refCount(), 1);
|
| result.get()->value->deref();
|
| if (result.get()->value->refCount() == 1)
|
| harfBuzzFontCache()->erase(m_uniqueID);
|
| @@ -179,7 +179,7 @@ static hb_bool_t harfBuzzGetGlyph(hb_font_t* hbFont,
|
| void* userData) {
|
| HarfBuzzFontData* hbFontData = reinterpret_cast<HarfBuzzFontData*>(fontData);
|
|
|
| - RELEASE_ASSERT(hbFontData);
|
| + CHECK(hbFontData);
|
| if (hbFontData->m_rangeSet && !hbFontData->m_rangeSet->contains(unicode))
|
| return false;
|
|
|
| @@ -364,7 +364,7 @@ hb_face_t* HarfBuzzFace::createFace() {
|
| zeroCopySuccessHistogram.count(true);
|
| }
|
| #endif
|
| - ASSERT(face);
|
| + DCHECK(face);
|
| return face;
|
| }
|
|
|
| @@ -398,7 +398,7 @@ hb_font_t* HarfBuzzFace::getScaledFont(
|
| m_harfBuzzFontData->m_rangeSet = std::move(rangeSet);
|
| m_harfBuzzFontData->updateSimpleFontData(m_platformData);
|
|
|
| - ASSERT(m_harfBuzzFontData->m_simpleFontData);
|
| + DCHECK(m_harfBuzzFontData->m_simpleFontData);
|
| int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
|
| hb_font_set_scale(m_unscaledFont, scale, scale);
|
|
|
|
|