| Index: cc/layers/video_layer_impl_unittest.cc
|
| diff --git a/cc/layers/video_layer_impl_unittest.cc b/cc/layers/video_layer_impl_unittest.cc
|
| index 11c5c87cd4447f4e4f89847399a9c1b8401f4c47..6990e3573cd48db95b3c3b3cb20ea76ab8517048 100644
|
| --- a/cc/layers/video_layer_impl_unittest.cc
|
| +++ b/cc/layers/video_layer_impl_unittest.cc
|
| @@ -378,46 +378,6 @@ TEST(VideoLayerImplTest, NativeYUVFrameGeneratesYUVQuad) {
|
| EXPECT_TRUE(yuv_draw_quad->require_overlay);
|
| }
|
|
|
| -TEST(VideoLayerImplTest, NativeARGBFrameGeneratesStreamVideoQuad) {
|
| - gfx::Size layer_size(1000, 1000);
|
| - gfx::Size viewport_size(1000, 1000);
|
| -
|
| - LayerTestCommon::LayerImplTest impl;
|
| - DebugSetImplThreadAndMainThreadBlocked(impl.task_runner_provider());
|
| -
|
| - gpu::MailboxHolder mailbox_holders[media::VideoFrame::kMaxPlanes];
|
| - mailbox_holders[0].texture_target = GL_TEXTURE_EXTERNAL_OES;
|
| - mailbox_holders[0].mailbox.name[0] = 1;
|
| -
|
| - gfx::Size resource_size = gfx::Size(10, 10);
|
| - scoped_refptr<media::VideoFrame> video_frame =
|
| - media::VideoFrame::WrapNativeTextures(
|
| - media::PIXEL_FORMAT_ARGB, mailbox_holders, base::Bind(EmptyCallback),
|
| - resource_size, gfx::Rect(10, 10), resource_size, base::TimeDelta());
|
| - ASSERT_TRUE(video_frame);
|
| - video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::ALLOW_OVERLAY,
|
| - true);
|
| - FakeVideoFrameProvider provider;
|
| - provider.set_frame(video_frame);
|
| -
|
| - VideoLayerImpl* video_layer_impl =
|
| - impl.AddChildToRoot<VideoLayerImpl>(&provider, media::VIDEO_ROTATION_0);
|
| - video_layer_impl->SetBounds(layer_size);
|
| - video_layer_impl->SetDrawsContent(true);
|
| - impl.host_impl()->active_tree()->BuildLayerListAndPropertyTreesForTesting();
|
| -
|
| - gfx::Rect occluded;
|
| - impl.AppendQuadsWithOcclusion(video_layer_impl, occluded);
|
| -
|
| - EXPECT_EQ(1u, impl.quad_list().size());
|
| - const DrawQuad* draw_quad = impl.quad_list().ElementAt(0);
|
| - ASSERT_EQ(DrawQuad::STREAM_VIDEO_CONTENT, draw_quad->material);
|
| -
|
| - const StreamVideoDrawQuad* video_draw_quad =
|
| - StreamVideoDrawQuad::MaterialCast(draw_quad);
|
| - EXPECT_EQ(video_draw_quad->resource_size_in_pixels(), resource_size);
|
| -}
|
| -
|
| TEST(VideoLayerImplTest, NativeARGBFrameGeneratesTextureQuad) {
|
| gfx::Size layer_size(1000, 1000);
|
| gfx::Size viewport_size(1000, 1000);
|
|
|