Allow WebExternalTextureLayerClient to work with mailboxes.

webkit/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/compositor_bindings/web_external_texture_layer_impl.h"
 
 #include "cc/layers/texture_layer.h"
 #include "cc/resources/resource_update_queue.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureLayerClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebExternalTextureMailbox.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFloatRect.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 
 using cc::TextureLayer;
 using cc::ResourceUpdateQueue;
 
 namespace webkit {
 
 WebExternalTextureLayerImpl::WebExternalTextureLayerImpl(
-    WebKit::WebExternalTextureLayerClient* client)
-    : client_(client) {
+    WebKit::WebExternalTextureLayerClient* client,
+    bool mailbox)
+    : client_(client),
+      uses_mailbox_(mailbox) {
   scoped_refptr<TextureLayer> layer;
-  if (client_)
-    layer = TextureLayer::Create(this);
+  cc::TextureLayerClient* cc_client = client_ ? this : NULL;
+  if (mailbox)
+    layer = TextureLayer::CreateForMailbox(cc_client);
   else
-    layer = TextureLayer::Create(NULL);
+    layer = TextureLayer::Create(cc_client);
   layer->SetIsDrawable(true);
   layer_.reset(new WebLayerImpl(layer));
 }
 
 WebExternalTextureLayerImpl::~WebExternalTextureLayerImpl() {
   static_cast<TextureLayer*>(layer_->layer())->ClearClient();
 }
 
 WebKit::WebLayer* WebExternalTextureLayerImpl::layer() { return layer_.get(); }
 
+void WebExternalTextureLayerImpl::clearTexture() {
+  if (uses_mailbox_) {
+    static_cast<TextureLayer*>(layer_->layer())->SetTextureMailbox(
+        cc::TextureMailbox());
+  } else {
+    static_cast<TextureLayer*>(layer_->layer())->SetTextureId(0);
+  }
+}
+
 void WebExternalTextureLayerImpl::setTextureId(unsigned id) {
   static_cast<TextureLayer*>(layer_->layer())->SetTextureId(id);
 }
 
 void WebExternalTextureLayerImpl::setFlipped(bool flipped) {
   static_cast<TextureLayer*>(layer_->layer())->SetFlipped(flipped);
 }
 
 void WebExternalTextureLayerImpl::setUVRect(const WebKit::WebFloatRect& rect) {
   static_cast<TextureLayer*>(layer_->layer())->SetUV(
@@ skipping 40 matching lines @@
   DCHECK(client_);
   WebTextureUpdaterImpl updater_impl(queue);
   return client_->prepareTexture(updater_impl);
 }
 
 WebKit::WebGraphicsContext3D* WebExternalTextureLayerImpl::Context3d() {
   DCHECK(client_);
   return client_->context();
 }
 
-}  // namespace webkit
+bool WebExternalTextureLayerImpl::PrepareTextureMailbox(
+    cc::TextureMailbox* out_mailbox) {
+  WebKit::WebExternalTextureMailbox mailbox;
+  if (!client_->prepareMailbox(&mailbox)) {
+    return false;
+  }
+  gpu::Mailbox name;
+  name.SetName(mailbox.name);
+  cc::TextureMailbox::ReleaseCallback callback =
+      base::Bind(&WebExternalTextureLayerImpl::mailboxReleased,
+                 this->AsWeakPtr(),
+                 mailbox);
+  *out_mailbox = cc::TextureMailbox(name, callback, mailbox.syncPoint);
+  return true;
+}
+
+void WebExternalTextureLayerImpl::mailboxReleased(
+    const WebKit::WebExternalTextureMailbox &mailbox,

[jamesr, 2013/04/11 17:36:58]

& goes with the type, not the variable name

[alexst (slow to review), 2013/04/11 18:03:12]

Done.

+    unsigned sync_point,
+    bool lost_resource) {
+  if (lost_resource)

[jamesr, 2013/04/11 17:36:58]

why is the callback invoked with lost_resource=true if we're just ignoring it in
that case? do other callers need to do something here?

[alexst (slow to review), 2013/04/11 18:03:12]

In this case, lost resources are already handled inside Blink. But for something
like browser plugin, we may still need to send an ACK even if the resource is
lost to not hang the guest renderer.

+    return;
+
+  WebKit::WebExternalTextureMailbox available_mailbox;
+  memcpy(available_mailbox.name, mailbox.name, sizeof(available_mailbox.name));
+  available_mailbox.syncPoint = sync_point;
+  client_->mailboxReleased(available_mailbox);
+}
+
+} // namespace webkit