content/common/gpu/gpu_channel_manager.h - Issue 1414793018: Revert of Converted video frame and image callbacks to use 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: content/common/gpu/gpu_channel_manager.h

Issue 1414793018: Revert of Converted video frame and image callbacks to use new sync tokens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 1 month 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

« no previous file with comments | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory_unittest.cc ('k') | content/common/gpu/gpu_channel_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_channel_manager.h

diff --git a/content/common/gpu/gpu_channel_manager.h b/content/common/gpu/gpu_channel_manager.h

index c3e889a27e2cc78ba23699342e6c3967c8653367..19cec9df08fae35bda606503c02163fe9b6f1b9b 100644

--- a/content/common/gpu/gpu_channel_manager.h

+++ b/content/common/gpu/gpu_channel_manager.h

@@ -34,9 +34,7 @@

namespace gpu {

class PreemptionFlag;

-class SyncPointClientWaiter;

class SyncPointManager;

-struct SyncToken;

union ValueState;

namespace gles2 {

class FramebufferCompletenessCache;

@@ -158,7 +156,7 @@

void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id, int client_id);

void OnDestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,

int client_id,

- const gpu::SyncToken& sync_token);

+ int32 sync_point);

void OnUpdateValueState(int client_id,

unsigned int target,

@@ -184,7 +182,6 @@

GpuMemoryManager gpu_memory_manager_;

// SyncPointManager guaranteed to outlive running MessageLoop.

gpu::SyncPointManager* sync_point_manager_;

- scoped_ptr<gpu::SyncPointClientWaiter> sync_point_client_waiter_;

scoped_ptr<gpu::gles2::ProgramCache> program_cache_;

scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;

scoped_refptr<gpu::gles2::FramebufferCompletenessCache>