Commit ee95241a authored by Tooru Fujisawa's avatar Tooru Fujisawa
Browse files

Bug 1697666 - Move IsSingleFaceFamily into gfxFontFamily. r=jfkthame, a=jcristau 

Differential Revision: https://phabricator.services.mozilla.com/D108810
parent 5686ee1c

gfx/thebes/gfxFontEntry.h

+2 −0
Original line number Diff line number Diff line
@@ -934,6 +934,8 @@ class gfxFontFamily { 
    }

  }



  virtual bool IsSingleFaceFamily() const { return false; }



  bool IsBadUnderlineFamily() const { return mIsBadUnderlineFamily; }

  bool CheckForFallbackFaces() const { return mCheckForFallbackFaces; }

gfx/thebes/gfxMacPlatformFontList.mm

+1 −3
Original line number Diff line number Diff line
@@ -584,8 +584,6 @@ class gfxMacFontFamily final : public gfxFontFamily { 


  virtual void FindStyleVariations(FontInfoData* aFontInfoData = nullptr);



  virtual bool IsSingleFaceFamily() const { return false; }



 protected:

  double mSizeHint;

};
@@ -933,7 +931,7 @@ void gfxMacPlatformFontList::ReadSystemFontList(nsTArray<FontFamilyListEntry>* a 
  }

  // Now collect the list of available families, with visibility attributes.

  for (auto f = mFontFamilies.Iter(); !f.Done(); f.Next()) {

    auto macFamily = static_cast<gfxMacFontFamily*>(f.Data().get());

    auto macFamily = f.Data().get();

    if (macFamily->IsSingleFaceFamily()) {

      continue;  // skip, this will be recreated separately in the child

    }

layout/reftests/font-matching/osaka-mono-exists-ref.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="ja">

<head>

<meta charset="utf-8">

<style type="text/css">

textarea { font-family: serif; font-size: 72pt; }

</style>

</head>

<body><textarea>海の絵</textarea></body>

</html>

layout/reftests/font-matching/osaka-mono-exists.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="ja">

<head>

<meta charset="utf-8">

<style type="text/css">

textarea { font-family: "Osaka-Mono", serif; font-size: 72pt; }

</style>

</head>

<body><textarea>海の絵</textarea></body>

</html>

layout/reftests/font-matching/osaka-mono-ref.html

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html lang="ja">

<head>

<meta charset="utf-8">

<style type="text/css">

textarea { font-family: "Osaka-Mono"; font-size: 72pt; }

</style>

</head>

<body><textarea>海の絵</textarea></body>

</html>