Add gpu::MailboxHolder to hold state for a gpu::Mailbox

content/common/gpu/client/gl_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gl_helper.h"
 
 #include <queue>
 #include <string>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "content/common/gpu/client/gl_helper_scaling.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/command_buffer/common/mailbox_holder.h"
 #include "media/base/video_frame.h"
 #include "media/base/video_util.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace {
 
@@ skipping 631 matching lines @@
 void GLHelper::DeleteTexture(GLuint texture_id) {
   gl_->DeleteTextures(1, &texture_id);
 }
 
 uint32 GLHelper::InsertSyncPoint() { return gl_->InsertSyncPointCHROMIUM(); }
 
 void GLHelper::WaitSyncPoint(uint32 sync_point) {
   gl_->WaitSyncPointCHROMIUM(sync_point);
 }
 
-gpu::Mailbox GLHelper::ProduceMailboxFromTexture(GLuint texture_id,
-                                                 uint32* sync_point) {
+gpu::MailboxHolder GLHelper::ProduceMailboxHolderFromTexture(
+    GLuint texture_id) {
   gpu::Mailbox mailbox;
   gl_->GenMailboxCHROMIUM(mailbox.name);
-  if (mailbox.IsZero()) {
-    *sync_point = 0;
-    return mailbox;
-  }
+  if (mailbox.IsZero())
+    return gpu::MailboxHolder();
   content::ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(gl_, texture_id);
   gl_->ProduceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
-  *sync_point = InsertSyncPoint();
-  return mailbox;
+  return gpu::MailboxHolder(mailbox, GL_TEXTURE_2D, InsertSyncPoint());
 }
 
 GLuint GLHelper::ConsumeMailboxToTexture(const gpu::Mailbox& mailbox,
                                          uint32 sync_point) {
   if (mailbox.IsZero())
     return 0;
   if (sync_point)
     WaitSyncPoint(sync_point);
   GLuint texture = CreateTexture();
   content::ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(gl_, texture);
@@ skipping 349 matching lines @@
   return copy_texture_to_impl_->CreateReadbackPipelineYUV(quality,
                                                           src_size,
                                                           src_subrect,
                                                           dst_size,
                                                           dst_subrect,
                                                           flip_vertically,
                                                           use_mrt);
 }
 
 }  // namespace content