third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMacTest.mm - Issue 2137483004: Enable "system-ui" generic font family

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/FontFamilyMatcherMacTest.mm

Issue 2137483004: Enable "system-ui" generic font family (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated comments Created 4 years, 2 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/linux/FontCacheLinux.cpp ('K') | « third_party/WebKit/Source/platform/fonts/mac/FontFamilyMatcherMac.mm ('k') | third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp » ('j') | third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5b5e72ebc16f20acaadae49f17ae6470d4348246..66efa39aba2d142a408a5aaf1f926389f04c8dfc 100644

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

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

@@ -4,6 +4,8 @@

#import "platform/fonts/mac/FontFamilyMatcherMac.h"

+#include "platform/FontFamilyNames.h"

#include <AppKit/AppKit.h>

#include <gtest/gtest.h>

@@ -17,7 +19,8 @@ namespace blink {

void TestSystemFontContainsString(FontWeight desiredWeight,

NSString* substring) {

- NSFont* font = MatchNSFontFamily(@"BlinkMacSystemFont", 0, desiredWeight, 11);

+ NSFont* font =

+ MatchNSFontFamily(FontFamilyNames::system_ui, 0, desiredWeight, 11);

EXPECT_TRUE([font.description containsString:substring]);

}