Merge pull request #9958 from brendandahl/always-fallback

Always fallback to system font on font failure.
mozilla · Aug 5, 2018 · 4111871 · 4111871
2 parents eec7e18 + 5f67a6a
commit 4111871
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/core/fonts.js b/src/core/fonts.js
@@ -599,9 +599,6 @@ var Font = (function FontClosure() {
           throw new FormatError(`Font ${type} is not supported`);
       }
     } catch (e) {
-      if (!(e instanceof FormatError)) {
-        throw e;
-      }
       warn(e);
       this.fallbackToSystemFont();
       return;

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -88,6 +88,7 @@
 !bug1068432.pdf
 !bug1146106.pdf
 !bug1252420.pdf
+!issue9949.pdf
 !bug1308536.pdf
 !bug1337429.pdf
 !issue5564_reduced.pdf

diff --git a/test/pdfs/issue9949.pdf b/test/pdfs/issue9949.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -578,6 +578,12 @@
        "annotations": true,
        "about": "PDF with annotations, some of which have the Hidden flag set."
     },
+    {  "id": "issue9949",
+       "file": "pdfs/issue9949.pdf",
+       "md5": "55d24d7fc71b849818ea91d3b9eaf302",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue4665-text",
        "file": "pdfs/issue4665.pdf",
        "md5": "0de1308432819c101881df7ca4424575",