Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

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: format 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/renderer/pepper/pepper_graphics_2d_host.cc ('k') | gpu/GLES2/gl2extchromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 9bef853cd59e72215e3cc1aa6cc0d251a916ebab..a4e73c5054d07d312a1756f0f54961aa3936cf03 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();
}
@@ -2005,7 +2005,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(
« no previous file with comments | « content/renderer/pepper/pepper_graphics_2d_host.cc ('k') | gpu/GLES2/gl2extchromium.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698