Bug 1250117 - Trivial b2g build fix. r=me
authorNicolas Silva <nsilva@mozilla.com>
Thu, 25 Feb 2016 13:50:27 +0100
changeset 321904 3a55e7c48a530eab188db1e011ede8498c2190fc
parent 321903 7bcbdd73b99f84aef3da7e68ea1b54d49f9841d8
child 321905 eced4790cbdcca3cc087e737c099b93e895edaee
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1250117
milestone47.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 1250117 - Trivial b2g build fix. r=me
gfx/layers/client/TextureClient.cpp
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -953,28 +953,28 @@ bool TextureClient::CopyToTextureClient(
 
 void
 TextureClient::RemoveFromCompositable(CompositableClient* aCompositable,
                                       AsyncTransactionWaiter* aWaiter)
 {
   MOZ_ASSERT(aCompositable);
 
 #if defined(MOZ_WIDGET_GONK) && ANDROID_VERSION >= 17
-  if (GetIPDLActor() && aCompositable->GetIPDLActor()
+  if (mActor && aCompositable->GetIPDLActor()
       && mData->AsGrallocTextureData()) {
     // remove old buffer from CompositableHost
-    RefPtr<AsyncTransactionWaiter> waiter = waiter ? waiter
-                                                   : new AsyncTransactionWaiter();
+    RefPtr<AsyncTransactionWaiter> waiter = aWaiter ? aWaiter
+                                                    : new AsyncTransactionWaiter();
     RefPtr<AsyncTransactionTracker> tracker =
         new RemoveTextureFromCompositableTracker(waiter);
     // Hold TextureClient until transaction complete.
     tracker->SetTextureClient(this);
     mRemoveFromCompositableWaiter = waiter;
     // RemoveTextureFromCompositableAsync() expects CompositorChild's presence.
-    GetForwarder()->RemoveTextureFromCompositableAsync(tracker, aCompositable, this);
+    mActor->GetForwarder()->RemoveTextureFromCompositableAsync(tracker, aCompositable, this);
   }
 #endif
 
 }
 
 void
 TextureClient::SetRemoveFromCompositableWaiter(AsyncTransactionWaiter* aWaiter) {
   mRemoveFromCompositableWaiter = aWaiter;