aura: Add flush() to make sure delete operations make it through when we intend.

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/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 173 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);
+};
+
 void ReadBackFramebuffer(
     WebKit::WebGraphicsContext3D* context,
     unsigned char* pixels,
     gfx::Size size,
     WebKit::WebGLId dst_texture,
     bool* result) {
   *result = false;
   if (!context->makeContextCurrent())
     return;
   if (context->isContextLost())
     return;
+  ScopedFlush flush(context);
   ScopedFramebuffer dst_framebuffer(context, context->createFramebuffer());
   {
     ScopedFramebufferBinder<GL_DRAW_FRAMEBUFFER> framebuffer_binder(
         context, dst_framebuffer);
     ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(
         context, dst_texture);
     context->framebufferTexture2D(GL_DRAW_FRAMEBUFFER,
                                   GL_COLOR_ATTACHMENT0,
                                   GL_TEXTURE_2D,
                                   dst_texture,
                                   0);
   }
   *result = context->readBackFramebuffer(
         pixels,
         4 * size.GetArea(),
         static_cast<WebKit::WebGLId>(dst_framebuffer),
         size.width(),
         size.height());
-  context->flush();
 }
 
 void ReadBackFramebufferComplete(WebKit::WebGraphicsContext3D* context,
                                  WebKit::WebGLId* dst_texture,
                                  base::Callback<void(bool)> callback,
                                  bool* result) {
   callback.Run(*result);
   if (*dst_texture != 0) {
     context->deleteTexture(*dst_texture);
+    context->flush();
     *dst_texture = 0;
   }
 }
 
 void DeleteContext(WebKit::WebGraphicsContext3D* context) {
   delete context;
 }
 
 void SignalWaitableEvent(base::WaitableEvent* event) {
   event->Signal();
@@ skipping 204 matching lines @@
       base::Bind(&DeleteContext,
                  context_for_thread_));
   context_for_thread_ = NULL;
 }
 
 bool GLHelper::CopyTextureToImpl::CopyTextureTo(
     WebKit::WebGLId src_texture,
     const gfx::Size& src_size,
     const gfx::Size& dst_size,
     unsigned char* out) {
+  ScopedFlush flush(context_);
   ScopedTexture dst_texture(context_,
                             ScaleTexture(src_texture, src_size, dst_size));
   ScopedFramebuffer dst_framebuffer(context_, context_->createFramebuffer());
   {
     ScopedFramebufferBinder<GL_DRAW_FRAMEBUFFER> framebuffer_binder(
         context_, dst_framebuffer);
     ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(
         context_, dst_framebuffer);
     context_->framebufferTexture2D(GL_DRAW_FRAMEBUFFER,
                                    GL_COLOR_ATTACHMENT0,
@@ skipping 119 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