content/common/gpu/client/gpu_channel_host.cc - Issue 1429213002: 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/client/gpu_channel_host.cc

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

Patch Set: Fixed content_unittests 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

« content/common/gpu/client/command_buffer_proxy_impl.cc ('K') | « content/common/gpu/client/gpu_channel_host.h ('k') | content/common/gpu/client/gpu_memory_buffer_impl.h » ('j') | content/common/gpu/gpu_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/client/gpu_channel_host.cc

diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc

index 30700df21b0dd0f70b59ea7b2a3d255eb708e4c4..8ff3ab854d74ed352df8d0fca2916151ba29f568 100644

--- a/content/common/gpu/client/gpu_channel_host.cc

+++ b/content/common/gpu/client/gpu_channel_host.cc

@@ -398,7 +398,8 @@ int32 GpuChannelHost::GenerateStreamID() {

return next_stream_id_.GetNext();

}

-uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id) {

+uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id,

+ bool force_validate) {

// Store what flush ids we will be validating for all streams.

base::hash_map<int32, uint32_t> validate_flushes;

uint32_t flushed_stream_flush_id = 0;

@@ -421,7 +422,7 @@ uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id) {

}

- if (flushed_stream_flush_id == verified_stream_flush_id) {

+ if (!force_validate && flushed_stream_flush_id == verified_stream_flush_id) {

// Current stream has no unverified flushes.

return verified_stream_flush_id;

}