Fix handling of Mac accelerated plugin layers across tab switch.

chrome/browser/renderer_host/accelerated_surface_container_mac.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/accelerated_surface_container_mac.h"
 
 #include "base/logging.h"
 #include "webkit/glue/webplugin.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "chrome/common/io_surface_support_mac.h"
 
 AcceleratedSurfaceContainerMac::AcceleratedSurfaceContainerMac()
     : x_(0),
       y_(0),
       surface_(NULL),
       width_(0),
       height_(0),
-      texture_(0) {
+      texture_(0),
+      texture_needs_upload_(true) {
 }
 
 AcceleratedSurfaceContainerMac::~AcceleratedSurfaceContainerMac() {
   ReleaseIOSurface();
 }
 
 void AcceleratedSurfaceContainerMac::ReleaseIOSurface() {
   if (surface_) {
     CFRelease(surface_);
     surface_ = NULL;
@@ skipping 41 matching lines @@
   IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
   GLenum target = GL_TEXTURE_RECTANGLE_ARB;
   if (!texture_) {
     if ((io_surface_support && !surface_) ||
         (!io_surface_support && !transport_dib_.get()))
       return;
     glGenTextures(1, &texture_);
     glBindTexture(target, texture_);
     glTexParameterf(target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameterf(target, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-    // When using an IOSurface, the texture does not need to be repeatedly
-    // uploaded, so bind the IOSurface once during texture gen in this case.
-    if (io_surface_support) {
-      DCHECK(surface_);
-      // Don't think we need to identify a plane.
-      GLuint plane = 0;
-      io_surface_support->CGLTexImageIOSurface2D(context,
-                                                 target,
-                                                 GL_RGBA,
-                                                 width_,
-                                                 height_,
-                                                 GL_BGRA,
-                                                 GL_UNSIGNED_INT_8_8_8_8_REV,
-                                                 surface_,
-                                                 plane);
-    } else {
+    if (!io_surface_support) {
       // Reserve space on the card for the actual texture upload, done with the
       // glTexSubImage2D() call, below.
       glTexImage2D(target,
                    0,  // mipmap level 0
                    GL_RGBA,  // internal format
                    width_,
                    height_,
                    0,  // no border
                    GL_BGRA,  // The GPU plugin read BGRA pixels
                    GL_UNSIGNED_INT_8_8_8_8_REV,
                    NULL);  // No data, this call just reserves room.
     }
   }
 
+  // When using an IOSurface, the texture does not need to be repeatedly
+  // uploaded, just when we've been told we have to.
+  if (io_surface_support && texture_needs_upload_) {
+    DCHECK(surface_);
+    glBindTexture(target, texture_);
+    // Don't think we need to identify a plane.
+    GLuint plane = 0;
+    io_surface_support->CGLTexImageIOSurface2D(context,
+                                               target,
+                                               GL_RGBA,
+                                               width_,
+                                               height_,
+                                               GL_BGRA,
+                                               GL_UNSIGNED_INT_8_8_8_8_REV,
+                                               surface_,
+                                               plane);
+    texture_needs_upload_ = false;
+  }
   // If using TransportDIBs, the texture needs to be uploaded every frame.
   if (transport_dib_.get() != NULL) {
     void* pixel_memory = transport_dib_->memory();
     if (pixel_memory) {
       glBindTexture(target, texture_);
       glPixelStorei(GL_UNPACK_ALIGNMENT, 1);  // Needed for NPOT textures.
       glTexSubImage2D(target,
                       0,  // mipmap level 0
                       0,  // x-offset
                       0,  // y-offset
@@ skipping 29 matching lines @@
     glDisable(target);
   }
 }
 
 void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion(
     AcceleratedSurfaceContainerManagerMac* manager) {
   manager->EnqueueTextureForDeletion(texture_);
   texture_ = 0;
 }