summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordyen <dyen@chromium.org>2016-01-20 12:07:30 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-20 20:08:21 +0000
commit295a6b7ab5cf1094216bfc95664fb6403d76a854 (patch)
treed44667ad663d9eed047ba5df7e33f6e0a876ce9e
parentc37010e9db26aa6b23b6a011b401e9658c6ad2c5 (diff)
downloadchromium_src-295a6b7ab5cf1094216bfc95664fb6403d76a854.zip
chromium_src-295a6b7ab5cf1094216bfc95664fb6403d76a854.tar.gz
chromium_src-295a6b7ab5cf1094216bfc95664fb6403d76a854.tar.bz2
Converted old sync point in webmediaplayer to new sync tokens.
BUG=514815 Review URL: https://codereview.chromium.org/1609963002 Cr-Commit-Position: refs/heads/master@{#370462}
-rw-r--r--media/blink/webmediaplayer_cast_android.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/media/blink/webmediaplayer_cast_android.cc b/media/blink/webmediaplayer_cast_android.cc
index 608ed2c..1b74b7a 100644
--- a/media/blink/webmediaplayer_cast_android.cc
+++ b/media/blink/webmediaplayer_cast_android.cc
@@ -137,8 +137,12 @@ scoped_refptr<VideoFrame> MakeTextFrameForCast(
gpu::Mailbox texture_mailbox;
gl->GenMailboxCHROMIUM(texture_mailbox.name);
gl->ProduceTextureCHROMIUM(texture_target, texture_mailbox.name);
+ const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
gl->Flush();
- gpu::SyncToken texture_mailbox_sync_token(gl->InsertSyncPointCHROMIUM());
+
+ gpu::SyncToken texture_mailbox_sync_token;
+ gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync,
+ texture_mailbox_sync_token.GetData());
return VideoFrame::WrapNativeTexture(
media::PIXEL_FORMAT_ARGB,