Mac/gpu: Don't show uninitialized surfaces while resizing plugins / composited tabs.

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 "app/surface/io_surface_support_mac.h"
 #include "base/logging.h"
 #include "chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h"
 #include "webkit/glue/plugins/webplugin.h"
@@ skipping 13 matching lines @@
       was_painted_to_(false) {
 }
 
 AcceleratedSurfaceContainerMac::~AcceleratedSurfaceContainerMac() {
 }
 
 void AcceleratedSurfaceContainerMac::SetSizeAndIOSurface(
     int32 width,
     int32 height,
     uint64 io_surface_identifier) {
-  surface_.reset();
-  surface_id_ = 0;
-  IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize();
-  if (io_surface_support) {
-    surface_.reset(io_surface_support->IOSurfaceLookup(
-        static_cast<uint32>(io_surface_identifier)));
-    if (surface_.get())
-      surface_id_ = io_surface_identifier;
-    EnqueueTextureForDeletion();
-    width_ = width;
-    height_ = height;
-  }
+  // Ignore |io_surface_identifier|: The surface hasn't been painted to and
+  // only contains garbage data. Update the surface in |set_was_painted_to()|
+  // instead.
+  width_ = width;
+  height_ = height;
 }
 
 void AcceleratedSurfaceContainerMac::SetSizeAndTransportDIB(
     int32 width,
     int32 height,
     TransportDIB::Handle transport_dib) {
   if (TransportDIB::is_valid(transport_dib)) {
     transport_dib_.reset(TransportDIB::Map(transport_dib));
     EnqueueTextureForDeletion();
     width_ = width;
@@ skipping 51 matching lines @@
   // 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_.get());
     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_,
+                                               surface_width_,
+                                               surface_height_,
                                                GL_BGRA,
                                                GL_UNSIGNED_INT_8_8_8_8_REV,
                                                surface_.get(),
                                                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
                       width_,
                       height_,
                       GL_BGRA,  // The GPU plugin gave us BGRA pixels
                       GL_UNSIGNED_INT_8_8_8_8_REV,
                       pixel_memory);
     }
   }
 
   if (texture_) {
+    int texture_width = io_surface_support ? surface_width_ : width_;
+    int texture_height = io_surface_support ? surface_height_ : height_;
+
     // TODO(kbr): convert this to use only OpenGL ES 2.0 functionality.
 
     // TODO(kbr): may need to pay attention to cutout rects.
     int clipX = clipRect_.x();
     int clipY = clipRect_.y();
     int clipWidth = clipRect_.width();
     int clipHeight = clipRect_.height();
 
+    if (clipX + clipWidth > texture_width)
+      clipWidth = texture_width - clipX;
+    if (clipY + clipHeight > texture_height)
+      clipHeight = texture_height - clipY;
+
     if (opaque_) {
       // Pepper 3D's output is currently considered opaque even if the
       // program draws pixels with alpha less than 1. In order to have
       // this effect, we need to drop the alpha channel of the input,
       // replacing it with alpha = 1.
 
       // First fill the rectangle with alpha=1.
       glColorMask(false, false, false, true);
       glColor4f(0.0f, 0.0f, 0.0f, 1.0f);
       glBegin(GL_TRIANGLE_STRIP);
@@ skipping 10 matching lines @@
       glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
     } else {
       glColorMask(true, true, true, true);
     }
 
     // Draw the color channels from the incoming texture.
     glBindTexture(target, texture_);
     glEnable(target);
     glBegin(GL_TRIANGLE_STRIP);
 
-      glTexCoord2f(clipX, height_ - clipY);
+      glTexCoord2f(clipX, texture_height - clipY);
       glVertex3f(0, 0, 0);
 
-      glTexCoord2f(clipX + clipWidth, height_ - clipY);
+      glTexCoord2f(clipX + clipWidth, texture_height - clipY);
       glVertex3f(clipWidth, 0, 0);
 
-      glTexCoord2f(clipX, height_ - clipY - clipHeight);
+      glTexCoord2f(clipX, texture_height - clipY - clipHeight);
       glVertex3f(0, clipHeight, 0);
 
-      glTexCoord2f(clipX + clipWidth, height_ - clipY - clipHeight);
+      glTexCoord2f(clipX + clipWidth, texture_height - clipY - clipHeight);
       glVertex3f(clipWidth, clipHeight, 0);
 
     glEnd();
     glDisable(target);
   }
 }
 
 void AcceleratedSurfaceContainerMac::set_was_painted_to(uint64 surface_id) {
-  if (surface_id) {
-    // Check that only the most current IOSurface allocated for this container
-    // is painted to.
-    DCHECK(surface_);
-    DCHECK_EQ(surface_id, surface_id_);
+  if (surface_id && (!surface_ || surface_id != surface_id_)) {
+    // Keep the surface that was most recently painted to around.
+    if (IOSurfaceSupport* io_surface_support = IOSurfaceSupport::Initialize()) {
+      CFTypeRef surface = io_surface_support->IOSurfaceLookup(
+          static_cast<uint32>(surface_id));
+      // Can fail if IOSurface with that ID was already released by the
+      // gpu process or the plugin process. We will get a |set_was_painted_to()|
+      // message with a new surface soon in that case.
+      if (surface) {
+        surface_.reset(surface);
+        surface_id_ = surface_id;
+        surface_width_ = io_surface_support->IOSurfaceGetWidth(surface_);
+        surface_height_ = io_surface_support->IOSurfaceGetHeight(surface_);
+        EnqueueTextureForDeletion();
+      }
+    }
   }
   was_painted_to_ = true;
 }
 
 void AcceleratedSurfaceContainerMac::EnqueueTextureForDeletion() {
   if (texture_) {
     DCHECK(texture_pending_deletion_ == 0);
     texture_pending_deletion_ = texture_;
     texture_ = 0;
   }
 }