Remove CommandBuffer::GetTransferBuffer.

content/renderer/pepper/ppb_graphics_3d_impl.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/ppb_graphics_3d_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 95 matching lines @@
 
 PP_Bool PPB_Graphics3D_Impl::SetGetBuffer(int32_t transfer_buffer_id) {
   GetCommandBuffer()->SetGetBuffer(transfer_buffer_id);
   return PP_TRUE;
 }
 
 gpu::CommandBuffer::State PPB_Graphics3D_Impl::GetState() {
   return GetCommandBuffer()->GetState();
 }
 
-int32_t PPB_Graphics3D_Impl::CreateTransferBuffer(uint32_t size) {
+int32_t PPB_Graphics3D_Impl::CreateTransferBuffer(uint32_t size,
+                                                  int* shm_handle,
+                                                  uint32_t* shm_size) {
   int32_t id = -1;
-  GetCommandBuffer()->CreateTransferBuffer(size, &id);
+  scoped_refptr<gpu::Buffer> buffer =
+      GetCommandBuffer()->CreateTransferBuffer(size, &id);
+  if (id < 0)

[no sievers, 2014/03/28 21:01:03]

Why not 'if (!buffer) return id'?

[piman, 2014/03/28 23:23:40]

Either way, doesn't matter. Either buffer is set and id is >0, or buffer is NULL
and id is -1.
So test one and DCHECK the other.

Actually, this code changed in the latest version.

+    return id;
+  DCHECK(buffer);
+  PP_Bool result = ShmToHandle(
+      buffer->shared_memory(), buffer->size(), shm_handle, shm_size);
+  DCHECK(result);
   return id;
 }
 
 PP_Bool PPB_Graphics3D_Impl::DestroyTransferBuffer(int32_t id) {
   GetCommandBuffer()->DestroyTransferBuffer(id);
   return PP_TRUE;
 }
 
-PP_Bool PPB_Graphics3D_Impl::GetTransferBuffer(int32_t id,
-                                               int* shm_handle,
-                                               uint32_t* shm_size) {
-  scoped_refptr<gpu::Buffer> buffer = GetCommandBuffer()->GetTransferBuffer(id);
-  return ShmToHandle(
-      buffer->shared_memory(), buffer->size(), shm_handle, shm_size);
-}
-
 PP_Bool PPB_Graphics3D_Impl::Flush(int32_t put_offset) {
   GetCommandBuffer()->Flush(put_offset);
   return PP_TRUE;
 }
 
 gpu::CommandBuffer::State PPB_Graphics3D_Impl::WaitForTokenInRange(
     int32_t start,
     int32_t end) {
   GetCommandBuffer()->WaitForTokenInRange(start, end);
   return GetCommandBuffer()->GetLastState();
@@ skipping 190 matching lines @@
               PPP_GRAPHICS_3D_INTERFACE));
   // We have to check *again* that the instance exists, because it could have
   // been deleted during GetPluginInterface(). Even the PluginModule could be
   // deleted, but in that case, the instance should also be gone, so the
   // GetInstance check covers both cases.
   if (ppp_graphics_3d && HostGlobals::Get()->GetInstance(this_pp_instance))
     ppp_graphics_3d->Graphics3DContextLost(this_pp_instance);
 }
 
 }  // namespace content