content/renderer/pepper/pepper_plugin_instance_impl.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/renderer/pepper/pepper_plugin_instance_impl.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/renderer/pepper/pepper_graphics_2d_host.cc ('k') | gpu/GLES2/gl2extchromium.h » ('j') | gpu/command_buffer/client/gles2_implementation.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_plugin_instance_impl.cc

diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc

index deff335082d6425f03e2b645b85d9c34cc5ce0fd..7e0acac225083bcb56642110913985b084056f96 100644

--- a/content/renderer/pepper/pepper_plugin_instance_impl.cc

+++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc

@@ -773,7 +773,7 @@ void PepperPluginInstanceImpl::CommitBackingTexture() {

DCHECK(!mailbox.IsZero());

DCHECK_NE(sync_point, 0u);

texture_layer_->SetTextureMailboxWithoutReleaseCallback(

- cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point));

+ cc::TextureMailbox(mailbox, gpu::SyncToken(sync_point), GL_TEXTURE_2D));

texture_layer_->SetNeedsDisplay();

}

@@ -2004,7 +2004,8 @@ void PepperPluginInstanceImpl::UpdateLayer(bool device_changed) {

cc_blink::WebLayerImpl::LayerSettings(), NULL);

opaque = bound_graphics_3d_->IsOpaque();

texture_layer_->SetTextureMailboxWithoutReleaseCallback(

- cc::TextureMailbox(mailbox, GL_TEXTURE_2D, sync_point));

+ cc::TextureMailbox(mailbox, gpu::SyncToken(sync_point),

+ GL_TEXTURE_2D));

} else {

DCHECK(bound_graphics_2d_platform_);

texture_layer_ = cc::TextureLayer::CreateForMailbox(