Backed out changeset 1fbada95de3a (bug 1285692) to stop failing gl tests
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 19 Jul 2016 14:16:18 +0200
changeset 330762 88528d5b8d961a7ff3649f8bfd5c1184faec90ae
parent 330761 2761e5c7898518948d18d155163bbba044328cfe
child 330763 3996c602754f1653b9affb07485ad641189cc771
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1285692
milestone50.0a1
backs out1fbada95de3a0187784df2d712d9d4047a9a4d84
Backed out changeset 1fbada95de3a (bug 1285692) to stop failing gl tests
gfx/gl/SharedSurface.cpp
gfx/gl/SharedSurface.h
--- a/gfx/gl/SharedSurface.cpp
+++ b/gfx/gl/SharedSurface.cpp
@@ -209,16 +209,17 @@ SharedSurface::SharedSurface(SharedSurfa
     : mType(type)
     , mAttachType(attachType)
     , mGL(gl)
     , mSize(size)
     , mHasAlpha(hasAlpha)
     , mCanRecycle(canRecycle)
     , mIsLocked(false)
     , mIsProducerAcquired(false)
+    , mIsConsumerAcquired(false)
 #ifdef DEBUG
     , mOwningThread(NS_GetCurrentThread())
 #endif
 { }
 
 layers::TextureFlags
 SharedSurface::GetTextureFlags() const
 {
--- a/gfx/gl/SharedSurface.h
+++ b/gfx/gl/SharedSurface.h
@@ -62,16 +62,17 @@ public:
     const AttachmentType mAttachType;
     GLContext* const mGL;
     const gfx::IntSize mSize;
     const bool mHasAlpha;
     const bool mCanRecycle;
 protected:
     bool mIsLocked;
     bool mIsProducerAcquired;
+    bool mIsConsumerAcquired;
 #ifdef DEBUG
     nsIThread* const mOwningThread;
 #endif
 
     SharedSurface(SharedSurfaceType type,
                   AttachmentType attachType,
                   GLContext* gl,
                   const gfx::IntSize& size,
@@ -81,18 +82,19 @@ protected:
 public:
     virtual ~SharedSurface() {
     }
 
     // Specifies to the TextureClient any flags which
     // are required by the SharedSurface backend.
     virtual layers::TextureFlags GetTextureFlags() const;
 
-    bool IsLocked() const { return mIsLocked; }
-    bool IsProducerAcquired() const { return mIsProducerAcquired; }
+    bool IsLocked() const {
+        return mIsLocked;
+    }
 
     // This locks the SharedSurface as the production buffer for the context.
     // This is needed by backends which use PBuffers and/or EGLSurfaces.
     void LockProd();
 
     // Unlocking is harmless if we're already unlocked.
     void UnlockProd();