refactor: use public accessors for network records

GoogleChrome · Jan 31, 2017 · 6406bf3 · 6406bf3
1 parent f9698f0
commit 6406bf3
Show file tree

Hide file tree

Showing 11 changed files with 1,168 additions and 1,168 deletions.
diff --git a/lighthouse-core/audits/dobetterweb/uses-http2.js b/lighthouse-core/audits/dobetterweb/uses-http2.js
@@ -52,7 +52,7 @@ class UsesHTTP2Audit extends Audit {
 
     // Filter requests that are on the same host as the page and not over h2.
     const resources = networkRecords.filter(record => {
-      const requestHost = new URL(record._url).host;
+      const requestHost = new URL(record.url).host;
       const sameHost = requestHost === finalHost;
       const notH2 = /HTTP\/[01][\.\d]?/i.test(record.protocol);
       return sameHost && notH2;

diff --git a/lighthouse-core/gather/computed/critical-request-chains.js b/lighthouse-core/gather/computed/critical-request-chains.js
@@ -61,7 +61,7 @@ class CriticalRequestChains extends ComputedArtifact {
 
     const flattenRequest = request => {
       return {
-        url: request._url,
+        url: request.url,
         startTime: request.startTime,
         endTime: request.endTime,
         responseReceivedTime: request.responseReceivedTime,

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js b/lighthouse-core/gather/gatherers/dobetterweb/optimized-images.js
@@ -73,21 +73,21 @@ class OptimizedImages extends Gatherer {
   static filterImageRequests(pageUrl, networkRecords) {
     const seenUrls = new Set();
     return networkRecords.reduce((prev, record) => {
-      if (seenUrls.has(record._url)) {
+      if (seenUrls.has(record.url)) {
         return prev;
       }
 
-      seenUrls.add(record._url);
-      const isOptimizableImage = /image\/(png|bmp|jpeg)/.test(record._mimeType);
-      const isSameOrigin = URL.hostsMatch(pageUrl, record._url);
-      const isBase64DataUri = /^data:.{2,40}base64\s*,/.test(record._url);
+      seenUrls.add(record.url);
+      const isOptimizableImage = /image\/(png|bmp|jpeg)/.test(record.mimeType);
+      const isSameOrigin = URL.hostsMatch(pageUrl, record.url);
+      const isBase64DataUri = /^data:.{2,40}base64\s*,/.test(record.url);
 
       if (isOptimizableImage && (isSameOrigin || isBase64DataUri)) {
         prev.push({
           isBase64DataUri,
-          url: record._url,
-          mimeType: record._mimeType,
-          resourceSize: record._resourceSize,
+          url: record.url,
+          mimeType: record.mimeType,
+          resourceSize: record.resourceSize,
         });
       }
 

diff --git a/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js b/lighthouse-core/gather/gatherers/dobetterweb/tags-blocking-first-paint.js
@@ -94,17 +94,17 @@ function filteredAndIndexedByUrl(networkRecords) {
     const isParserGenerated = record._initiator.type === 'parser';
     // A stylesheet only blocks script if it was initiated by the parser
     // https://html.spec.whatwg.org/multipage/semantics.html#interactions-of-styling-and-scripting
-    const isParserScriptOrStyle = /(css|script)/.test(record._mimeType) && isParserGenerated;
-    const isFailedRequest = record._failed;
-    const isHtml = record._mimeType && record._mimeType.includes('html');
+    const isParserScriptOrStyle = /(css|script)/.test(record.mimeType) && isParserGenerated;
+    const isFailedRequest = record.failed;
+    const isHtml = record.mimeType && record.mimeType.includes('html');
 
     // Filter stylesheet, javascript, and html import mimetypes.
     // Include 404 scripts/links generated by the parser because they are likely blocking.
     if (isHtml || isParserScriptOrStyle || (isFailedRequest && isParserGenerated)) {
-      prev[record._url] = {
-        transferSize: record._transferSize,
-        startTime: record._startTime,
-        endTime: record._endTime
+      prev[record.url] = {
+        transferSize: record.transferSize,
+        startTime: record.startTime,
+        endTime: record.endTime
       };
     }
 

diff --git a/lighthouse-core/gather/gatherers/image-usage.js b/lighthouse-core/gather/gatherers/image-usage.js
@@ -74,8 +74,8 @@ class ImageUsage extends Gatherer {
   afterPass(options, traceData) {
     const driver = this.driver = options.driver;
     const indexedNetworkRecords = traceData.networkRecords.reduce((map, record) => {
-      if (/^image/.test(record._mimeType)) {
-        map[record._url] = {
+      if (/^image/.test(record.mimeType)) {
+        map[record.url] = {
           url: record.url,
           resourceSize: record.resourceSize,
           startTime: record.startTime,

diff --git a/lighthouse-core/gather/gatherers/offline.js b/lighthouse-core/gather/gatherers/offline.js
@@ -26,7 +26,7 @@ class Offline extends Gatherer {
 
   afterPass(options, tracingData) {
     const navigationRecord = tracingData.networkRecords.filter(record => {
-      return URL.equalWithExcludedFragments(record._url, options.url) &&
+      return URL.equalWithExcludedFragments(record.url, options.url) &&
         record._fetchedViaServiceWorker;
     }).pop(); // Take the last record that matches.