Review changes

GoogleChrome · Feb 4, 2018 · 0d2f4a3 · 0d2f4a3
1 parent 9782386
commit 0d2f4a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/lighthouse-core/audits/font-display.js b/lighthouse-core/audits/font-display.js
@@ -20,7 +20,7 @@ class FontDisplay extends Audit {
       description: 'All text remains visible during webfont loads',
       failureDescription: 'Avoid invisible text while webfonts are loading',
       helpText: 'Leverage the font-display CSS feature to ensure text is user-visible while ' +
-        'webfonts are loading and avoid a FOIT.',
+        'webfonts are loading.',
       requiredArtifacts: ['devtoolsLogs', 'Fonts'],
     };
   }

diff --git a/lighthouse-core/gather/gatherers/fonts.js b/lighthouse-core/gather/gatherers/fonts.js
@@ -18,15 +18,16 @@ const fontFaceDescriptors = [
 ];
 
 /* eslint-env browser*/
-
 /**
  * Collect applied webfont data from `document.fonts`
+ * @param {string[]}
  * @return {{}}
  */
-function getAllLoadedFonts() {
+/* istanbul ignore next */
+function getAllLoadedFonts(descriptors) {
   const getFont = fontFace => {
     const fontRule = {};
-    fontFaceDescriptors.forEach(descriptor => {
+    descriptors.forEach(descriptor => {
       fontRule[descriptor] = fontFace[descriptor];
     });
 
@@ -43,6 +44,7 @@ function getAllLoadedFonts() {
  * Collect authored webfont data from the `CSSFontFaceRule`s present in document.styleSheets
  * @return {{}}
  */
+/* istanbul ignore next */
 function getFontFaceFromStylesheets() {
   /**
    * Get full data about each CSSFontFaceRule within a styleSheet object
@@ -126,12 +128,6 @@ function getFontFaceFromStylesheets() {
 /* eslint-env node */
 
 class Fonts extends Gatherer {
-  constructor() {
-    super();
-
-    this.stylesheetIds = [];
-  }
-
   _findSameFontFamily(fontFace, fontFacesList) {
     return fontFacesList.find(fontItem => {
       return !fontFaceDescriptors.find(descriptor => {
@@ -144,11 +140,9 @@ class Fonts extends Gatherer {
     return Promise.all(
       [
         driver.evaluateAsync(`(()=>{`
-          + `const fontFaceDescriptors=JSON.parse('${JSON.stringify(fontFaceDescriptors)}');`
-          + `return (${getAllLoadedFonts.toString()})();})()`),
-        driver.evaluateAsync(`(()=>{`
-          + `const fontFaceDescriptors=JSON.parse('${JSON.stringify(fontFaceDescriptors)}');`
-          + `return (${getFontFaceFromStylesheets.toString()})();})()`),
+          + `const args = ${JSON.stringify(fontFaceDescriptors)};`
+          + `return (${getAllLoadedFonts.toString()})(args);})()`),
+        driver.evaluateAsync(`(${getFontFaceFromStylesheets.toString()})()`),
       ]
     ).then(([loadedFonts, fontFaces]) => {
       return loadedFonts.map(fontFace => {