From 56d7ad42237c35d2b7653c7cad89e9ca6ea75d68 Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 7 Dec 2011 00:01:30 +0000 Subject: Revert 113290 - Rename the shared_impl resource files to give them more regular names. I keep getting confused between things like AudioImpl and PPB_Audio_Impl. This uses _shared for the names, so now we have _impl, _proxy, and _shared which makes more sense. I also removed the ppb_opengles2_impl file since it was just a forward to the shared version. BUG= TEST= Review URL: http://codereview.chromium.org/8790004 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8824015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113302 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/command_buffer/build_gles2_cmd_buffer.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gpu') diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index bdbd683..c3ce764 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -5805,10 +5805,10 @@ const size_t GLES2Util::enum_to_string_table_len_ = file.Write(_LICENSE) file.Write(_DO_NOT_EDIT_WARNING) - file.Write("#include \"ppapi/shared_impl/ppb_opengles2_shared.h\"\n\n") + file.Write("#include \"ppapi/shared_impl/opengles2_impl.h\"\n\n") file.Write("#include \"base/logging.h\"\n") file.Write("#include \"gpu/command_buffer/client/gles2_implementation.h\"\n") - file.Write("#include \"ppapi/shared_impl/ppb_graphics_3d_shared.h\"\n") + file.Write("#include \"ppapi/shared_impl/graphics_3d_impl.h\"\n") file.Write("#include \"ppapi/thunk/enter.h\"\n\n") file.Write("namespace ppapi {\n\n") @@ -5819,7 +5819,7 @@ const size_t GLES2Util::enum_to_string_table_len_ = file.Write(" thunk::EnterResource" " enter_g3d(context, false);\n") file.Write(" DCHECK(enter_g3d.succeeded());\n") - file.Write(" return static_cast" + file.Write(" return static_cast" "(enter_g3d.object())->gles2_impl();\n") file.Write("}\n\n") @@ -5851,7 +5851,7 @@ const size_t GLES2Util::enum_to_string_table_len_ = file.Write("} // namespace\n") file.Write(""" -const PPB_OpenGLES2* PPB_OpenGLES2_Shared::GetInterface() { +const PPB_OpenGLES2* OpenGLES2Impl::GetInterface() { return &ppb_opengles2; } @@ -5989,8 +5989,7 @@ def main(argv): elif options.alternate_mode == "chrome_ppapi": # To trigger this action, do "make ppapi_gles_implementation" - gen.WritePepperGLES2Implementation( - "ppapi/shared_impl/ppb_opengles2_shared.cc") + gen.WritePepperGLES2Implementation("ppapi/shared_impl/opengles2_impl.cc") elif options.alternate_mode == "nacl_ppapi": gen.WritePepperGLES2NaClProxy( -- cgit v1.1