Merge 254840 "ppapi: Send sync point whenever the pepper texture..."

content/renderer/pepper/pepper_platform_context_3d.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/renderer/pepper/pepper_platform_context_3d.h"
 
 #include "base/bind.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
@@ skipping 89 matching lines @@
     return false;
   if (!command_buffer_->Initialize())
     return false;
   std::vector<gpu::Mailbox> names;
   if (!command_buffer_->GenerateMailboxNames(1, &names))
     return false;
   DCHECK_EQ(names.size(), 1u);
   if (!command_buffer_->ProduceFrontBuffer(names[0]))
     return false;
   mailbox_ = names[0];
+  sync_point_ = command_buffer_->InsertSyncPoint();
 
   command_buffer_->SetChannelErrorCallback(
       base::Bind(&PlatformContext3D::OnContextLost,
                  weak_ptr_factory_.GetWeakPtr()));
   command_buffer_->SetOnConsoleMessageCallback(
       base::Bind(&PlatformContext3D::OnConsoleMessage,
                  weak_ptr_factory_.GetWeakPtr()));
 
   return true;
 }
 
-void PlatformContext3D::GetBackingMailbox(gpu::Mailbox* mailbox) {
+void PlatformContext3D::GetBackingMailbox(gpu::Mailbox* mailbox,
+                                          uint32* sync_point) {
   *mailbox = mailbox_;
+  *sync_point = sync_point_;
+}
+
+void PlatformContext3D::InsertSyncPointForBackingMailbox() {
+  DCHECK(command_buffer_);
+  sync_point_ = command_buffer_->InsertSyncPoint();
 }
 
 bool PlatformContext3D::IsOpaque() {
   DCHECK(command_buffer_);
   return !has_alpha_;
 }
 
 gpu::CommandBuffer* PlatformContext3D::GetCommandBuffer() {
   return command_buffer_;
 }
@@ skipping 28 matching lines @@
 }
 
 void PlatformContext3D::OnConsoleMessage(const std::string& msg, int id) {
   DCHECK(command_buffer_);
 
   if (!console_message_callback_.is_null())
     console_message_callback_.Run(msg, id);
 }
 
 }  // namespace content