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

content/renderer/browser_plugin/browser_plugin_compositing_helper.cc

 // Copyright (c) 2013 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/browser_plugin/browser_plugin_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 102 matching lines @@
     gfx::Size device_scale_adjusted_size = gfx::ToFlooredSize(
         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 BrowserPluginCompositingHelper::MailboxReleased(
-    SwapBuffersInfo mailbox,
-    unsigned sync_point,
-    bool lost_resource) {
+void BrowserPluginCompositingHelper::MailboxReleased(SwapBuffersInfo mailbox,
+                                                     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.
   if (last_host_id_ != mailbox.host_id ||
@@ skipping 62 matching lines @@
   resource_collection_ = NULL;
   frame_provider_ = NULL;
   texture_layer_ = NULL;
   delegated_layer_ = NULL;
   background_layer_ = NULL;
   web_layer_.reset();
 }
 
 void BrowserPluginCompositingHelper::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 @@
       return;
   }
 
   cc::TextureMailbox texture_mailbox;
   scoped_ptr<cc::SingleReleaseCallback> release_callback;
   if (current_mailbox_valid) {
     release_callback = cc::SingleReleaseCallback::Create(
         base::Bind(&BrowserPluginCompositingHelper::MailboxReleased,
                    scoped_refptr<BrowserPluginCompositingHelper>(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 BrowserPluginCompositingHelper::OnBuffersSwapped(
     const gfx::Size& size,
@@ skipping 158 matching lines @@
 void BrowserPluginCompositingHelper::SetContentsOpaque(bool opaque) {
   opaque_ = opaque;
 
   if (texture_layer_.get())
     texture_layer_->SetContentsOpaque(opaque_);
   if (delegated_layer_.get())
     delegated_layer_->SetContentsOpaque(opaque_);
 }
 
 }  // namespace content