Bug 1525188 - Don't set remoteType attributes when swapping frameLoaders. r=nika
authorMike Conley <mconley@mozilla.com>
Fri, 08 Feb 2019 21:16:40 +0000
changeset 458516 49291c19d3e28fb5012e38bb5c5fdb53378a6ec4
parent 458515 211b6d23cac0f3e3edff9c7ef83e8b43a2c5b2b7
child 458517 25d09fd7954ca6353b5a38194d64a495c900bde6
push id77885
push usermconley@mozilla.com
push dateMon, 11 Feb 2019 16:15:46 +0000
treeherderautoland@25d09fd7954c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnika
bugs1525188
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1525188 - Don't set remoteType attributes when swapping frameLoaders. r=nika Differential Revision: https://phabricator.services.mozilla.com/D19220
dom/base/nsFrameLoader.cpp
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -1074,32 +1074,16 @@ nsresult nsFrameLoader::SwapWithOtherRem
     return rv;
   }
   MutableTabContext otherContext;
   rv = aOther->GetNewTabContext(&otherContext);
   if (NS_WARN_IF(NS_FAILED(rv))) {
     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(
       otherContext.AsIPCTabContext());
   return NS_OK;
 }
 
 class MOZ_RAII AutoResetInFrameSwap final {