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: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in platform/fonts 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

« third_party/WebKit/Source/platform/fonts/ScriptRunIteratorTest.cpp ('K') | « third_party/WebKit/Source/platform/fonts/UTF16TextIterator.cpp ('k') | third_party/WebKit/Source/platform/fonts/mac/FontPlatformDataMac.mm » ('j') | third_party/WebKit/Source/platform/fonts/shaping/ShapeCache.h » ('J')
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 99b6d8cc404f7777809a11ab5e40742091bf20b5..615b881013eeb994438b68811aeb2b77a4fba1b9 100644

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

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

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

0x3fe1eb8520000000, // NSFontWeightHeavy

0x3fe3d70a40000000, // NSFontWeightBlack

};

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

+ DCHECK(fontWeight >= 0 && fontWeight <= 8);

tkent 2017/04/09 23:13:23 Split this into two DCHECKs.

Hwanseung Lee 2017/04/11 22:25:09 Done.

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

return *weight;

}