Backed out changeset e0ada286eea0 for landing with wrong bug number.

DONTBUILD because just backing out & re-landing to fix bug number.

gfx/layers/basic/TextureClientX11.h

@@ -43,7 +43,7 @@ class TextureClientX11 : public TextureClient
 
   virtual gfx::DrawTarget* BorrowDrawTarget() MOZ_OVERRIDE;
 
-  virtual gfx::SurfaceFormat GetFormat() const MOZ_OVERRIDE { return mFormat; }
+  virtual gfx::SurfaceFormat GetFormat() const { return mFormat; }
 
   virtual bool HasInternalBuffer() const MOZ_OVERRIDE { return false; }
 

gfx/layers/basic/X11TextureSourceBasic.h

@@ -33,7 +33,7 @@ public:
 
   virtual void DeallocateDeviceData() MOZ_OVERRIDE { }
 
-  virtual void SetCompositor(Compositor* aCompositor) MOZ_OVERRIDE;
+  virtual void SetCompositor(Compositor* aCompositor);
 
   static gfx::SurfaceFormat ContentTypeToSurfaceFormat(gfxContentType aType);
 

gfx/layers/composite/X11TextureHost.h

@@ -41,7 +41,7 @@ public:
   }
 
 #ifdef MOZ_LAYERS_HAVE_LOG
-  virtual const char* Name() MOZ_OVERRIDE { return "X11TextureHost"; }
+  virtual const char* Name() { return "X11TextureHost"; }
 #endif
 
 protected: