ui/aura/bench/bench_main.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: ui/aura/bench/bench_main.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: Fix mock gpu video accelerator factory 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

« third_party/WebKit/public/platform/WebExternalTextureMailbox.h ('K') | « third_party/mojo/src/mojo/public/c/gpu/GLES2/gl2extmojo.h ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/aura/bench/bench_main.cc

diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc

index ce855720fa62086d7e3e57df962c29cf12508e44..0070fd3f70d4bda4d2c6daad6b3fc81269a29444 100644

--- a/ui/aura/bench/bench_main.cc

+++ b/ui/aura/bench/bench_main.cc

@@ -143,9 +143,10 @@ class BenchCompositorObserver : public ui::CompositorObserver {

void ReturnMailbox(scoped_refptr<cc::ContextProvider> context_provider,

GLuint texture,

GLuint sync_point,

+ const gpu::SyncToken& sync_token,

bool is_lost) {

gpu::gles2::GLES2Interface* gl = context_provider->ContextGL();

- gl->WaitSyncPointCHROMIUM(sync_point);

+ gl->WaitSyncPointCHROMIUM(sync_point, sync_token.GetConstData());

gl->DeleteTextures(1, &texture);

gl->ShallowFlushCHROMIUM();

}