Index: ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc |
diff --git a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc |
index 085578a72559a15cbe37796438a82bb9eb456f3e..0963631f7d5f151e01ce1f43c58a2d467cf9b2e2 100644 |
--- a/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc |
+++ b/ppapi/thunk/ppb_gles_chromium_texture_mapping_thunk.cc |
@@ -4,7 +4,6 @@ |
#include "ppapi/thunk/thunk.h" |
#include "ppapi/thunk/enter.h" |
-#include "ppapi/thunk/ppb_context_3d_api.h" |
#include "ppapi/thunk/ppb_graphics_3d_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
@@ -13,7 +12,6 @@ namespace thunk { |
namespace { |
-typedef EnterResource<PPB_Context3D_API> EnterContext3D; |
typedef EnterResource<PPB_Graphics3D_API> EnterGraphics3D; |
void* MapTexSubImage2DCHROMIUM(PP_Resource context, |
@@ -26,38 +24,18 @@ void* MapTexSubImage2DCHROMIUM(PP_Resource context, |
GLenum format, |
GLenum type, |
GLenum access) { |
- { |
- EnterContext3D enter(context, false); |
- if (enter.succeeded()) { |
- return enter.object()->MapTexSubImage2DCHROMIUM( |
- target, level, xoffset, yoffset, width, height, format, type, access); |
- } |
- } |
- { |
- EnterGraphics3D enter(context, true); |
- if (enter.succeeded()) { |
- return enter.object()->MapTexSubImage2DCHROMIUM( |
- target, level, xoffset, yoffset, width, height, format, type, access); |
- } |
+ EnterGraphics3D enter(context, true); |
+ if (enter.succeeded()) { |
+ return enter.object()->MapTexSubImage2DCHROMIUM( |
+ target, level, xoffset, yoffset, width, height, format, type, access); |
} |
return NULL; |
} |
void UnmapTexSubImage2DCHROMIUM(PP_Resource context, const void* mem) { |
- { |
- EnterContext3D enter(context, false); |
- if (enter.succeeded()) { |
- enter.object()->UnmapTexSubImage2DCHROMIUM(mem); |
- return; |
- } |
- } |
- { |
- EnterGraphics3D enter(context, true); |
- if (enter.succeeded()) { |
- enter.object()->UnmapTexSubImage2DCHROMIUM(mem); |
- return; |
- } |
- } |
+ EnterGraphics3D enter(context, true); |
+ if (enter.succeeded()) |
+ enter.object()->UnmapTexSubImage2DCHROMIUM(mem); |
} |
const PPB_GLESChromiumTextureMapping_Dev |