Backport to R19 of r132638 r133017 r133579 r133732

content/common/gpu/client/gl_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gl_helper.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "ui/gfx/gl/gl_bindings.h"
@@ skipping 153 matching lines @@
 class ScopedTextureBinder : ScopedBinder<target> {
  public:
   ScopedTextureBinder(WebKit::WebGraphicsContext3D* context,
                       WebKit::WebGLId id)
       : ScopedBinder<target>(
           context,
           id,
           &WebKit::WebGraphicsContext3D::bindTexture) {}
 };
 
+class ScopedFlush {
+ public:
+  ScopedFlush(WebKit::WebGraphicsContext3D* context)
+      : context_(context) {
+  }
+
+  virtual ~ScopedFlush() {
+    context_->flush();
+  }
+
+ private:
+  WebKit::WebGraphicsContext3D* context_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedFlush);
+};
+
 }  // namespace
 
 namespace content {
 
 // Implements GLHelper::CopyTextureTo and encapsulates the data needed for it.
 class GLHelper::CopyTextureToImpl {
  public:
   CopyTextureToImpl(WebKit::WebGraphicsContext3D* context,
                     GLHelper* helper)
       : context_(context),
@@ skipping 96 matching lines @@
 
 void GLHelper::CopyTextureToImpl::Detach() {
   program_.Detach();
   vertex_attributes_buffer_.Detach();
 }
 
 bool GLHelper::CopyTextureToImpl::CopyTextureTo(WebKit::WebGLId src_texture,
                                                 const gfx::Size& src_size,
                                                 const gfx::Size& dst_size,
                                                 unsigned char* out) {
+  ScopedFlush flush(context_);
   ScopedFramebuffer dst_framebuffer(context_, context_->createFramebuffer());
   ScopedTexture dst_texture(context_, context_->createTexture());
   {
     ScopedFramebufferBinder<GL_DRAW_FRAMEBUFFER> framebuffer_binder(
         context_, dst_framebuffer);
     {
       ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(context_, dst_texture);
       context_->texImage2D(GL_TEXTURE_2D,
                            0,
                            GL_RGBA,
@@ skipping 91 matching lines @@
   WebKit::WGC3Dint compile_status = 0;
   context_->getShaderiv(shader, GL_COMPILE_STATUS, &compile_status);
   if (!compile_status) {
     LOG(ERROR) << std::string(context_->getShaderInfoLog(shader).utf8());
     return 0;
   }
   return shader.Detach();
 }
 
 }  // namespace content