Bug 1522713 - Rename mRemoteFrame to mIsRemoteFrame; r=nika
authorKyle Machulis <kyle@nonpolynomial.com>
Thu, 14 Mar 2019 00:51:58 +0000
changeset 521819 d63e984effadd381fc8a21b188a33e4a8f9caead
parent 521818 f73f629e8ccaf586ae6f54256f8e80e6619c48ab
child 521820 bade3af814f6ff96bfac9a35e07b6c0dd1fb8f79
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnika
bugs1522713
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 1522713 - Rename mRemoteFrame to mIsRemoteFrame; r=nika We have mRemoteFrameChild which owns a RemoteFrameChild, but mRemoteFrame is just a state. Change to mIsRemoteFrame to reflect this. Differential Revision: https://phabricator.services.mozilla.com/D22789
dom/base/nsFrameLoader.cpp
dom/base/nsFrameLoader.h
--- a/dom/base/nsFrameLoader.cpp
+++ b/dom/base/nsFrameLoader.cpp
@@ -174,20 +174,20 @@ nsFrameLoader::nsFrameLoader(Element* aO
       mDestroyCalled(false),
       mNeedsAsyncDestroy(false),
       mInSwap(false),
       mInShow(false),
       mHideCalled(false),
       mNetworkCreated(aNetworkCreated),
       mLoadingOriginalSrc(false),
       mRemoteBrowserShown(false),
-      mRemoteFrame(false),
+      mIsRemoteFrame(false),
       mObservingOwnerContent(false) {
-  mRemoteFrame = ShouldUseRemoteProcess();
-  MOZ_ASSERT(!mRemoteFrame || !aOpener,
+  mIsRemoteFrame = ShouldUseRemoteProcess();
+  MOZ_ASSERT(!mIsRemoteFrame || !aOpener,
              "Cannot pass aOpener for a remote frame!");
 }
 
 nsFrameLoader::~nsFrameLoader() {
   if (mMessageManager) {
     mMessageManager->Disconnect();
   }
   MOZ_RELEASE_ASSERT(mDestroyCalled);
@@ -2570,33 +2570,33 @@ bool nsFrameLoader::TryRemoteBrowser() {
 
   ReallyLoadFrameScripts();
   InitializeBrowserAPI();
 
   return true;
 }
 
 bool nsFrameLoader::IsRemoteFrame() {
-  if (mRemoteFrame) {
+  if (mIsRemoteFrame) {
     MOZ_ASSERT(!mDocShell, "Found a remote frame with a DocShell");
     return true;
   }
   return false;
 }
 
 mozilla::dom::PBrowserParent* nsFrameLoader::GetRemoteBrowser() const {
   return mRemoteBrowser;
 }
 
 mozilla::dom::BrowserBridgeChild* nsFrameLoader::GetBrowserBridgeChild() const {
   return mBrowserBridgeChild;
 }
 
 mozilla::layers::LayersId nsFrameLoader::GetLayersId() const {
-  MOZ_ASSERT(mRemoteFrame);
+  MOZ_ASSERT(mIsRemoteFrame);
   if (mRemoteBrowser) {
     return mRemoteBrowser->GetRenderFrame()->GetLayersId();
   }
   if (mBrowserBridgeChild) {
     return mBrowserBridgeChild->GetLayersId();
   }
   return mozilla::layers::LayersId{};
 }
@@ -2826,17 +2826,17 @@ nsresult nsFrameLoader::ReallyLoadFrameS
 }
 
 already_AddRefed<Element> nsFrameLoader::GetOwnerElement() {
   return do_AddRef(mOwnerContent);
 }
 
 void nsFrameLoader::SetRemoteBrowser(nsITabParent* aTabParent) {
   MOZ_ASSERT(!mRemoteBrowser);
-  mRemoteFrame = true;
+  mIsRemoteFrame = true;
   mRemoteBrowser = TabParent::GetFrom(aTabParent);
   mChildID = mRemoteBrowser ? mRemoteBrowser->Manager()->ChildID() : 0;
   MaybeUpdatePrimaryTabParent(eTabParentChanged);
   ReallyLoadFrameScripts();
   InitializeBrowserAPI();
   mRemoteBrowser->InitRendering();
   ShowRemoteFrame(ScreenIntSize(0, 0));
 }
--- a/dom/base/nsFrameLoader.h
+++ b/dom/base/nsFrameLoader.h
@@ -474,17 +474,17 @@ class nsFrameLoader final : public nsStu
   // it may lose the flag.
   bool mNetworkCreated : 1;
 
   // True if a pending load corresponds to the original src (or srcdoc)
   // attribute of the frame element.
   bool mLoadingOriginalSrc : 1;
 
   bool mRemoteBrowserShown : 1;
-  bool mRemoteFrame : 1;
+  bool mIsRemoteFrame : 1;
   bool mObservingOwnerContent : 1;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsFrameLoader, NS_FRAMELOADER_IID)
 
 inline nsISupports* ToSupports(nsFrameLoader* aFrameLoader) {
   return aFrameLoader;
 }