Merge pull request #9968 from Snuffleupagus/getFontFileType-MMType1

Tweak the MMType1 font detection in `getFontFileType` to improve font telemetry (PR 9961 follow-up)
mozilla · Aug 8, 2018 · 309b6f8 · 309b6f8
2 parents 13b9874 + 06d1ff5
commit 309b6f8
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/core/fonts.js b/src/core/fonts.js
@@ -717,17 +717,15 @@ var Font = (function FontClosure() {
     } else if (isType1File(file)) {
       if (composite) {
         fileType = 'CIDFontType0';
-      } else if (type === 'MMType1') {
-        fileType = 'MMType1';
       } else {
-        fileType = 'Type1';
+        fileType = (type === 'MMType1' ? 'MMType1' : 'Type1');
       }
     } else if (isCFFFile(file)) {
       if (composite) {
         fileType = 'CIDFontType0';
         fileSubtype = 'CIDFontType0C';
       } else {
-        fileType = 'Type1';
+        fileType = (type === 'MMType1' ? 'MMType1' : 'Type1');
         fileSubtype = 'Type1C';
       }
     } else {