From 2c53e6da2d9c7b78ca181c31058a9ad800bc9f98 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Fri, 8 Feb 2019 21:16:40 +0000
Subject: [PATCH] Bug 1525188 - Don't set remoteType attributes when swapping
 frameLoaders. r=nika

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

--HG--
extra : moz-landing-system : lando
---
 dom/base/nsFrameLoader.cpp | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp
index 728b4d89a45a..1c4d90fee71d 100644
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -1079,22 +1079,6 @@ nsresult nsFrameLoader::SwapWithOtherRemoteLoader(
     return rv;
   }
 
-  // Swap the remoteType property as the frameloaders are being swapped
-  nsAutoString ourRemoteType;
-  if (!ourContent->GetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType,
-                           ourRemoteType)) {
-    ourRemoteType.AssignLiteral(DEFAULT_REMOTE_TYPE);
-  }
-  nsAutoString otherRemoteType;
-  if (!otherContent->GetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType,
-                             otherRemoteType)) {
-    otherRemoteType.AssignLiteral(DEFAULT_REMOTE_TYPE);
-  }
-  ourContent->SetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType, otherRemoteType,
-                      false);
-  otherContent->SetAttr(kNameSpaceID_None, nsGkAtoms::RemoteType, ourRemoteType,
-                        false);
-
   Unused << mRemoteBrowser->SendSwappedWithOtherRemoteLoader(
       ourContext.AsIPCTabContext());
   Unused << aOther->mRemoteBrowser->SendSwappedWithOtherRemoteLoader(