Bug 942507 - GLContext doesn't need to have userdata. r=bjacob

gfx/gl/GLContext.h

@@ -2415,16 +2415,6 @@ public:
 
     virtual void ReleaseSurface() {}
 
-    void *GetUserData(void *aKey) {
-        void *result = nullptr;
-        mUserData.Get(aKey, &result);
-        return result;
-    }
-
-    void SetUserData(void *aKey, void *aValue) {
-        mUserData.Put(aKey, aValue);
-    }
-
     // Mark this context as destroyed.  This will nullptr out all
     // the GL function pointers!
     void MarkDestroyed();
@@ -2910,8 +2900,6 @@ public:
     bool IsOffscreenSizeAllowed(const gfxIntSize& aSize) const;
 
 protected:
-    nsDataHashtable<nsPtrHashKey<void>, void*> mUserData;
-
     GLuint mReadTextureImagePrograms[4];
 
     bool InitWithPrefix(const char *prefix, bool trygl);

gfx/layers/opengl/CompositorOGL.cpp

@@ -233,10 +233,6 @@ FPSState::DrawFPS(TimeStamp aNow,
   DrawQuads(aContext, mVBOs, aProgram, rects);
 }
 
-#ifdef CHECK_CURRENT_PROGRAM
-int ShaderProgramOGL::sCurrentProgramKey = 0;
-#endif
-
 CompositorOGL::CompositorOGL(nsIWidget *aWidget, int aSurfaceWidth,
                              int aSurfaceHeight, bool aUseExternalSurfaceSize)
   : mWidget(aWidget)

gfx/layers/opengl/OGLShaderProgram.cpp

@@ -449,9 +449,7 @@ ShaderProgramOGL::Activate()
   }
   NS_ASSERTION(HasInitialized(), "Attempting to activate a program that's not in use!");
   mGL->fUseProgram(mProgram);
-#if CHECK_CURRENT_PROGRAM
-  mGL->SetUserData(&sCurrentProgramKey, this);
-#endif
+
   // check and set the projection matrix
   if (mIsProjectionMatrixStale) {
     SetProjectionMatrix(mProjectionMatrix);

gfx/layers/opengl/OGLShaderProgram.h

@@ -199,11 +199,14 @@ private:
 #define CHECK_CURRENT_PROGRAM 1
 #define ASSERT_THIS_PROGRAM                                             \
   do {                                                                  \
-    NS_ASSERTION(mGL->GetUserData(&sCurrentProgramKey) == this, \
+    GLuint currentProgram;                                              \
+    mGL->GetUIntegerv(LOCAL_GL_CURRENT_PROGRAM, &currentProgram);       \
+    NS_ASSERTION(currentProgram == mProgram,                            \
                  "SetUniform with wrong program active!");              \
   } while (0)
 #else
-#define ASSERT_THIS_PROGRAM
+#define ASSERT_THIS_PROGRAM                                             \
+  do { } while (0)
 #endif
 
 /**
@@ -385,9 +388,6 @@ protected:
   } mProgramState;
 
   GLint mTexCoordMultiplierUniformLocation;
-#ifdef CHECK_CURRENT_PROGRAM
-  static int sCurrentProgramKey;
-#endif
 
   void SetUniform(GLint aLocation, float aFloatValue);
   void SetUniform(GLint aLocation, const gfxRGBA& aColor);