commit 32649a8ad09fdb214fae4180eb7e309303960367
author Viet-Trung Luu <viettrungluu@chromium.org> Wed Sep 16 14:41:14 2015 -0700
committer Viet-Trung Luu <viettrungluu@chromium.org> Wed Sep 16 14:41:14 2015 -0700
tree 9b72f9ed7f6e37d6aaf7436ac15b38506af9353d
parent 02bb167083d29a9a15577bdd4da3ec200b32d6fe

Rename occlusion_query_ext -> ext_occlusion_query (OcclusionQueryEXT -> EXTOcclusionQuery, etc.).

Keep a thunk setter for the old name (to be deleted when no one uses it
and we've verified it).

R=jamesr@chromium.org
BUG=#353

Review URL: https://codereview.chromium.org/1347823005 .

shell/native_application_support.cc

diff --git a/shell/native_application_support.cc b/shell/native_application_support.cc
index 3bdd197..ce171dc 100644
--- a/shell/native_application_support.cc
+++ b/shell/native_application_support.cc
@@ -16,9 +16,9 @@
 #include "mojo/public/platform/native/gles2_impl_ext_debug_marker_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_ext_discard_framebuffer_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_ext_multisampled_render_to_texture_thunks.h"
+#include "mojo/public/platform/native/gles2_impl_ext_occlusion_query_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_ext_texture_storage_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_khr_blend_equation_advanced_thunks.h"
-#include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_oes_vertex_array_object_thunks.h"
 #include "mojo/public/platform/native/gles2_impl_thunks.h"
 #include "mojo/public/platform/native/mgl_onscreen_thunks.h"
@@ -86,6 +86,8 @@
             "MojoSetGLES2ImplEXTDebugMarkerThunks", app_library);
   SetThunks(MojoMakeGLES2ImplEXTDiscardFramebufferThunks,
             "MojoSetGLES2ImplEXTDiscardFramebufferThunks", app_library);
+  SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
+            "MojoSetGLES2ImplEXTOcclusionQueryThunks", app_library);
   SetThunks(MojoMakeGLES2ImplEXTTextureStorageThunks,
             "MojoSetGLES2ImplEXTTextureStorageThunks", app_library);
   SetThunks(MojoMakeGLES2ImplEXTMultisampledRenderToTextureThunks,
@@ -93,10 +95,12 @@
             app_library);
   SetThunks(MojoMakeGLES2ImplKHRBlendEquationAdvancedThunks,
             "MojoSetGLES2ImplKHRBlendEquationAdvancedThunks", app_library);
-  SetThunks(MojoMakeGLES2ImplOcclusionQueryEXTThunks,
-            "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
   SetThunks(MojoMakeGLES2ImplOESVertexArrayObjectThunks,
             "MojoSetGLES2ImplOESVertexArrayObjectThunks", app_library);
+  // Deprecated name for "MojoSetGLES2ImplEXTOcclusionQueryThunks" (TODO(vtl):
+  // when no app is using this name any longer, delete it):
+  SetThunks(MojoMakeGLES2ImplEXTOcclusionQueryThunks,
+            "MojoSetGLES2ImplOcclusionQueryEXTThunks", app_library);
   // "Chromium" extensions:
   SetThunks(MojoMakeGLES2ImplCHROMIUMBindUniformLocationThunks,
             "MojoSetGLES2ImplCHROMIUMBindUniformLocationThunks", app_library);