Bug 1370308 - Don't crash when using SkiaGL with SurfaceTexture on Android r=jgilbert draft
authorJames Willcox <snorp@snorp.net>
Sat, 03 Jun 2017 14:15:42 -0500
changeset 589171 9611e13fccf62d0f97a4d8ec7e45c5423d5dcaa2
parent 588367 6df447e759545d38f60027135bd4926da396a4c9
child 589186 e78361a5651b9e96db82f5ab2fb4aeb90e0baf9d
push id62263
push userbmo:snorp@snorp.net
push dateMon, 05 Jun 2017 18:27:08 +0000
reviewersjgilbert
bugs1370308
milestone55.0a1
Bug 1370308 - Don't crash when using SkiaGL with SurfaceTexture on Android r=jgilbert MozReview-Commit-ID: EKxBaU6SfdB
gfx/gl/SharedSurface.cpp
--- a/gfx/gl/SharedSurface.cpp
+++ b/gfx/gl/SharedSurface.cpp
@@ -108,17 +108,17 @@ SharedSurface::ProdCopy(SharedSurface* s
         if (src->mAttachType == AttachmentType::GLTexture) {
             GLuint srcTex = src->ProdTexture();
             GLenum srcTarget = src->ProdTextureTarget();
 
             gl->BlitHelper()->BlitTextureToFramebuffer(srcTex, 0,
                                                        src->mSize,
                                                        dest->mSize,
                                                        srcTarget,
-                                                       true);
+                                                       !!gl->Screen());
         } else if (src->mAttachType == AttachmentType::GLRenderbuffer) {
             GLuint srcRB = src->ProdRenderbuffer();
             ScopedFramebufferForRenderbuffer srcWrapper(gl, srcRB);
 
             gl->BlitHelper()->BlitFramebufferToFramebuffer(srcWrapper.FB(),
                                                            0,
                                                            src->mSize,
                                                            dest->mSize,