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

Unified Diff: components/exo/buffer.cc

Issue 1930193002: cc: Add GpuMemoryBufferHandle to TextureMailbox (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix exo Created 4 years, 8 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
Index: components/exo/buffer.cc
diff --git a/components/exo/buffer.cc b/components/exo/buffer.cc
index b4bd09db58da3ee6208a674b332a1587b1be00ab..9941abae886ada12bf78b189c61c40ca70a34e10 100644
--- a/components/exo/buffer.cc
+++ b/components/exo/buffer.cc
@@ -418,10 +418,10 @@ std::unique_ptr<cc::SingleReleaseCallback> Buffer::ProduceTextureMailbox(
// This binds the latest contents of this buffer to |texture|.
gpu::SyncToken sync_token = texture->BindTexImage();
- *texture_mailbox =
- cc::TextureMailbox(texture->mailbox(), sync_token, texture_target_,
- gpu_memory_buffer_->GetSize(), is_overlay_candidate_,
- secure_output_only);
+ *texture_mailbox = cc::TextureMailbox(
+ texture->mailbox(), sync_token, texture_target_,
+ gpu_memory_buffer_->GetSize(), gfx::GpuMemoryBufferHandle(),
+ is_overlay_candidate_, secure_output_only);
// The contents texture will be released when no longer used by the
// compositor.
return cc::SingleReleaseCallback::Create(
@@ -443,10 +443,10 @@ std::unique_ptr<cc::SingleReleaseCallback> Buffer::ProduceTextureMailbox(
gpu::SyncToken sync_token = contents_texture->CopyTexImage(
texture, base::Bind(&Buffer::ReleaseContentsTexture, AsWeakPtr(),
base::Passed(&contents_texture_)));
- *texture_mailbox =
- cc::TextureMailbox(texture->mailbox(), sync_token, GL_TEXTURE_2D,
- gpu_memory_buffer_->GetSize(),
- false /* is_overlay_candidate */, secure_output_only);
+ *texture_mailbox = cc::TextureMailbox(
+ texture->mailbox(), sync_token, GL_TEXTURE_2D,
+ gpu_memory_buffer_->GetSize(), gfx::GpuMemoryBufferHandle(),
+ false /* is_overlay_candidate */, secure_output_only);
// The mailbox texture will be released when no longer used by the
// compositor.
return cc::SingleReleaseCallback::Create(

Powered by Google App Engine
This is Rietveld 408576698