content/browser/compositor/owned_mailbox.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/compositor/owned_mailbox.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

« cc/test/test_web_graphics_context_3d.h ('K') | « content/browser/compositor/owned_mailbox.h ('k') | content/browser/compositor/reflector_impl.cc » ('j') | content/renderer/media/video_capture_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/compositor/owned_mailbox.cc

diff --git a/content/browser/compositor/owned_mailbox.cc b/content/browser/compositor/owned_mailbox.cc

index 9c7b37861f4d59db80730bdd9432bec3f12fbed7..0de86e0e02c6c438ad01e4dfa1cf11be2b4a99ce 100644

--- a/content/browser/compositor/owned_mailbox.cc

+++ b/content/browser/compositor/owned_mailbox.cc

@@ -22,14 +22,18 @@ OwnedMailbox::~OwnedMailbox() {

Destroy();

}

-void OwnedMailbox::UpdateSyncPoint(uint32 sync_point) {

- if (sync_point)

+void OwnedMailbox::UpdateSyncPoint(uint32 sync_point,

+ const gpu::SyncToken& sync_token) {

+ if (sync_point || sync_token.HasData()) {

mailbox_holder_.sync_point = sync_point;

+ mailbox_holder_.sync_token = sync_token;

+ }

}

void OwnedMailbox::Destroy() {

ImageTransportFactory::GetInstance()->RemoveObserver(this);

- gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point);

+ gl_helper_->WaitSyncPoint(mailbox_holder_.sync_point,

+ mailbox_holder_.sync_token);

gl_helper_->DeleteTexture(texture_id_);

texture_id_ = 0;

mailbox_holder_ = gpu::MailboxHolder();