Bug 957499: Fix SetCompositor() signature in subclasses of NewTextureSource, to actually override the parent's impl (and to fix -Woverloaded-virtual build warnings). r=nical

gfx/layers/basic/MacIOSurfaceTextureHostBasic.cpp

@@ -54,6 +54,11 @@ MacIOSurfaceTextureSourceBasic::GetSurface()
   return mSourceSurface;
 }
 
+void
+MacIOSurfaceTextureSourceBasic::SetCompositor(Compositor* aCompositor)
+{
+  mCompositor = static_cast<BasicCompositor*>(aCompositor);
+}
 
 bool
 MacIOSurfaceTextureHostBasic::Lock()

gfx/layers/basic/MacIOSurfaceTextureHostBasic.h

@@ -38,9 +38,7 @@ public:
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE { }
 
-  void SetCompositor(BasicCompositor* aCompositor) {
-    mCompositor = aCompositor;
-  }
+  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
 
 protected:
   BasicCompositor* mCompositor;

gfx/layers/opengl/GrallocTextureHost.cpp

@@ -141,12 +141,12 @@ GrallocTextureSourceOGL::gl() const
 }
 
 void
-GrallocTextureSourceOGL::SetCompositor(CompositorOGL* aCompositor)
+GrallocTextureSourceOGL::SetCompositor(Compositor* aCompositor)
 {
   if (mCompositor && !aCompositor) {
     DeallocateDeviceData();
   }
-  mCompositor = aCompositor;
+  mCompositor = static_cast<CompositorOGL*>(aCompositor);
 }
 
 

gfx/layers/opengl/GrallocTextureHost.h

@@ -51,7 +51,7 @@ public:
 
   gl::GLContext* gl() const;
 
-  void SetCompositor(CompositorOGL* aCompositor);
+  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
 
   void ForgetBuffer()
   {

gfx/layers/opengl/MacIOSurfaceTextureHostOGL.cpp

@@ -81,6 +81,12 @@ MacIOSurfaceTextureSourceOGL::BindTexture(GLenum aTextureUnit)
   gl()->fActiveTexture(LOCAL_GL_TEXTURE0);
 }
 
+void
+MacIOSurfaceTextureSourceOGL::SetCompositor(Compositor* aCompositor)
+{
+  mCompositor = static_cast<CompositorOGL*>(aCompositor);
+}
+
 gl::GLContext*
 MacIOSurfaceTextureSourceOGL::gl() const
 {

gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h

@@ -44,9 +44,7 @@ public:
   // MacIOSurfaceTextureSourceOGL doesn't own any gl texture
   virtual void DeallocateDeviceData() {}
 
-  void SetCompositor(CompositorOGL* aCompositor) {
-    mCompositor = aCompositor;
-  }
+  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
 
   gl::GLContext* gl() const;
 

gfx/layers/opengl/TextureHostOGL.cpp

@@ -355,9 +355,9 @@ SharedTextureSourceOGL::DetachSharedHandle()
 }
 
 void
-SharedTextureSourceOGL::SetCompositor(CompositorOGL* aCompositor)
+SharedTextureSourceOGL::SetCompositor(Compositor* aCompositor)
 {
-  mCompositor = aCompositor;
+  mCompositor = static_cast<CompositorOGL*>(aCompositor);
 }
 
 bool

gfx/layers/opengl/TextureHostOGL.h

@@ -269,7 +269,7 @@ public:
 
   void DetachSharedHandle();
 
-  void SetCompositor(CompositorOGL* aCompositor);
+  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
 
   gl::GLContext* gl() const;