| Index: ppapi/shared_impl/ppb_graphics_3d_shared.cc
|
| diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.cc b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
|
| index e24a13c46177bcdc9af5f6d1351696594d930a9f..0fe148997b20e837484f35b03dcff978b1a88f8c 100644
|
| --- a/ppapi/shared_impl/ppb_graphics_3d_shared.cc
|
| +++ b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
|
| @@ -50,7 +50,6 @@ 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;
|
| @@ -58,7 +57,6 @@ int32_t PPB_Graphics3D_Shared::ResizeBuffers(int32_t width, int32_t height) {
|
|
|
| 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.");
|
| @@ -85,13 +83,11 @@ void* PPB_Graphics3D_Shared::MapTexSubImage2DCHROMIUM(GLenum target,
|
| 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);
|
| }
|
|
|
| @@ -108,7 +104,6 @@ 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);
|
|
|
| @@ -146,19 +141,10 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl(
|
| }
|
|
|
| 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
|
|
|
|
|