Aura: Resize locks with --ui-enable-threaded-compositing

content/common/gpu/texture_image_transport_surface.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/texture_image_transport_surface.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 214 matching lines @@
 bool TextureImageTransportSurface::SwapBuffers() {
   DCHECK(backbuffer_suggested_allocation_);
   if (!frontbuffer_suggested_allocation_ || !frontbuffer_is_protected_)
     return true;
   if (!parent_stub_) {
     LOG(ERROR) << "SwapBuffers failed because no parent stub.";
     return false;
   }
 
   glFlush();
-  front_ = back();
-  previous_damage_rect_ = gfx::Rect(textures_[front()].size);
-
-  DCHECK(textures_[front()].client_id != 0);
+  previous_damage_rect_ = gfx::Rect(textures_[back()].size);
 
   GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
-  params.surface_handle = textures_[front()].client_id;
+  params.surface_handle = textures_[back()].client_id;
   params.protection_state_id = protection_state_id_;
   params.skip_ack = false;
   helper_->SendAcceleratedSurfaceBuffersSwapped(params);
   helper_->SetScheduled(false);
   return true;
 }
 
 bool TextureImageTransportSurface::PostSubBuffer(
     int x, int y, int width, int height) {
   DCHECK(backbuffer_suggested_allocation_);
@@ skipping 39 matching lines @@
         glCopyTexSubImage2D(GL_TEXTURE_2D, 0, region_to_copy.x(),
             region_to_copy.y(), region_to_copy.x(), region_to_copy.y(),
             region_to_copy.width(), region_to_copy.height());
       }
     }
   } else {
     DCHECK(new_damage_rect == gfx::Rect(expected_size));
   }
 
   glFlush();
-  front_ = back();
   previous_damage_rect_ = new_damage_rect;
 
-  DCHECK(textures_[front()].client_id);
-
   GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params params;
-  params.surface_handle = textures_[front()].client_id;
+  params.surface_handle = textures_[back()].client_id;
   params.x = x;
   params.y = y;
   params.width = width;
   params.height = height;
   params.protection_state_id = protection_state_id_;
   helper_->SendAcceleratedSurfacePostSubBuffer(params);
   helper_->SetScheduled(false);
   return true;
 }
 
@@ skipping 36 matching lines @@
     GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params params;
     params.surface_handle = textures_[front()].client_id;
     params.protection_state_id = protection_state_id_;
     params.skip_ack = true;
     helper_->SendAcceleratedSurfaceBuffersSwapped(params);
   }
 }
 
 void TextureImageTransportSurface::OnBufferPresented(uint32 sync_point) {
   if (sync_point == 0) {
-    BufferPresentedImpl();
+    // We could do this many times in a row, so play it safe with the damage.
+    // No real performance hit because we're typically fast tracking resize
+    // where damage tracking is a no-op.
+    previous_damage_rect_ = gfx::Rect(textures_[front_].size);
+    AttachBackTextureToFBO();
+    helper_->SetScheduled(true);
   } else {
     helper_->manager()->sync_point_manager()->AddSyncPointCallback(
         sync_point,
         base::Bind(&TextureImageTransportSurface::BufferPresentedImpl,
                    this->AsWeakPtr()));
   }
 }
 
 void TextureImageTransportSurface::BufferPresentedImpl() {
+  front_ = back();

[piman, 2012/07/31 23:42:17]

Mmh, is it ok to move this here wrt e.g. dropping front surface? If
AdjustFrontBufferAllocation gets called between the swap and the swap ack, then
it'll change the allocation of the old-front-now-back buffer instead of the
old-back-now-front buffer.

[jonathan.backer, 2012/08/01 17:22:43]

Done.

+  DCHECK(textures_[front()].client_id);
+
   // We're relying on the fact that the parent context is
   // finished with it's context when it inserts the sync point that
   // triggers this callback.
   if (helper_->MakeCurrent()) {
     if (textures_[front()].size != textures_[back()].size ||
         !textures_[back()].info->service_id() ||
         !textures_[back()].sent_to_client) {
       // We may get an ACK from a stale swap just to reschedule.  In that case,
       // we may not have a backbuffer suggestion and should not recreate one.
       if (backbuffer_suggested_allocation_)
@@ skipping 119 matching lines @@
     Texture& texture = textures_[i];
     texture.info = NULL;
     if (!texture.sent_to_client)
       continue;
     GpuHostMsg_AcceleratedSurfaceRelease_Params params;
     params.identifier = texture.client_id;
     helper_->SendAcceleratedSurfaceRelease(params);
   }
   parent_stub_ = NULL;
 }