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

webkit/renderer/compositor_bindings/web_external_texture_layer_impl.cc

 // Copyright 2011 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 "webkit/renderer/compositor_bindings/web_external_texture_layer_impl.h"
 
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/resource_update_queue.h"
 #include "cc/resources/single_release_callback.h"
 #include "cc/resources/texture_mailbox.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureLayerClient.h"
 #include "third_party/WebKit/public/platform/WebExternalTextureMailbox.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
+#include "third_party/khronos/GLES2/gl2.h"
 #include "webkit/renderer/compositor_bindings/web_external_bitmap_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
 
 using cc::TextureLayer;
 using cc::ResourceUpdateQueue;
 
 namespace webkit {
 
 WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
     blink::WebExternalTextureLayerClient* client)
@@ skipping 49 matching lines @@
 
   if (use_shared_memory)
     bitmap = AllocateBitmap();
   if (!client_->prepareMailbox(&client_mailbox, bitmap)) {
     if (bitmap)
       free_bitmaps_.push_back(bitmap);
     return false;
   }
   gpu::Mailbox name;
   name.SetName(client_mailbox.name);
-  if (bitmap)
+  if (bitmap) {
     *mailbox = cc::TextureMailbox(bitmap->shared_memory(), bitmap->size());
-  else
-    *mailbox = cc::TextureMailbox(name, client_mailbox.syncPoint);
+  } else {
+    *mailbox =
+        cc::TextureMailbox(name, GL_TEXTURE_2D, client_mailbox.syncPoint);
+  }
 
   if (mailbox->IsValid()) {
     *release_callback = cc::SingleReleaseCallback::Create(base::Bind(
         &WebExternalTextureLayerImpl::DidReleaseMailbox,
         this->AsWeakPtr(),
         client_mailbox,
         bitmap));
   }
 
   return true;
@@ skipping 22 matching lines @@
 
   blink::WebExternalTextureMailbox available_mailbox;
   memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name));
   available_mailbox.syncPoint = sync_point;
   if (bitmap)
     layer->free_bitmaps_.push_back(bitmap);
   layer->client_->mailboxReleased(available_mailbox);
 }
 
 }  // namespace webkit