Bug 1532499 - Rename 'mCrossProcessParent' to 'mContentCompositorBridgeParent'. r=kats
authorRyan Hunt <rhunt@eqrion.net>
Mon, 04 Mar 2019 19:37:37 -0600
changeset 520408 e13ad7558d5749edd36d607d39185321de17ebeb
parent 520407 e62ea8b46750bddf82c29c046f56d30f75235403
child 520409 70d011e850dac280855f30140fe846a87ab5a7c8
push id10862
push userffxbld-merge
push dateMon, 11 Mar 2019 13:01:11 +0000
treeherdermozilla-beta@a2e7f5c935da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskats
bugs1532499
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 1532499 - Rename 'mCrossProcessParent' to 'mContentCompositorBridgeParent'. r=kats Differential Revision: https://phabricator.services.mozilla.com/D22043
gfx/layers/ipc/CompositorBridgeParent.cpp
gfx/layers/ipc/CompositorBridgeParent.h
gfx/layers/ipc/ContentCompositorBridgeParent.cpp
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -217,17 +217,17 @@ bool CompositorBridgeParentBase::StopSha
   return PCompositorBridgeParent::SendReleaseSharedCompositorFrameMetrics(
       aScrollId, aApzcId);
 }
 
 CompositorBridgeParent::LayerTreeState::LayerTreeState()
     : mApzcTreeManagerParent(nullptr),
       mParent(nullptr),
       mLayerManager(nullptr),
-      mCrossProcessParent(nullptr),
+      mContentCompositorBridgeParent(nullptr),
       mLayerTree(nullptr),
       mUpdatedPluginDataAvailable(false) {}
 
 CompositorBridgeParent::LayerTreeState::~LayerTreeState() {
   if (mController) {
     mController->Destroy();
   }
 }
@@ -1675,17 +1675,17 @@ mozilla::ipc::IPCResult CompositorBridge
           mLayerManager, GetAnimationStorage());
       // Trigger composition to handle a case that mLayerTree was not composited
       // yet by previous CompositorBridgeParent, since nsRefreshDriver might
       // wait composition complete.
       scheduleComposition = true;
     }
     if (mWrBridge) {
       childWrBridge = sIndirectLayerTrees[child].mWrBridge;
-      cpcp = sIndirectLayerTrees[child].mCrossProcessParent;
+      cpcp = sIndirectLayerTrees[child].mContentCompositorBridgeParent;
     }
     parent = sIndirectLayerTrees[child].mApzcTreeManagerParent;
   }
 
   if (scheduleComposition) {
     ScheduleComposition();
   }
 
@@ -1981,17 +1981,17 @@ void CompositorBridgeParent::FinishPendi
 
 CompositorController*
 CompositorBridgeParent::LayerTreeState::GetCompositorController() const {
   return mParent;
 }
 
 MetricsSharingController*
 CompositorBridgeParent::LayerTreeState::CrossProcessSharingController() const {
-  return mCrossProcessParent;
+  return mContentCompositorBridgeParent;
 }
 
 MetricsSharingController*
 CompositorBridgeParent::LayerTreeState::InProcessSharingController() const {
   return mParent;
 }
 
 void CompositorBridgeParent::DidComposite(const VsyncId& aId,
@@ -2115,33 +2115,33 @@ void CompositorBridgeParent::NotifyDidCo
     if (!notifications.IsEmpty()) {
       Unused << ImageBridgeParent::NotifyImageComposites(notifications);
     }
   }
 
   MonitorAutoLock lock(*sIndirectLayerTreesLock);
   ForEachIndirectLayerTree([&](LayerTreeState* lts,
                                const LayersId& aLayersId) -> void {
-    if (lts->mCrossProcessParent && lts->mParent == this) {
-      ContentCompositorBridgeParent* cpcp = lts->mCrossProcessParent;
+    if (lts->mContentCompositorBridgeParent && lts->mParent == this) {
+      ContentCompositorBridgeParent* cpcp = lts->mContentCompositorBridgeParent;
       cpcp->DidCompositeLocked(aLayersId, aId, aCompositeStart, aCompositeEnd);
     }
   });
 }
 
 void CompositorBridgeParent::InvalidateRemoteLayers() {
   MOZ_ASSERT(CompositorLoop() == MessageLoop::current());
 
   Unused << PCompositorBridgeParent::SendInvalidateLayers(LayersId{0});
 
   MonitorAutoLock lock(*sIndirectLayerTreesLock);
   ForEachIndirectLayerTree(
       [](LayerTreeState* lts, const LayersId& aLayersId) -> void {
-        if (lts->mCrossProcessParent) {
-          ContentCompositorBridgeParent* cpcp = lts->mCrossProcessParent;
+        if (lts->mContentCompositorBridgeParent) {
+          ContentCompositorBridgeParent* cpcp = lts->mContentCompositorBridgeParent;
           Unused << cpcp->SendInvalidateLayers(aLayersId);
         }
       });
 }
 
 static void UpdateIndirectTree(LayersId aId, Layer* aRoot,
                                const TargetConfig& aTargetConfig) {
   MonitorAutoLock lock(*sIndirectLayerTreesLock);
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -491,17 +491,17 @@ class CompositorBridgeParent final : pub
     RefPtr<GeckoContentController> mController;
     APZCTreeManagerParent* mApzcTreeManagerParent;
     RefPtr<CompositorBridgeParent> mParent;
     HostLayerManager* mLayerManager;
     RefPtr<WebRenderBridgeParent> mWrBridge;
     // Pointer to the ContentCompositorBridgeParent. Used by APZCs to share
     // their FrameMetrics with the corresponding child process that holds
     // the PCompositorBridgeChild
-    ContentCompositorBridgeParent* mCrossProcessParent;
+    ContentCompositorBridgeParent* mContentCompositorBridgeParent;
     TargetConfig mTargetConfig;
     LayerTransactionParent* mLayerTree;
     nsTArray<PluginWindowData> mPluginData;
     bool mUpdatedPluginDataAvailable;
 
     CompositorController* GetCompositorController() const;
     MetricsSharingController* CrossProcessSharingController() const;
     MetricsSharingController* InProcessSharingController() const;
--- a/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/ContentCompositorBridgeParent.cpp
@@ -83,17 +83,17 @@ ContentCompositorBridgeParent::AllocPLay
 
   CompositorBridgeParent::LayerTreeState* state = nullptr;
   LayerTreeMap::iterator itr = sIndirectLayerTrees.find(aId);
   if (sIndirectLayerTrees.end() != itr) {
     state = &itr->second;
   }
 
   if (state && state->mLayerManager) {
-    state->mCrossProcessParent = this;
+    state->mContentCompositorBridgeParent = this;
     HostLayerManager* lm = state->mLayerManager;
     CompositorAnimationStorage* animStorage =
         state->mParent ? state->mParent->GetAnimationStorage() : nullptr;
     TimeDuration vsyncRate =
         state->mParent ? state->mParent->GetVsyncInterval() : TimeDuration();
     LayerTransactionParent* p =
         new LayerTransactionParent(lm, this, animStorage, aId, vsyncRate);
     p->AddIPDLReference();
@@ -249,17 +249,17 @@ ContentCompositorBridgeParent::AllocPWeb
   RefPtr<CompositorAnimationStorage> animStorage = cbp->GetAnimationStorage();
   WebRenderBridgeParent* parent = new WebRenderBridgeParent(
       this, aPipelineId, nullptr, root->CompositorScheduler(), std::move(api),
       std::move(holder), std::move(animStorage), cbp->GetVsyncInterval());
   parent->AddRef();  // IPDL reference
 
   {  // scope lock
     MonitorAutoLock lock(*sIndirectLayerTreesLock);
-    sIndirectLayerTrees[layersId].mCrossProcessParent = this;
+    sIndirectLayerTrees[layersId].mContentCompositorBridgeParent = this;
     sIndirectLayerTrees[layersId].mWrBridge = parent;
   }
 
   return parent;
 }
 
 bool ContentCompositorBridgeParent::DeallocPWebRenderBridgeParent(
     PWebRenderBridgeParent* aActor) {
@@ -275,17 +275,17 @@ bool ContentCompositorBridgeParent::Deal
 }
 
 mozilla::ipc::IPCResult ContentCompositorBridgeParent::RecvNotifyChildCreated(
     const LayersId& child, CompositorOptions* aOptions) {
   MonitorAutoLock lock(*sIndirectLayerTreesLock);
   for (LayerTreeMap::iterator it = sIndirectLayerTrees.begin();
        it != sIndirectLayerTrees.end(); it++) {
     CompositorBridgeParent::LayerTreeState* lts = &it->second;
-    if (lts->mParent && lts->mCrossProcessParent == this) {
+    if (lts->mParent && lts->mContentCompositorBridgeParent == this) {
       lts->mParent->NotifyChildCreated(child);
       *aOptions = lts->mParent->GetOptions();
       return IPC_OK();
     }
   }
   return IPC_FAIL_NO_REASON(this);
 }