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

content/renderer/child_frame_compositing_helper.cc

 // Copyright 2014 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/renderer/child_frame_compositing_helper.h"
 
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
 #include "cc/layers/solid_color_layer.h"
@@ skipping 186 matching lines @@
         gfx::ScaleSize(buffer_size_, 1.0f / device_scale_factor));
     layer->SetBounds(device_scale_adjusted_size);
   }
 
   // Manually manage background layer for transparent webview.
   if (!opaque_)
     background_layer_->SetIsDrawable(false);
 }
 
 void ChildFrameCompositingHelper::MailboxReleased(SwapBuffersInfo mailbox,
-                                                  unsigned sync_point,
+                                                  uint32 sync_point,
                                                   bool lost_resource) {
   if (mailbox.type == SOFTWARE_COMPOSITOR_FRAME) {
     delete mailbox.shared_memory;
     mailbox.shared_memory = NULL;
   } else if (lost_resource) {
     // Reset mailbox's name if the resource was lost.
     mailbox.name.SetZero();
   }
 
   // This means the GPU process crashed or guest crashed.
@@ skipping 63 matching lines @@
 
 void ChildFrameCompositingHelper::ChildFrameGone() {
   background_layer_->SetBackgroundColor(SkColorSetARGBInline(255, 0, 128, 0));
   background_layer_->RemoveAllChildren();
   background_layer_->SetIsDrawable(true);
   background_layer_->SetContentsOpaque(true);
 }
 
 void ChildFrameCompositingHelper::OnBuffersSwappedPrivate(
     const SwapBuffersInfo& mailbox,
-    unsigned sync_point,
+    uint32 sync_point,
     float device_scale_factor) {
   DCHECK(!delegated_layer_.get());
   // If these mismatch, we are either just starting up, GPU process crashed or
   // guest renderer crashed.
   // In this case, we are communicating with a new image transport
   // surface and must ACK with the new ID's and an empty mailbox.
   if (last_route_id_ != mailbox.route_id ||
       last_output_surface_id_ != mailbox.output_surface_id ||
       last_host_id_ != mailbox.host_id)
     last_mailbox_valid_ = false;
@@ skipping 42 matching lines @@
   }
 
   cc::TextureMailbox texture_mailbox;
   scoped_ptr<cc::SingleReleaseCallback> release_callback;
   if (current_mailbox_valid) {
     release_callback =
         cc::SingleReleaseCallback::Create(
             base::Bind(&ChildFrameCompositingHelper::MailboxReleased,
                        scoped_refptr<ChildFrameCompositingHelper>(this),
                        mailbox)).Pass();
-    if (is_software_frame)
+    if (is_software_frame) {
       texture_mailbox = cc::TextureMailbox(mailbox.shared_memory, mailbox.size);
-    else
-      texture_mailbox = cc::TextureMailbox(mailbox.name, sync_point);
+    } else {
+      texture_mailbox =
+          cc::TextureMailbox(mailbox.name, GL_TEXTURE_2D, sync_point);
+    }
   }
 
   texture_layer_->SetFlipped(!is_software_frame);
   texture_layer_->SetTextureMailbox(texture_mailbox, release_callback.Pass());
   texture_layer_->SetNeedsDisplay();
   last_mailbox_valid_ = current_mailbox_valid;
 }
 
 void ChildFrameCompositingHelper::OnBuffersSwapped(
     const gfx::Size& size,
@@ skipping 175 matching lines @@
                                       skia::ImageOperations::RESIZE_BEST,
                                       dest_size.width(),
                                       dest_size.height());
   }
   browser_plugin_manager_->Send(
       new BrowserPluginHostMsg_CopyFromCompositingSurfaceAck(
           host_routing_id_, instance_id_, request_id, resized_bitmap));
 }
 
 }  // namespace content