Backed out changeset 0cee3cdcce99 (bug 1187464)

--HG--
extra : rebase_source : 977a8167488bc1dbf71c6205a2eb4b77c1c3a0ca

gfx/layers/basic/BasicCompositor.cpp

@@ -34,7 +34,6 @@ class DataTextureSourceBasic : public DataTextureSource
                              , public TextureSourceBasic
 {
 public:
-  virtual const char* Name() const override { return "DataTextureSourceBasic"; }
 
   virtual TextureSourceBasic* AsSourceBasic() override { return this; }
 
@@ -452,7 +451,7 @@ BasicCompositor::DrawQuad(const gfx::Rect& aRect,
                                        DrawOptions(aOpacity, blendMode),
                                        sourceMask, &maskTransform);
       } else {
-        gfxDevCrash(LogReason::IncompatibleBasicTexturedEffect) << "Bad for basic with " << texturedEffect->mTexture->Name();
+        gfxDevCrash(LogReason::IncompatibleBasicTexturedEffect) << "Bad for basic";
       }
 
       break;

gfx/layers/basic/BasicCompositor.h

@@ -23,8 +23,6 @@ public:
     , mSize(aRect.Size())
   { }
 
-  virtual const char* Name() const override { return "BasicCompositingRenderTarget"; }
-
   virtual gfx::IntSize GetSize() const override { return mSize; }
 
   void BindRenderTarget();

gfx/layers/basic/MacIOSurfaceTextureHostBasic.h

@@ -31,8 +31,6 @@ public:
                                  MacIOSurface* aSurface);
   virtual ~MacIOSurfaceTextureSourceBasic();
 
-  virtual const char* Name() const override { return "MacIOSurfaceTextureSourceBasic"; }
-
   virtual TextureSourceBasic* AsSourceBasic() override { return this; }
 
   virtual gfx::IntSize GetSize() const override;

gfx/layers/basic/X11BasicCompositor.h

@@ -22,8 +22,6 @@ class X11DataTextureSourceBasic : public DataTextureSource
 public:
   X11DataTextureSourceBasic() {};
 
-  virtual const char* Name() const override { return "X11DataTextureSourceBasic"; }
-
   virtual bool Update(gfx::DataSourceSurface* aSurface,
                       nsIntRegion* aDestRegion = nullptr,
                       gfx::IntPoint* aSrcOffset = nullptr) override;

gfx/layers/basic/X11TextureSourceBasic.h

@@ -24,8 +24,6 @@ class X11TextureSourceBasic
 public:
   X11TextureSourceBasic(BasicCompositor* aCompositor, gfxXlibSurface* aSurface);
 
-  virtual const char* Name() const override { return "X11TextureSourceBasic"; }
-
   virtual X11TextureSourceBasic* AsSourceBasic() override { return this; }
 
   virtual gfx::IntSize GetSize() const override;

gfx/layers/composite/TextureHost.cpp

@@ -374,13 +374,6 @@ TextureSource::~TextureSource()
     MOZ_COUNT_DTOR(TextureSource);
 }
 
-const char*
-TextureSource::Name() const
-{
-  MOZ_CRASH("TextureSource without class name");
-  return "TextureSource";
-}
-  
 BufferTextureHost::BufferTextureHost(const BufferDescriptor& aDesc,
                                      TextureFlags aFlags)
 : TextureHost(aFlags)

gfx/layers/composite/TextureHost.h

@@ -88,8 +88,6 @@ public:
 
   virtual ~TextureSource();
 
-  virtual const char* Name() const = 0;
-
   /**
    * Should be overridden in order to deallocate the data that is associated
    * with the rendering backend, such as GL textures.
@@ -235,8 +233,6 @@ public:
     : mUpdateSerial(0)
   {}
 
-  virtual const char* Name() const override { return "DataTextureSource"; }
-
   virtual DataTextureSource* AsDataTextureSource() override { return this; }
 
   /**
@@ -728,8 +724,6 @@ public:
   {}
   virtual ~CompositingRenderTarget() {}
 
-  virtual const char* Name() const override { return "CompositingRenderTarget"; }
-
 #ifdef MOZ_DUMP_PAINTING
   virtual already_AddRefed<gfx::DataSourceSurface> Dump(Compositor* aCompositor) { return nullptr; }
 #endif

gfx/layers/composite/X11TextureHost.h

@@ -21,8 +21,6 @@ public:
   // Called when the underlying X surface has been changed.
   // Useful for determining whether to rebind a GLXPixmap to a texture.
   virtual void Updated() = 0;
-
-  virtual const char* Name() const override { return "X11TextureSource"; }
 };
 
 // TextureHost for Xlib-backed TextureSources.

gfx/layers/d3d11/TextureD3D11.h

@@ -253,7 +253,6 @@ public:
 
   virtual ~DataTextureSourceD3D11();
 
-  virtual const char* Name() const override { return "DataTextureSourceD3D11"; }
 
   // DataTextureSource
 
@@ -409,8 +408,6 @@ public:
                                const gfx::IntPoint& aOrigin,
                                DXGI_FORMAT aFormatOverride = DXGI_FORMAT_UNKNOWN);
 
-  virtual const char* Name() const override { return "CompositingRenderTargetD3D11"; }
-
   virtual TextureSourceD3D11* AsSourceD3D11() override { return this; }
 
   void BindRenderTarget(ID3D11DeviceContext* aContext);

gfx/layers/d3d9/TextureD3D9.h

@@ -112,8 +112,6 @@ public:
 
   virtual ~DataTextureSourceD3D9();
 
-  virtual const char* Name() const override { return "DataTextureSourceD3D9"; }
-
   // DataTextureSource
 
   virtual bool Update(gfx::DataSourceSurface* aSurface,
@@ -400,8 +398,6 @@ public:
                               const gfx::IntRect& aRect);
   virtual ~CompositingRenderTargetD3D9();
 
-  virtual const char* Name() const override { return "CompositingRenderTargetD3D9"; }
-
   virtual TextureSourceD3D9* AsSourceD3D9() override
   {
     MOZ_ASSERT(mTexture,

gfx/layers/opengl/CompositingRenderTargetOGL.h

@@ -77,8 +77,6 @@ public:
 
   ~CompositingRenderTargetOGL();
 
-  virtual const char* Name() const override { return "CompositingRenderTargetOGL"; }
-
   /**
    * Create a render target around the default FBO, for rendering straight to
    * the window.

gfx/layers/opengl/MacIOSurfaceTextureHostOGL.h

@@ -28,8 +28,6 @@ public:
                                MacIOSurface* aSurface);
   virtual ~MacIOSurfaceTextureSourceOGL();
 
-  virtual const char* Name() const override { return "MacIOSurfaceTextureSourceOGL"; }
-
   virtual TextureSourceOGL* AsSourceOGL() override { return this; }
 
   virtual void BindTexture(GLenum activetex, gfx::Filter aFilter) override;

gfx/layers/opengl/TextureHostOGL.h

@@ -142,7 +142,6 @@ public:
     , mIterating(false)
   {}
 
-  virtual const char* Name() const override { return "TextureImageTextureSourceOGL"; }
   // DataTextureSource
 
   virtual bool Update(gfx::DataSourceSurface* aSurface,
@@ -238,8 +237,6 @@ public:
 
   ~GLTextureSource();
 
-  virtual const char* Name() const override { return "GLTextureSource"; }
-
   virtual GLTextureSource* AsGLTextureSource() override { return this; }
 
   virtual TextureSourceOGL* AsSourceOGL() override { return this; }
@@ -347,8 +344,6 @@ public:
                        GLenum aWrapMode,
                        gfx::IntSize aSize);
 
-  virtual const char* Name() const override { return "SurfaceTextureSource"; }
-
   virtual TextureSourceOGL* AsSourceOGL() { return this; }
 
   virtual void BindTexture(GLenum activetex, gfx::Filter aFilter) override;
@@ -441,8 +436,6 @@ public:
                         GLenum aWrapMode,
                         gfx::IntSize aSize);
 
-  virtual const char* Name() const override { return "EGLImageTextureSource"; }
-
   virtual TextureSourceOGL* AsSourceOGL() override { return this; }
 
   virtual void BindTexture(GLenum activetex, gfx::Filter aFilter) override;