Bug 1748138 - Modified cache checks to account for partition key taken from content process. r=anti-tracking-reviewers,timhuang,mconley a=reland

Differential Revision: https://phabricator.services.mozilla.com/D183190

Author: abhishekmadan30

browser/actors/PageInfoChild.sys.mjs

@@ -30,11 +30,21 @@ export class PageInfoChild extends JSWindowActorChild {
           mediaItems: await this.getDocumentMedia(document),
         });
       }
+      case "PageInfo:getPartitionKey": {
+        return Promise.resolve({
+          partitionKey: await this.getPartitionKey(document),
+        });
+      }
     }
 
     return undefined;
   }
 
+  getPartitionKey(document) {
+    let partitionKey = document.cookieJarSettings.partitionKey;
+    return partitionKey;
+  }
+
   getMetaInfo(document) {
     let metaViewRows = [];
 

browser/base/content/pageinfo/pageInfo.js

@@ -271,11 +271,7 @@ const cacheService = Cc[
   "@mozilla.org/netwerk/cache-storage-service;1"
 ].getService(nsICacheStorageService);
 
-var loadContextInfo = Services.loadContextInfo.fromLoadContext(
-  window.docShell.QueryInterface(Ci.nsILoadContext),
-  false
-);
-var diskStorage = cacheService.diskCacheStorage(loadContextInfo);
+var diskStorage = null;
 
 const nsICookiePermission = Ci.nsICookiePermission;
 
@@ -464,6 +460,20 @@ async function loadTab(args) {
   let browsingContext = args?.browsingContext;
   let browser = args?.browser;
 
+  // Check if diskStorage has not be created yet if it has not been, get
+  // partitionKey from content process and create diskStorage with said partitionKey
+  if (!diskStorage) {
+    let oaWithPartitionKey = await getOaWithPartitionKey(
+      browsingContext,
+      browser
+    );
+    let loadContextInfo = Services.loadContextInfo.custom(
+      false,
+      oaWithPartitionKey
+    );
+    diskStorage = cacheService.diskCacheStorage(loadContextInfo);
+  }
+
   /* Load the page info */
   await loadPageInfo(browsingContext, imageElement, browser);
 
@@ -1170,3 +1180,16 @@ function checkProtocol(img) {
     /^(https?|file|about|chrome|resource):/.test(url)
   );
 }
+
+async function getOaWithPartitionKey(browsingContext, browser) {
+  browser = browser || window.opener.gBrowser.selectedBrowser;
+  browsingContext = browsingContext || browser.browsingContext;
+
+  let actor = browsingContext.currentWindowGlobal.getActor("PageInfo");
+  let partitionKeyFromChild = await actor.sendQuery("PageInfo:getPartitionKey");
+
+  let oa = browser.contentPrincipal.originAttributes;
+  oa.partitionKey = partitionKeyFromChild.partitionKey;
+
+  return oa;
+}

browser/base/content/test/pageinfo/browser_pageinfo_images.js

@@ -91,3 +91,22 @@ add_task(async function test_view_image_info() {
     }
   );
 });
+
+add_task(async function test_image_size() {
+  await BrowserTestUtils.withNewTab(
+    TEST_PATH + "all_images.html",
+    async function () {
+      let pageInfo = BrowserPageInfo(
+        gBrowser.selectedBrowser.currentURI.spec,
+        "mediaTab"
+      );
+      await BrowserTestUtils.waitForEvent(pageInfo, "page-info-init");
+
+      let imageSize = pageInfo.document.getElementById("imagesizetext");
+
+      Assert.notEqual("media-unknown-not-cached", imageSize.value);
+
+      pageInfo.close();
+    }
+  );
+});