Backed out changeset 6356b67f6c87 (bug 902929)
authorWes Kocher <wkocher@mozilla.com>
Tue, 20 Aug 2013 20:50:26 -0700
changeset 143349 b89d05e871404f2e1bc3d6881f331f0cab10a0db
parent 143348 662edd7ed81cdc0e8fbbaa1c7b64c5408c461834
child 143350 bdb42e4ad1c8285578d40af09181dbe9e4b5295f
push id32713
push userkwierso@gmail.com
push dateWed, 21 Aug 2013 03:50:39 +0000
treeherdermozilla-inbound@b89d05e87140 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs902929
milestone26.0a1
backs out6356b67f6c879cc95d522f3eea03b52ad1cf2f59
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
Backed out changeset 6356b67f6c87 (bug 902929)
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
-  virtual void SetIPDLActor(CompositableChild* aChild);
+  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,21 +176,16 @@ 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;
 };
 
 }
 }