Bug 968635 - Store texture flags in the right place in TextureClientX11 (r=mattwoodrow)
authorBill McCloskey <wmccloskey@mozilla.com>
Mon, 10 Feb 2014 11:28:50 -0800
changeset 167872 b673cf81b9e5e44582465443bf775f8283887c22
parent 167871 53038ab9c054e888c20f2c50b2e2f1b31b845c94
child 167873 4472e5b98cc60a9d77fb548f0fed0ed21edbe116
push id39588
push userwmccloskey@mozilla.com
push dateMon, 10 Feb 2014 19:29:45 +0000
treeherdermozilla-inbound@b673cf81b9e5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs968635
milestone30.0a1
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
Bug 968635 - Store texture flags in the right place in TextureClientX11 (r=mattwoodrow)
gfx/layers/basic/TextureClientX11.cpp
gfx/layers/basic/TextureClientX11.h
--- a/gfx/layers/basic/TextureClientX11.cpp
+++ b/gfx/layers/basic/TextureClientX11.cpp
@@ -14,18 +14,18 @@
 #include "mozilla/X11Util.h"
 #include <X11/Xlib.h>
 
 using namespace mozilla;
 using namespace mozilla::gfx;
 using namespace mozilla::layers;
 
 TextureClientX11::TextureClientX11(SurfaceFormat aFormat, TextureFlags aFlags)
-  : mFormat(aFormat),
-    mTextureFlags(aFlags)
+  : TextureClient(aFlags),
+    mFormat(aFormat)
 {
   MOZ_COUNT_CTOR(TextureClientX11);
 }
 
 TextureClientX11::~TextureClientX11()
 {
   MOZ_COUNT_DTOR(TextureClientX11);
 }
--- a/gfx/layers/basic/TextureClientX11.h
+++ b/gfx/layers/basic/TextureClientX11.h
@@ -51,17 +51,16 @@ class TextureClientX11
 
   TemporaryRef<gfx::DrawTarget> GetAsDrawTarget() MOZ_OVERRIDE;
   gfx::SurfaceFormat GetFormat() const {
     return mFormat;
   }
 
  private:
   gfx::SurfaceFormat mFormat;
-  TextureFlags mTextureFlags;
   gfx::IntSize mSize;
   RefPtr<gfxXlibSurface> mSurface;
   bool mLocked;
 };
 
 } // namespace layers
 } // namespace mozilla