Backed out 4 changesets (bug 1603969) for failing at /browser_startup_mainthreadio.js on a CLOSED TREE.

Backed out changeset 959f12e42db9 (bug 1603969)
Backed out changeset 18bf461b9630 (bug 1603969)
Backed out changeset 8c3bb23a048b (bug 1603969)
Backed out changeset 450eec13d73e (bug 1603969)

Author: raulgurzau

browser/base/content/browser-siteProtections.js

@@ -779,7 +779,10 @@ var ThirdPartyCookies = {
     for (let perm of Services.perms.getAllForPrincipal(
       gBrowser.contentPrincipal
     )) {
-      if (perm.type == "3rdPartyStorage^" + origin) {
+      if (
+        perm.type == "3rdPartyStorage^" + origin ||
+        perm.type.startsWith("3rdPartyStorage^" + origin + "^")
+      ) {
         return perm.capability;
       }
     }
@@ -796,7 +799,10 @@ var ThirdPartyCookies = {
     for (let perm of Services.perms.getAllForPrincipal(
       gBrowser.contentPrincipal
     )) {
-      if (perm.type == "3rdPartyStorage^" + origin) {
+      if (
+        perm.type == "3rdPartyStorage^" + origin ||
+        perm.type.startsWith("3rdPartyStorage^" + origin + "^")
+      ) {
         Services.perms.removePermission(perm);
       }
     }

browser/base/content/test/siteProtections/browser.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 support-files =
   head.js
-  !/browser/base/content/test/trackingUI/trackingPage.html
 
 [browser_protections_UI.js]
 fail-if = fission # Bug 1590696

browser/base/content/test/trackingUI/cookieServer.sjs

@@ -2,19 +2,8 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-// A 1x1 PNG image.
-// Source: https://commons.wikimedia.org/wiki/File:1x1.png (Public Domain)
-const IMAGE = atob("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABAQMAAAAl21bKAAAAA1BMVEUAA" +
-                   "ACnej3aAAAAAXRSTlMAQObYZgAAAApJREFUCNdjYAAAAAIAAeIhvDMAAAAASUVORK5CYII=");
-
 function handleRequest(request, response) {
   response.setStatusLine(request.httpVersion, 200);
-  if (request.queryString &&
-      request.queryString.includes("type=image-no-cookie")) {
-    response.setHeader("Content-Type", "image/png", false);
-    response.write(IMAGE);
-  } else {
-    response.setHeader("Set-Cookie", "foopy=1");
-    response.write("cookie served");
-  }
+  response.setHeader("Set-Cookie", "foopy=1");
+  response.write("cookie served");
 }

browser/base/content/test/trackingUI/trackingAPI.js

@@ -4,15 +4,6 @@ function createIframe(src) {
   document.body.appendChild(ifr);
 }
 
-function createImage(src) {
-  let img = document.createElement("img");
-  img.src = src;
-  img.onload = () => {
-    parent.postMessage("done", "*");
-  };
-  document.body.appendChild(img);
-}
-
 onmessage = event => {
   switch (event.data) {
     case "tracking":
@@ -50,11 +41,6 @@ onmessage = event => {
         "https://test1.example.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs"
       );
       break;
-    case "image":
-      createImage(
-        "http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs?type=image-no-cookie"
-      );
-      break;
     case "window-open":
       window.win = window.open(
         "http://trackertest.org/browser/browser/base/content/test/trackingUI/cookieServer.sjs",

dom/ipc/ContentParent.cpp

@@ -5759,11 +5759,13 @@ mozilla::ipc::IPCResult ContentParent::RecvAutomaticStorageAccessCanBeGranted(
 mozilla::ipc::IPCResult
 ContentParent::RecvFirstPartyStorageAccessGrantedForOrigin(
     const Principal& aParentPrincipal, const Principal& aTrackingPrincipal,
-    const nsCString& aTrackingOrigin, const int& aAllowMode,
+    const nsCString& aTrackingOrigin, const nsCString& aGrantedOrigin,
+    const int& aAllowMode,
     FirstPartyStorageAccessGrantedForOriginResolver&& aResolver) {
   AntiTrackingCommon::
       SaveFirstPartyStorageAccessGrantedForOriginOnParentProcess(
-          aParentPrincipal, aTrackingPrincipal, aTrackingOrigin, aAllowMode)
+          aParentPrincipal, aTrackingPrincipal, aTrackingOrigin, aGrantedOrigin,
+          aAllowMode)
           ->Then(GetCurrentThreadSerialEventTarget(), __func__,
                  [aResolver = std::move(aResolver)](
                      AntiTrackingCommon::FirstPartyStorageAccessGrantPromise::

dom/ipc/ContentParent.h

@@ -1193,7 +1193,8 @@ class ContentParent final
 
   mozilla::ipc::IPCResult RecvFirstPartyStorageAccessGrantedForOrigin(
       const Principal& aParentPrincipal, const Principal& aTrackingPrincipal,
-      const nsCString& aTrackingOrigin, const int& aAllowMode,
+      const nsCString& aTrackingOrigin, const nsCString& aGrantedOrigin,
+      const int& aAllowMode,
       FirstPartyStorageAccessGrantedForOriginResolver&& aResolver);
 
   mozilla::ipc::IPCResult RecvStoreUserInteractionAsPermission(

dom/ipc/PContent.ipdl

@@ -1481,6 +1481,7 @@ parent:
     async FirstPartyStorageAccessGrantedForOrigin(Principal aParentPrincipal,
                                                   Principal aTrackingPrincipal,
                                                   nsCString aTrackingOrigin,
+                                                  nsCString aGrantedOrigin,
                                                   int aAllowMode)
           returns (bool unused);
 

extensions/permissions/nsPermissionManager.cpp

@@ -882,7 +882,7 @@ void nsPermissionManager::Startup() {
 // nsPermissionManager Implementation
 
 #define PERMISSIONS_FILE_NAME "permissions.sqlite"
-#define HOSTS_SCHEMA_VERSION 11
+#define HOSTS_SCHEMA_VERSION 10
 
 // Default permissions are read from a URL - this is the preference we read
 // to find that URL. If not set, don't use any default permissions.
@@ -1539,25 +1539,6 @@ nsresult nsPermissionManager::InitDB(bool aRemoveFile) {
         MOZ_FALLTHROUGH;
 
       case 9: {
-        rv = mDBConn->SetSchemaVersion(10);
-        NS_ENSURE_SUCCESS(rv, rv);
-      }
-
-        // fall through to the next upgrade
-        MOZ_FALLTHROUGH;
-
-      case 10: {
-        // Filter out the rows with storage access API permissions with a
-        // granted origin, and remove the granted origin part from the
-        // permission type.
-        rv = mDBConn->ExecuteSimpleSQL(NS_LITERAL_CSTRING(
-            "UPDATE moz_perms "
-            "SET type=SUBSTR(type, 0, INSTR(SUBSTR(type, INSTR(type, '^') + "
-            "1), '^') + INSTR(type, '^')) "
-            "WHERE INSTR(SUBSTR(type, INSTR(type, '^') + 1), '^') AND "
-            "SUBSTR(type, 0, 18) == \"storageAccessAPI^\";"));
-        NS_ENSURE_SUCCESS(rv, rv);
-
         rv = mDBConn->SetSchemaVersion(HOSTS_SCHEMA_VERSION);
         NS_ENSURE_SUCCESS(rv, rv);
       }

extensions/permissions/test/unit/test_permmanager_load_invalid_entries.js

@@ -223,9 +223,9 @@ function run_test() {
   // Initialize the permission manager service
   var pm = Services.perms;
 
-  // The schema should be upgraded to 11, and a 'modificationTime' column should
+  // The schema should be upgraded to 10, and a 'modificationTime' column should
   // exist with all records having a value of 0.
-  Assert.equal(connection.schemaVersion, 11);
+  Assert.equal(connection.schemaVersion, 10);
 
   let select = connection.createStatement(
     "SELECT modificationTime FROM moz_perms"