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

content/renderer/browser_plugin/browser_plugin_compositing_helper.cc

Index: content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
index 2b07d35cb857082a50bf987340b1960fe40df5ef..29afe9524230e1491e0b5d5d5052118d56ccc90f 100644
--- a/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
+++ b/content/renderer/browser_plugin/browser_plugin_compositing_helper.cc
@@ -120,10 +120,9 @@ void BrowserPluginCompositingHelper::CheckSizeAndAdjustLayerProperties(
     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;
@@ -206,7 +205,7 @@ void BrowserPluginCompositingHelper::OnContainerDestroy() {
 
 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
@@ -269,10 +268,12 @@ void BrowserPluginCompositingHelper::OnBuffersSwappedPrivate(
         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);