Merge pull request #12931 from Snuffleupagus/errorFontLoadNative-no-f…

…allback-bar Stop showing the fallback bar for "errorFontLoadNative" errors (PR 10539 follow-up)
mozilla · Jan 29, 2021 · 31b7892 · 31b7892
2 parents d6de6ea + fec8c4c
commit 31b7892
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/display/font_loader.js b/src/display/font_loader.js
@@ -350,7 +350,7 @@ class FontFaceObject {
       isEvalSupported = true,
       disableFontFace = false,
       ignoreErrors = false,
-      onUnsupportedFeature = null,
+      onUnsupportedFeature,
       fontRegistry = null,
     }
   ) {
@@ -405,11 +405,9 @@ class FontFaceObject {
       if (!this.ignoreErrors) {
         throw ex;
       }
-      if (this._onUnsupportedFeature) {
-        this._onUnsupportedFeature({
-          featureId: UNSUPPORTED_FEATURES.errorFontGetPath,
-        });
-      }
+      this._onUnsupportedFeature({
+        featureId: UNSUPPORTED_FEATURES.errorFontGetPath,
+      });
       warn(`getPathGenerator - ignoring character: "${ex}".`);
 
       return (this.compiledGlyphs[character] = function (c, size) {

diff --git a/web/app.js b/web/app.js
@@ -1089,6 +1089,12 @@ const PDFViewerApplication = {
       featureId,
     });
 
+    // Don't show the fallback bar for things that are *very* unlikely to cause
+    // user-visible errors, to avoid bothering the user unnecessarily.
+    switch (featureId) {
+      case UNSUPPORTED_FEATURES.errorFontLoadNative:
+        return;
+    }
     // Only trigger the fallback once so we don't spam the user with messages
     // for one PDF.
     if (this.fellback) {