third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp - Issue 2807913002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/fonts

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2807913002: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/fonts (Closed)

Patch Set: rebase Created 3 years, 8 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:

Index: third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

index 28563c9e817911a15b22a60fed7905d39509924f..ba858b4b7453f5a7dd24d171424b035ca9e80fbc 100644

--- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

+++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp

@@ -96,7 +96,7 @@ void SimpleFontData::PlatformInit(bool subpixel_ascent_descent) {

paint_.setTextEncoding(SkPaint::kGlyphID_TextEncoding);

paint_.getFontMetrics(&metrics);

SkTypeface* face = paint_.getTypeface();

- ASSERT(face);

+ DCHECK(face);

int vdmx_ascent = 0, vdmx_descent = 0;

bool is_vdmx_valid = false;

@@ -290,7 +290,7 @@ const SimpleFontData* SimpleFontData::FontDataForCharacter(UChar32) const {

Glyph SimpleFontData::GlyphForCharacter(UChar32 codepoint) const {

uint16_t glyph;

SkTypeface* typeface = PlatformData().Typeface();

- RELEASE_ASSERT(typeface);

+ CHECK(typeface);

typeface->charsToGlyphs(&codepoint, SkTypeface::kUTF32_Encoding, &glyph, 1);

return glyph;

}