diff --git a/gfx/layers/basic/BasicCanvasLayer.h b/gfx/layers/basic/BasicCanvasLayer.h
index 9c7919d07b49..3e6fbe205791 100644
--- a/gfx/layers/basic/BasicCanvasLayer.h
+++ b/gfx/layers/basic/BasicCanvasLayer.h
@@ -148,7 +148,7 @@ private:
 
   CompositableType GetCompositableClientType()
   {
-    if (mGLContext) {
+    if (mGLContext && XRE_GetProcessType() == GeckoProcessType_Default) {
       return BUFFER_IMAGE_BUFFERED;
     }
     return BUFFER_IMAGE_SINGLE;
diff --git a/gfx/layers/opengl/TextureHostOGL.cpp b/gfx/layers/opengl/TextureHostOGL.cpp
index cc5051e91075..733ce1694875 100644
--- a/gfx/layers/opengl/TextureHostOGL.cpp
+++ b/gfx/layers/opengl/TextureHostOGL.cpp
@@ -647,6 +647,12 @@ void GrallocTextureHostOGL::BindTexture(GLenum aTextureUnit)
   mGL->fActiveTexture(LOCAL_GL_TEXTURE0);
 }
 
+bool
+GrallocTextureHostOGL::IsValid() const
+{
+  return !!mGraphicBuffer.get();
+}
+
 GrallocTextureHostOGL::~GrallocTextureHostOGL()
 {
   DeleteTextures();
diff --git a/gfx/layers/opengl/TextureHostOGL.h b/gfx/layers/opengl/TextureHostOGL.h
index e654dee09dfe..f9322e8ef250 100644
--- a/gfx/layers/opengl/TextureHostOGL.h
+++ b/gfx/layers/opengl/TextureHostOGL.h
@@ -582,11 +582,7 @@ public:
     return LOCAL_GL_CLAMP_TO_EDGE;
   }
 
-
-  bool IsValid() const MOZ_OVERRIDE
-  {
-    return !!mGLTexture;
-  }
+  bool IsValid() const MOZ_OVERRIDE;
 
 #ifdef MOZ_LAYERS_HAVE_LOG
   virtual const char* Name() { return "GrallocTextureHostOGL"; }