Bug 860446: Properly readback from WebGL with B2G. r=bjacob

--HG--
extra : rebase_source : ed6f0374cbc5912bcde84680eccfaa2da6c9d1d5

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;

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();

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"; }