Backport to R19 of r132638 r133017 r133579 r133732

content/browser/renderer_host/image_transport_factory.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/browser/renderer_host/image_transport_factory.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 289 matching lines @@
       DCHECK(data);
       ContentGLContext* context = data->shared_context->content_gl_context();
       int gpu_process_id = context->GetGPUProcessID();
       uint32 client_id = context->GetChannelID();
       uint32 context_id = context->GetContextID();
       if (surface.parent_gpu_process_id == gpu_process_id &&
           surface.parent_client_id == client_id &&
           surface.parent_context_id == context_id) {
         data->shared_context->deleteTexture(surface.parent_texture_id[0]);
         data->shared_context->deleteTexture(surface.parent_texture_id[1]);
+        data->shared_context->flush();
         break;
       }
     }
   }
 
   virtual WebKit::WebGraphicsContext3D* GetSharedContext(
       ui::Compositor* compositor) OVERRIDE {
     PerCompositorDataMap::const_iterator itr =
         per_compositor_data_.find(compositor);
     if (itr == per_compositor_data_.end())
@@ skipping 122 matching lines @@
 void ImageTransportFactory::Terminate() {
   ui::ContextFactory::SetInstance(NULL);
   delete g_factory;
   g_factory = NULL;
 }
 
 // static
 ImageTransportFactory* ImageTransportFactory::GetInstance() {
   return g_factory;
 }