Bug 1281104 - Rename CompositorBridgeParent::GetCompositor() r=nical
authorSotaro Ikeda <sotaro.ikeda.g@gmail.com>
Tue, 21 Jun 2016 17:58:55 -0700
changeset 327335 7d9629d35a329fae97e48065dd557fd530361068
parent 327334 8177f507952c729336ed9696e91456ff2eafa2ef
child 327336 a2a645bf7ccf4ffd4313fa55019889feb7957082
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs1281104
milestone50.0a1
Bug 1281104 - Rename CompositorBridgeParent::GetCompositor() r=nical
gfx/layers/ipc/CompositableTransactionParent.cpp
gfx/layers/ipc/CompositorBridgeParent.cpp
gfx/layers/ipc/CompositorBridgeParent.h
--- a/gfx/layers/ipc/CompositableTransactionParent.cpp
+++ b/gfx/layers/ipc/CompositableTransactionParent.cpp
@@ -48,17 +48,17 @@ class Compositor;
 // schedule the composition, in LayerManagerComposite::EndTransaction.
 static bool
 ScheduleComposition(CompositableHost* aCompositable)
 {
   uint64_t id = aCompositable->GetCompositorID();
   if (!id) {
     return false;
   }
-  CompositorBridgeParent* cp = CompositorBridgeParent::GetCompositor(id);
+  CompositorBridgeParent* cp = CompositorBridgeParent::GetCompositorBridgeParent(id);
   if (!cp) {
     return false;
   }
   cp->ScheduleComposition();
   return true;
 }
 
 #if defined(DEBUG) || defined(MOZ_WIDGET_GONK)
--- a/gfx/layers/ipc/CompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CompositorBridgeParent.cpp
@@ -1552,17 +1552,17 @@ CompositorBridgeParent::AllocPLayerTrans
 
 bool
 CompositorBridgeParent::DeallocPLayerTransactionParent(PLayerTransactionParent* actor)
 {
   static_cast<LayerTransactionParent*>(actor)->ReleaseIPDLReference();
   return true;
 }
 
-CompositorBridgeParent* CompositorBridgeParent::GetCompositor(uint64_t id)
+CompositorBridgeParent* CompositorBridgeParent::GetCompositorBridgeParent(uint64_t id)
 {
   CompositorMap::iterator it = sCompositorMap->find(id);
   return it != sCompositorMap->end() ? it->second : nullptr;
 }
 
 void CompositorBridgeParent::AddCompositor(CompositorBridgeParent* compositor, uint64_t* outID)
 {
   static uint64_t sNextID = 1;
--- a/gfx/layers/ipc/CompositorBridgeParent.h
+++ b/gfx/layers/ipc/CompositorBridgeParent.h
@@ -377,19 +377,19 @@ public:
    * the compositor's local device is being reset. All layers must be
    * invalidated to clear any cached TextureSources.
    *
    * This must be called on the compositor thread.
    */
   void InvalidateRemoteLayers();
 
   /**
-   * Returns a pointer to the compositor corresponding to the given ID.
+   * Returns a pointer to the CompositorBridgeParent corresponding to the given ID.
    */
-  static CompositorBridgeParent* GetCompositor(uint64_t id);
+  static CompositorBridgeParent* GetCompositorBridgeParent(uint64_t id);
 
   /**
    * Set aController as the pan/zoom callback for the subtree referred
    * to by aLayersId.
    *
    * Must run on content main thread.
    */
   static void SetControllerForLayerTree(uint64_t aLayersId,