Fix SkOrderedFontMgr::onMatchFamily

SkOrderedFontMgr's `matchFamily` currently has [a bug](https://issues.skia.org/issues/382016481) where it will only look in the first FontMgr in its list when searching for fonts. The problem is that its search loop is expecting a `null` response to signal "no matches", but the actual behavior of FontMgr is to never return null. Instead it will return a zero-length SkFontStyleSet.

This PR adds a `count() > 0` check to the return value rather than just checking whether it is non-null.

This is an imported pull request from
#193

Added the author to the list of Skia AUTHORS

GitOrigin-RevId: 736a0e3
Change-Id: I6e0f9a6fe5a5d7e6a45567bc0f83ed27024cb584
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/926716
Commit-Queue: Julia Lavrova <[email protected]>
Reviewed-by: Ben Wagner <[email protected]>
Reviewed-by: Julia Lavrova <[email protected]>

Author: samizdatco

AUTHORS

@@ -33,6 +33,7 @@ Cary Clark <[email protected]>
 Casey Banner <[email protected]>
 Chad Brokaw <[email protected]>
 ChengYang <[email protected]>
+Christian Swinehart <[email protected]>
 Christian Plesner Hansen <[email protected]>
 ColdPaleLight <[email protected]>
 Dawson Coleman <[email protected]>

src/utils/SkOrderedFontMgr.cpp

@@ -55,7 +55,8 @@ sk_sp<SkFontStyleSet> SkOrderedFontMgr::onCreateStyleSet(int index) const {
 
 sk_sp<SkFontStyleSet> SkOrderedFontMgr::onMatchFamily(const char familyName[]) const {
     for (const auto& fm : fList) {
-        if (auto fs = fm->matchFamily(familyName)) {
+        const auto fs = fm->matchFamily(familyName);
+        if (fs->count() > 0){
             return fs;
         }
     }
@@ -85,6 +86,15 @@ sk_sp<SkTypeface> SkOrderedFontMgr::onMatchFamilyStyleCharacter(
     return nullptr;
 }
 
+sk_sp<SkTypeface> SkOrderedFontMgr::onLegacyMakeTypeface(const char family[], SkFontStyle style) const {
+    for (const auto& fm : fList) {
+        if (auto tf = fm->matchFamilyStyle(family, style)) {
+            return fm->legacyMakeTypeface(family, style);
+        }
+    }
+    return nullptr;
+}
+
 // All of these are defined to fail by returning null
 
 sk_sp<SkTypeface> SkOrderedFontMgr::onMakeFromData(sk_sp<SkData>, int ttcIndex) const {
@@ -104,7 +114,3 @@ sk_sp<SkTypeface> SkOrderedFontMgr::onMakeFromStreamArgs(std::unique_ptr<SkStrea
 sk_sp<SkTypeface> SkOrderedFontMgr::onMakeFromFile(const char path[], int ttcIndex) const {
     return nullptr;
 }
-
-sk_sp<SkTypeface> SkOrderedFontMgr::onLegacyMakeTypeface(const char family[], SkFontStyle) const {
-    return nullptr;
-}