Backed out changeset 6356b67f6c87 (bug 902929)

gfx/layers/client/CompositableClient.h

@@ -102,7 +102,7 @@ public:
   CompositableChild* GetIPDLActor() const;
 
   // should only be called by a CompositableForwarder
-  virtual void SetIPDLActor(CompositableChild* aChild);
+  void SetIPDLActor(CompositableChild* aChild);
 
   CompositableForwarder* GetForwarder() const
   {

gfx/layers/client/ImageClient.h

@@ -181,11 +181,6 @@ public:
     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;