media/video/gpu_memory_buffer_video_frame_pool_unittest.cc - Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

Issue 1427543002: Modified old wait sync point functions to also accept new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Folded sync_point into sync_tokens Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« gpu/command_buffer/client/gles2_implementation.cc ('K') | « media/video/gpu_memory_buffer_video_frame_pool.cc ('k') | mojo/converters/surfaces/surfaces_type_converters.cc » ('j') | mojo/converters/surfaces/surfaces_type_converters.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

diff --git a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

index 943c964d312a9f69c647060b858fb8f14baebfd4..f7a68a1236392f22e51ad12c0b0953d304877ed5 100644

--- a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

+++ b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc

@@ -130,7 +130,7 @@ TEST_F(GpuMemoryBufferVideoFramePoolTest, ReuseFirstResource) {

EXPECT_NE(software_frame.get(), frame.get());

gpu::Mailbox mailbox = frame->mailbox_holder(0).mailbox;

- unsigned sync_point = frame->mailbox_holder(0).sync_point;

+ const gpu::SyncTokne sync_token = frame->mailbox_holder(0).sync_token;

piman 2015/10/29 00:08:20 typo: SyncToken

David Yen 2015/10/29 17:08:08 Done.

EXPECT_EQ(3u, gles2_->gen_textures);

scoped_refptr<VideoFrame> frame2;

@@ -153,7 +153,7 @@ TEST_F(GpuMemoryBufferVideoFramePoolTest, ReuseFirstResource) {

EXPECT_NE(software_frame.get(), frame.get());

EXPECT_EQ(6u, gles2_->gen_textures);

EXPECT_EQ(frame->mailbox_holder(0).mailbox, mailbox);

- EXPECT_NE(frame->mailbox_holder(0).sync_point, sync_point);

+ EXPECT_NE(frame->mailbox_holder(0).sync_token, sync_token);

}

TEST_F(GpuMemoryBufferVideoFramePoolTest, DropResourceWhenSizeIsDifferent) {