Add gpu::MailboxHolder to hold state for a gpu::Mailbox

content/browser/renderer_host/render_widget_host_view_aura.cc

Index: content/browser/renderer_host/render_widget_host_view_aura.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
index 494c2cfa53b54bb918a0623f15838bb895581c0f..1e5bdbbc78541a5e124fd6396d4b65547b5332d0 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -97,7 +97,8 @@ namespace content {
 namespace {
 
 void MailboxReleaseCallback(scoped_ptr<base::SharedMemory> shared_memory,
-                            unsigned sync_point, bool lost_resource) {
+                            uint32 sync_point,
+                            bool lost_resource) {
   // NOTE: shared_memory will get released when we go out of scope.
 }
 
@@ -1107,8 +1108,10 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame(
       ConvertRectToPixel(current_device_scale_factor_, src_subrect);
   request->set_area(src_subrect_in_pixel);
   if (subscriber_texture) {
-    request->SetTextureMailbox(cc::TextureMailbox(
-        subscriber_texture->mailbox(), subscriber_texture->sync_point()));
+    request->SetTextureMailbox(
+        cc::TextureMailbox(subscriber_texture->mailbox(),
+                           subscriber_texture->target(),
+                           subscriber_texture->sync_point()));
   }
   window_->layer()->RequestCopyOfOutput(request.Pass());
 }
@@ -1850,7 +1853,7 @@ void RenderWidgetHostViewAura::PrepareTextureCopyOutputResult(
   ignore_result(scoped_callback_runner.Release());
 
   gl_helper->CropScaleReadbackAndCleanMailbox(
-      texture_mailbox.name(),
+      texture_mailbox.mailbox(),
       texture_mailbox.sync_point(),
       result->size(),
       gfx::Rect(result->size()),
@@ -1907,7 +1910,7 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceFinishedForVideo(
     // If there's no release callback, then the texture is from
     // idle_frame_subscriber_textures_ and we can put it back there.
     DCHECK(subscriber_texture);
-    subscriber_texture->UpdateSyncPoint(sync_point);
+    subscriber_texture->set_sync_point(sync_point);
     if (rwhva && rwhva->frame_subscriber_ && subscriber_texture->texture_id())
       rwhva->idle_frame_subscriber_textures_.push_back(subscriber_texture);
     subscriber_texture = NULL;
@@ -2032,11 +2035,10 @@ void RenderWidgetHostViewAura::CopyFromCompositingSurfaceHasResultForVideo(
       callback,
       subscriber_texture,
       base::Passed(&release_callback));
-  yuv_readback_pipeline->ReadbackYUV(
-      texture_mailbox.name(),
-      texture_mailbox.sync_point(),
-      video_frame.get(),
-      finished_callback);
+  yuv_readback_pipeline->ReadbackYUV(texture_mailbox.mailbox(),
+                                     texture_mailbox.sync_point(),
+                                     video_frame.get(),
+                                     finished_callback);
 }
 
 void RenderWidgetHostViewAura::GetScreenInfo(WebScreenInfo* results) {