Chromium Code Reviews| Index: cc/trees/layer_tree_host_unittest_context.cc |
| diff --git a/cc/trees/layer_tree_host_unittest_context.cc b/cc/trees/layer_tree_host_unittest_context.cc |
| index 24ffcd46e4e3a933a2089b59773c81211692600f..6978b42bac189c44856a81f306dcff3bdf1e653a 100644 |
| --- a/cc/trees/layer_tree_host_unittest_context.cc |
| +++ b/cc/trees/layer_tree_host_unittest_context.cc |
| @@ -1061,24 +1061,16 @@ class LayerTreeHostContextTestDontUseLostResources |
| color_video_frame_ = VideoFrame::CreateColorFrame( |
| gfx::Size(4, 4), 0x80, 0x80, 0x80, base::TimeDelta()); |
| - hw_video_frame_ = |
| - VideoFrame::WrapNativeTexture(make_scoped_ptr(new gpu::MailboxHolder( |
| - mailbox, GL_TEXTURE_2D, sync_point)), |
| - media::VideoFrame::ReleaseMailboxCB(), |
| - gfx::Size(4, 4), |
| - gfx::Rect(0, 0, 4, 4), |
| - gfx::Size(4, 4), |
| - base::TimeDelta(), |
| - VideoFrame::ReadPixelsCB()); |
| - scaled_hw_video_frame_ = |
| - VideoFrame::WrapNativeTexture(make_scoped_ptr(new gpu::MailboxHolder( |
| - mailbox, GL_TEXTURE_2D, sync_point)), |
| - media::VideoFrame::ReleaseMailboxCB(), |
| - gfx::Size(4, 4), |
| - gfx::Rect(0, 0, 3, 2), |
| - gfx::Size(4, 4), |
| - base::TimeDelta(), |
| - VideoFrame::ReadPixelsCB()); |
| + hw_video_frame_ = VideoFrame::WrapNativeTexture( |
| + make_scoped_ptr( |
| + new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)), |
| + media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4), |
| + gfx::Rect(0, 0, 4, 4), gfx::Size(4, 4), base::TimeDelta()); |
| + scaled_hw_video_frame_ = VideoFrame::WrapNativeTexture( |
| + make_scoped_ptr( |
| + new gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, sync_point)), |
| + media::VideoFrame::ReleaseMailboxCB(), gfx::Size(4, 4), |
| + gfx::Rect(0, 0, 3, 2), gfx::Size(4, 4), base::TimeDelta()); |
|
dshwang
2015/01/21 13:40:32
just remove VideoFrame::ReadPixelsCB() but gitclfo
|
| color_frame_provider_.set_frame(color_video_frame_); |
| hw_frame_provider_.set_frame(hw_video_frame_); |