Bug 1535697 - Part 3: Only consider third-party tracking resources as isolated channels; r=michal

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

--HG--
extra : moz-landing-system : lando

netwerk/protocol/http/nsHttpChannel.cpp

@@ -3898,7 +3898,8 @@ bool nsHttpChannel::IsIsolated() {
   if (mHasBeenIsolatedChecked) {
     return mIsIsolated;
   }
-  mIsIsolated = !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
+  mIsIsolated = IsThirdPartyTrackingResource() &&
+                !AntiTrackingCommon::IsFirstPartyStorageAccessGrantedFor(
                     this, mURI, nullptr);
   mHasBeenIsolatedChecked = true;
   return mIsIsolated;
@@ -4023,7 +4024,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(
     extension.Append("TRR");
   }
 
-  if (IsThirdPartyTrackingResource() && IsIsolated()) {
+  if (IsIsolated()) {
     nsCOMPtr<nsIURI> topWindowURI;
     rv = GetTopWindowURI(getter_AddRefs(topWindowURI));
     bool isDocument = false;