content/browser/renderer_host/media/video_capture_host.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: content/browser/renderer_host/media/video_capture_host.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

« cc/output/gl_renderer_unittest.cc ('K') | « content/browser/renderer_host/media/video_capture_host.h ('k') | content/browser/renderer_host/render_widget_host_impl.cc » ('j') | gpu/command_buffer/client/gles2_implementation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/media/video_capture_host.cc

diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc

index 130a2896180b965ac0eb96d5627ff7487f1016da..d8cadcf62dd8b33837a988455f388d2e15b9ef4b 100644

--- a/content/browser/renderer_host/media/video_capture_host.cc

+++ b/content/browser/renderer_host/media/video_capture_host.cc

@@ -271,7 +271,7 @@ void VideoCaptureHost::OnResumeCapture(

void VideoCaptureHost::OnRendererFinishedWithBuffer(

int device_id,

int buffer_id,

- uint32 sync_point,

+ const gpu::SyncToken& sync_token,

double consumer_resource_utilization) {

DCHECK_CURRENTLY_ON(BrowserThread::IO);

@@ -280,10 +280,7 @@ void VideoCaptureHost::OnRendererFinishedWithBuffer(

if (it != entries_.end()) {

const base::WeakPtr<VideoCaptureController>& controller = it->second;

if (controller) {

- controller->ReturnBuffer(controller_id,

- this,

- buffer_id,

- sync_point,

+ controller->ReturnBuffer(controller_id, this, buffer_id, sync_token,

consumer_resource_utilization);

}