PPAPI: Make GLES2 calls resilient to bad/dead resources.

ppapi/shared_impl/ppb_graphics_3d_shared.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 "ppapi/shared_impl/ppb_graphics_3d_shared.h"
 
 #include "base/logging.h"
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
@@ skipping 32 matching lines @@
 
 int32_t PPB_Graphics3D_Shared::GetError() {
   // TODO(alokp): Implement me.
   return PP_ERROR_FAILED;
 }
 
 int32_t PPB_Graphics3D_Shared::ResizeBuffers(int32_t width, int32_t height) {
   if ((width < 0) || (height < 0))
     return PP_ERROR_BADARGUMENT;
 
-  ScopedNoLocking already_locked(this);
   gles2_impl()->ResizeCHROMIUM(width, height, 1.f);
   // TODO(alokp): Check if resize succeeded and return appropriate error code.
   return PP_OK;
 }
 
 int32_t PPB_Graphics3D_Shared::SwapBuffers(
     scoped_refptr<TrackedCallback> callback) {
-  ScopedNoLocking already_locked(this);
   if (HasPendingSwap()) {
     Log(PP_LOGLEVEL_ERROR, "PPB_Graphics3D.SwapBuffers: Plugin attempted swap "
                            "with previous swap still pending.");
     // Already a pending SwapBuffers that hasn't returned yet.
     return PP_ERROR_INPROGRESS;
   }
 
   swap_callback_ = callback;
   return DoSwapBuffers();
 }
 
 int32_t PPB_Graphics3D_Shared::GetAttribMaxValue(int32_t attribute,
                                                  int32_t* value) {
   // TODO(alokp): Implement me.
   return PP_ERROR_FAILED;
 }
 
 void* PPB_Graphics3D_Shared::MapTexSubImage2DCHROMIUM(GLenum target,
                                                       GLint level,
                                                       GLint xoffset,
                                                       GLint yoffset,
                                                       GLsizei width,
                                                       GLsizei height,
                                                       GLenum format,
                                                       GLenum type,
                                                       GLenum access) {
-  ScopedNoLocking already_locked(this);
   return gles2_impl_->MapTexSubImage2DCHROMIUM(
       target, level, xoffset, yoffset, width, height, format, type, access);
 }
 
 void PPB_Graphics3D_Shared::UnmapTexSubImage2DCHROMIUM(const void* mem) {
-  ScopedNoLocking already_locked(this);
   gles2_impl_->UnmapTexSubImage2DCHROMIUM(mem);
 }
 
 void PPB_Graphics3D_Shared::SwapBuffersACK(int32_t pp_error) {
   DCHECK(HasPendingSwap());
   swap_callback_->Run(pp_error);
 }
 
 bool PPB_Graphics3D_Shared::HasPendingSwap() const {
   return TrackedCallback::IsPending(swap_callback_);
 }
 
 bool PPB_Graphics3D_Shared::CreateGLES2Impl(
     int32 command_buffer_size,
     int32 transfer_buffer_size,
     gpu::gles2::GLES2Implementation* share_gles2) {
-  ScopedNoLocking already_locked(this);
   gpu::CommandBuffer* command_buffer = GetCommandBuffer();
   DCHECK(command_buffer);
 
   // Create the GLES2 helper, which writes the command buffer protocol.
   gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
   if (!gles2_helper_->Initialize(command_buffer_size))
     return false;
 
   // Create a transfer buffer used to copy resources between the renderer
   // process and the GPU process.
@@ skipping 17 matching lines @@
       gpu::gles2::GLES2Implementation::kNoLimit)) {
     return false;
   }
 
   gles2_impl_->PushGroupMarkerEXT(0, "PPAPIContext");
 
   return true;
 }
 
 void PPB_Graphics3D_Shared::DestroyGLES2Impl() {
-  ScopedNoLocking already_locked(this);
   gles2_impl_.reset();
   transfer_buffer_.reset();
   gles2_helper_.reset();
 }
 
-void PPB_Graphics3D_Shared::PushAlreadyLocked() {
-  // Do nothing. This should be overridden in the plugin side.
-}
-
-void PPB_Graphics3D_Shared::PopAlreadyLocked() {
-  // Do nothing. This should be overridden in the plugin side.
-}
-
 }  // namespace ppapi