Bug 902929. Assert that we don't have a compositable child for ImageBridgeClients. r=nical
☠☠ backed out by b89d05e87140 ☠ ☠
authorNicholas Cameron <ncameron@mozilla.com>
Wed, 21 Aug 2013 13:27:05 +1200
changeset 143343 6356b67f6c879cc95d522f3eea03b52ad1cf2f59
parent 143342 06ae8a3ca0d6992fd1f3582553fd0ef71123e24e
child 143344 315c9f0af9bb1f3c7d59117b3f1c90042bd474a0
push id32709
push userncameron@mozilla.com
push dateWed, 21 Aug 2013 01:29:07 +0000
treeherdermozilla-inbound@315c9f0af9bb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnical
bugs902929
milestone26.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 902929. Assert that we don't have a compositable child for ImageBridgeClients. r=nical
gfx/layers/client/CompositableClient.h
gfx/layers/client/ImageClient.h
--- a/gfx/layers/client/CompositableClient.h
+++ b/gfx/layers/client/CompositableClient.h
@@ -97,17 +97,17 @@ public:
    */
   virtual bool Connect();
 
   void Destroy();
 
   CompositableChild* GetIPDLActor() const;
 
   // should only be called by a CompositableForwarder
-  void SetIPDLActor(CompositableChild* aChild);
+  virtual void SetIPDLActor(CompositableChild* aChild);
 
   CompositableForwarder* GetForwarder() const
   {
     return mForwarder;
   }
 
   /**
    * This identifier is what lets us attach async compositables with a shadow
--- a/gfx/layers/client/ImageClient.h
+++ b/gfx/layers/client/ImageClient.h
@@ -176,16 +176,21 @@ public:
     mLayer = aLayer;
   }
 
   virtual TextureInfo GetTextureInfo() const MOZ_OVERRIDE
   {
     return TextureInfo(mType);
   }
 
+  virtual void SetIPDLActor(CompositableChild* aChild) MOZ_OVERRIDE
+  {
+    MOZ_ASSERT(!aChild, "ImageClientBridge should not have IPDL actor");
+  }
+
 protected:
   uint64_t mAsyncContainerID;
   ShadowableLayer* mLayer;
 };
 
 }
 }