Send hardware video frames with mailboxes.

cc/trees/layer_tree_host_unittest_context.cc

 // Copyright 2012 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 "cc/trees/layer_tree_host.h"
 
 #include "base/basictypes.h"
 #include "cc/base/thread_impl.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/heads_up_display_layer.h"
@@ skipping 1123 matching lines @@
     content_with_mask_->SetMaskLayer(mask_.get());
     root_->AddChild(content_with_mask_);
 
     scoped_refptr<VideoLayer> video_color_ = VideoLayer::Create(
         &color_frame_provider_);
     video_color_->SetBounds(gfx::Size(10, 10));
     video_color_->SetAnchorPoint(gfx::PointF());
     video_color_->SetIsDrawable(true);
     root_->AddChild(video_color_);
 
-    if (!delegating_renderer()) {
-      // TODO(danakj): Hardware video decode can not be transported.
-      // crbug.com/179729
-      scoped_refptr<VideoLayer> video_hw_ = VideoLayer::Create(
-          &hw_frame_provider_);
-      video_hw_->SetBounds(gfx::Size(10, 10));
-      video_hw_->SetAnchorPoint(gfx::PointF());
-      video_hw_->SetIsDrawable(true);
-      root_->AddChild(video_hw_);
+    scoped_refptr<VideoLayer> video_hw_ = VideoLayer::Create(
+        &hw_frame_provider_);
+    video_hw_->SetBounds(gfx::Size(10, 10));
+    video_hw_->SetAnchorPoint(gfx::PointF());
+    video_hw_->SetIsDrawable(true);
+    root_->AddChild(video_hw_);
 
-      scoped_refptr<VideoLayer> video_scaled_hw_ = VideoLayer::Create(
-          &scaled_hw_frame_provider_);
-      video_scaled_hw_->SetBounds(gfx::Size(10, 10));
-      video_scaled_hw_->SetAnchorPoint(gfx::PointF());
-      video_scaled_hw_->SetIsDrawable(true);
-      root_->AddChild(video_scaled_hw_);
-    }
+    scoped_refptr<VideoLayer> video_scaled_hw_ = VideoLayer::Create(
+        &scaled_hw_frame_provider_);
+    video_scaled_hw_->SetBounds(gfx::Size(10, 10));
+    video_scaled_hw_->SetAnchorPoint(gfx::PointF());
+    video_scaled_hw_->SetIsDrawable(true);
+    root_->AddChild(video_scaled_hw_);
 
     if (!delegating_renderer()) {
       // TODO(danakj): IOSurface layer can not be transported. crbug.com/239335
       scoped_refptr<IOSurfaceLayer> io_surface_ = IOSurfaceLayer::Create();
       io_surface_->SetBounds(gfx::Size(10, 10));
       io_surface_->SetAnchorPoint(gfx::PointF());
       io_surface_->SetIsDrawable(true);
       io_surface_->SetIOSurfaceProperties(1, gfx::Size(10, 10));
       root_->AddChild(io_surface_);
     }
@@ skipping 62 matching lines @@
       texture_impl->set_texture_id(
           resource_provider->GraphicsContext3D()->createTexture());
 
       DCHECK(resource_provider->GraphicsContext3D());
       ResourceProvider::ResourceId texture = resource_provider->CreateResource(
           gfx::Size(4, 4),
           resource_provider->default_resource_type(),
           ResourceProvider::TextureUsageAny);
       ResourceProvider::ScopedWriteLockGL lock(resource_provider, texture);
 
+      gpu::Mailbox mailbox;
+      resource_provider->GraphicsContext3D()->genMailboxCHROMIUM(mailbox.name);
+      unsigned sync_point =
+          resource_provider->GraphicsContext3D()->insertSyncPoint();
+
       color_video_frame_ = VideoFrame::CreateColorFrame(
           gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta());
       hw_video_frame_ = VideoFrame::WrapNativeTexture(
-          lock.texture_id(),
+          mailbox,
+          sync_point,
           GL_TEXTURE_2D,
           gfx::Size(4, 4), gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4),
           base::TimeDelta(),
           VideoFrame::ReadPixelsCB(),
+          VideoFrame::TextureNoLongerNeededCallback(),
           base::Closure());
       scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture(
-          lock.texture_id(),
+          mailbox,
+          sync_point,
           GL_TEXTURE_2D,
           gfx::Size(4, 4), gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4),
           base::TimeDelta(),
           VideoFrame::ReadPixelsCB(),
+          VideoFrame::TextureNoLongerNeededCallback(),
           base::Closure());
 
       color_frame_provider_.set_frame(color_video_frame_);
       hw_frame_provider_.set_frame(hw_video_frame_);
       scaled_hw_frame_provider_.set_frame(scaled_hw_video_frame_);
       return;
     }
 
     if (host_impl->active_tree()->source_frame_number() == 3) {
       // On the third commit we're recovering from context loss. Hardware
@@ skipping 322 matching lines @@
         LayerTreeHost::Create(this, settings, impl_ccthread.Pass());
     EXPECT_FALSE(layer_tree_host);
   }
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostTestCannotCreateIfCannotCreateOutputSurface);
 
 }  // namespace
 }  // namespace cc