mojo: Reland "Convert gles2 to the new thunking system."

mojo/shell/in_process_dynamic_service_runner.cc

Index: mojo/shell/in_process_dynamic_service_runner.cc
diff --git a/mojo/shell/in_process_dynamic_service_runner.cc b/mojo/shell/in_process_dynamic_service_runner.cc
index 3bfb163462ce500a29cc80b8d3d235397d6ea136..c2438707767eab3d164c93942ac4d318ecb14f95 100644
--- a/mojo/shell/in_process_dynamic_service_runner.cc
+++ b/mojo/shell/in_process_dynamic_service_runner.cc
@@ -9,6 +9,7 @@
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "mojo/public/platform/native/gles2_thunks.h"
 #include "mojo/public/platform/native/system_thunks.h"
 
 namespace mojo {
@@ -86,6 +87,50 @@ void InProcessDynamicServiceRunner::Run() {
 #endif
     }
 
+    MojoSetGLES2ControlThunksFn mojo_set_gles2_control_thunks_fn =
+        reinterpret_cast<MojoSetGLES2ControlThunksFn>(
+            app_library_.GetFunctionPointer("MojoSetGLES2ControlThunks"));
+    if (mojo_set_gles2_control_thunks_fn) {
+      MojoGLES2ControlThunks gles2_control_thunks =
+          MojoMakeGLES2ControlThunks();
+      size_t expected_size = mojo_set_gles2_control_thunks_fn(
+          &gles2_control_thunks);
+      if (expected_size > sizeof(MojoGLES2ControlThunks)) {
+        LOG(ERROR)
+            << "Invalid app library: expected MojoGLES2ControlThunks size: "
+            << expected_size;
+        break;
+      }
+
+      // If we have the control thunks, we probably also have the
+      // GLES2 implementation thunks.
+      MojoSetGLES2ImplThunksFn mojo_set_gles2_impl_thunks_fn =
+          reinterpret_cast<MojoSetGLES2ImplThunksFn>(
+              app_library_.GetFunctionPointer("MojoSetGLES2ImplThunks"));
+      if (mojo_set_gles2_impl_thunks_fn) {
+        MojoGLES2ImplThunks gles2_impl_thunks =
+            MojoMakeGLES2ImplThunks();
+        size_t expected_size = mojo_set_gles2_impl_thunks_fn(
+            &gles2_impl_thunks);
+        if (expected_size > sizeof(MojoGLES2ImplThunks)) {
+          LOG(ERROR)
+              << "Invalid app library: expected MojoGLES2ImplThunks size: "
+              << expected_size;
+          break;
+        }
+      } else {
+        // In the component build, Mojo Apps link against mojo_gles2_impl.
+#if !defined(COMPONENT_BUILD)
+        // Warn on this really weird case: The library requires the GLES2
+        // control functions, but doesn't require the GLES2 implementation.
+        LOG(WARNING) << "App library has MojoSetGLES2ControlThunks, but "
+                        "doesn't have MojoSetGLES2ImplThunks.";
+#endif
+      }
+    }
+    // Unlike system thunks, we don't warn on a lack of GLES2 thunks because
+    // not everything is a visual app.
+
     typedef MojoResult (*MojoMainFunction)(MojoHandle);
     MojoMainFunction main_function = reinterpret_cast<MojoMainFunction>(
         app_library_.GetFunctionPointer("MojoMain"));