third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm - 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/mac/FontFamilyMatcherMac.mm

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp ('k') | third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm

diff --git a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm

index 32bba2fa2cf377ca67cb046cd63ff03dba7646ac..2745db411f495bbdf8e474623d19db1802815b67 100644

--- a/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm

+++ b/third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm

@@ -57,7 +57,8 @@ static CGFloat toYosemiteFontWeight(blink::FontWeight fontWeight) {

0x3fe1eb8520000000, // NSFontWeightHeavy

0x3fe3d70a40000000, // NSFontWeightBlack

};

- ASSERT(fontWeight >= 0 && fontWeight <= 8);

+ DCHECK_GE(fontWeight, 0);

+ DCHECK_LE(fontWeight, 8);

CGFloat* weight = reinterpret_cast<CGFloat*>(&nsFontWeights[fontWeight]);

return *weight;

}