Update mojo sdk to rev e252977e5b22685a1b4fdb14eda40c78935ea50a

BUG=
TBR=jamesr@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#322195}

third_party/mojo/src/mojo/public/VERSION

-cb6c5abfadfea0ca73dca466e2894554ac1ae144
+e252977e5b22685a1b4fdb14eda40c78935ea50a
\ No newline at end of file

third_party/mojo/src/mojo/public/c/gles2/chromium_miscellaneous.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_C_GLES2_CHROMIUM_MISCELLANEOUS_H_
+#define MOJO_PUBLIC_C_GLES2_CHROMIUM_MISCELLANEOUS_H_
+
+// Note: This header should be compilable as C.
+
+#include <stdint.h>
+#include <GLES2/gl2.h>
+
+#include "mojo/public/c/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_types.h"
+#include "mojo/public/c/system/types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_miscellaneous_autogen.h"
+#undef VISIT_GL_CALL
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // MOJO_PUBLIC_C_GLES2_CHROMIUM_MISCELLANEOUS_H_

third_party/mojo/src/mojo/public/c/gles2/chromium_sub_image.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_C_GLES2_CHROMIUM_SUB_IMAGE_H_
+#define MOJO_PUBLIC_C_GLES2_CHROMIUM_SUB_IMAGE_H_
+
+// Note: This header should be compilable as C.
+
+#include <stdint.h>
+#include <GLES2/gl2.h>
+
+#include "mojo/public/c/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_types.h"
+#include "mojo/public/c/system/types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_sub_image_autogen.h"
+#undef VISIT_GL_CALL
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // MOJO_PUBLIC_C_GLES2_CHROMIUM_SUBIMAGE_H_

third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_miscellaneous_autogen.h

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// It's formatted by clang-format using chromium coding style:
+//    clang-format -i -style=chromium filename
+// DO NOT EDIT!
+
+VISIT_GL_CALL(ShallowFlushCHROMIUM, void, (), ())

third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_chromium_sub_image_autogen.h

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// It's formatted by clang-format using chromium coding style:
+//    clang-format -i -style=chromium filename
+// DO NOT EDIT!
+
+VISIT_GL_CALL(
+    MapTexSubImage2DCHROMIUM,
+    void*,
+    (GLenum target,
+     GLint level,
+     GLint xoffset,
+     GLint yoffset,
+     GLsizei width,
+     GLsizei height,
+     GLenum format,
+     GLenum type,
+     GLenum access),
+    (target, level, xoffset, yoffset, width, height, format, type, access))
+VISIT_GL_CALL(UnmapTexSubImage2DCHROMIUM, void, (const void* mem), (mem))

third_party/mojo/src/mojo/public/c/gles2/gles2_call_visitor_occlusion_query_ext_autogen.h

+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file is auto-generated from
+// gpu/command_buffer/build_gles2_cmd_buffer.py
+// It's formatted by clang-format using chromium coding style:
+//    clang-format -i -style=chromium filename
+// DO NOT EDIT!
+
+VISIT_GL_CALL(GenQueriesEXT, void, (GLsizei n, GLuint* queries), (n, queries))
+VISIT_GL_CALL(DeleteQueriesEXT,
+              void,
+              (GLsizei n, const GLuint* queries),
+              (n, queries))
+VISIT_GL_CALL(IsQueryEXT, GLboolean, (GLuint id), (id))
+VISIT_GL_CALL(BeginQueryEXT, void, (GLenum target, GLuint id), (target, id))
+VISIT_GL_CALL(EndQueryEXT, void, (GLenum target), (target))
+VISIT_GL_CALL(GetQueryivEXT,
+              void,
+              (GLenum target, GLenum pname, GLint* params),
+              (target, pname, params))
+VISIT_GL_CALL(GetQueryObjectuivEXT,
+              void,
+              (GLuint id, GLenum pname, GLuint* params),
+              (id, pname, params))

third_party/mojo/src/mojo/public/c/gles2/occlusion_query_ext.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_C_GLES2_OCCLUSION_QUERY_EXT_H_
+#define MOJO_PUBLIC_C_GLES2_OCCLUSION_QUERY_EXT_H_
+
+// Note: This header should be compilable as C.
+
+#include <stdint.h>
+#include <GLES2/gl2.h>
+
+#include "mojo/public/c/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_types.h"
+#include "mojo/public/c/system/types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_occlusion_query_ext_autogen.h"
+#undef VISIT_GL_CALL
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+#endif  // MOJO_PUBLIC_C_GLES2_OCCLUSION_QUERY_EXT_H_

third_party/mojo/src/mojo/public/platform/native/BUILD.gn

@@ -26,10 +26,16 @@ mojo_sdk_source_set("system") {
 
 mojo_sdk_source_set("gles2") {
   sources = [
+    "gles2_impl_chromium_miscellaneous_thunks.cc",
+    "gles2_impl_chromium_miscellaneous_thunks.h",
+    "gles2_impl_chromium_sub_image_thunks.cc",
+    "gles2_impl_chromium_sub_image_thunks.h",
     "gles2_impl_chromium_sync_point_thunks.cc",
     "gles2_impl_chromium_sync_point_thunks.h",
     "gles2_impl_chromium_texture_mailbox_thunks.cc",
     "gles2_impl_chromium_texture_mailbox_thunks.h",
+    "gles2_impl_occlusion_query_ext_thunks.cc",
+    "gles2_impl_occlusion_query_ext_thunks.h",
     "gles2_impl_thunks.cc",
     "gles2_impl_thunks.h",
     "gles2_thunks.cc",

third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.cc

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h"
+
+#include <assert.h>
+
+#include "mojo/public/platform/native/thunk_export.h"
+
+extern "C" {
+static MojoGLES2ImplChromiumMiscellaneousThunks
+    g_impl_chromium_miscellaneous_thunks = {0};
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS)  \
+  ReturnType gl##Function PARAMETERS {                              \
+    assert(g_impl_chromium_miscellaneous_thunks.Function);          \
+    return g_impl_chromium_miscellaneous_thunks.Function ARGUMENTS; \
+  }
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_miscellaneous_autogen.h"
+#undef VISIT_GL_CALL
+
+extern "C" THUNK_EXPORT size_t MojoSetGLES2ImplChromiumMiscellaneousThunks(
+    const MojoGLES2ImplChromiumMiscellaneousThunks*
+        gles2_impl_chromium_miscellaneous_thunks) {
+  if (gles2_impl_chromium_miscellaneous_thunks->size >=
+      sizeof(g_impl_chromium_miscellaneous_thunks))
+    g_impl_chromium_miscellaneous_thunks =
+        *gles2_impl_chromium_miscellaneous_thunks;
+  return sizeof(g_impl_chromium_miscellaneous_thunks);
+}
+
+}  // extern "C"

third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_miscellaneous_thunks.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_MISCELLANEOUS_THUNKS_H_
+#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_MISCELLANEOUS_THUNKS_H_
+
+#include <stddef.h>
+
+#include "mojo/public/c/gles2/chromium_miscellaneous.h"
+
+// Specifies the frozen API for the GLES2 CHROMIUM_miscellaneous extension.
+#pragma pack(push, 8)
+struct MojoGLES2ImplChromiumMiscellaneousThunks {
+  size_t size;  // Should be set to sizeof(*this).
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  ReturnType(*Function) PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_miscellaneous_autogen.h"
+#undef VISIT_GL_CALL
+};
+#pragma pack(pop)
+
+// Intended to be called from the embedder to get the embedder's implementation
+// of GLES2.
+inline MojoGLES2ImplChromiumMiscellaneousThunks
+MojoMakeGLES2ImplChromiumMiscellaneousThunks() {
+  MojoGLES2ImplChromiumMiscellaneousThunks
+      gles2_impl_chromium_miscellaneous_thunks = {
+          sizeof(MojoGLES2ImplChromiumMiscellaneousThunks),
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) gl##Function,
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_miscellaneous_autogen.h"
+#undef VISIT_GL_CALL
+      };
+
+  return gles2_impl_chromium_miscellaneous_thunks;
+}
+
+// Use this type for the function found by dynamically discovering it in
+// a DSO linked with mojo_system.
+// The contents of |gles2_impl_chromium_miscellaneous_thunks| are copied.
+typedef size_t (*MojoSetGLES2ImplChromiumMiscellaneousThunksFn)(
+    const MojoGLES2ImplChromiumMiscellaneousThunks* thunks);
+
+#endif  // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_MISCELLANEOUS_THUNKS_H_

third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.cc

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h"
+
+#include <assert.h>
+
+#include "mojo/public/platform/native/thunk_export.h"
+
+extern "C" {
+static MojoGLES2ImplChromiumSubImageThunks g_impl_chromium_sub_image_thunks = {
+    0};
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  ReturnType gl##Function PARAMETERS {                             \
+    assert(g_impl_chromium_sub_image_thunks.Function);             \
+    return g_impl_chromium_sub_image_thunks.Function ARGUMENTS;    \
+  }
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_sub_image_autogen.h"
+#undef VISIT_GL_CALL
+
+extern "C" THUNK_EXPORT size_t MojoSetGLES2ImplChromiumSubImageThunks(
+    const MojoGLES2ImplChromiumSubImageThunks*
+        gles2_impl_chromium_sub_image_thunks) {
+  if (gles2_impl_chromium_sub_image_thunks->size >=
+      sizeof(g_impl_chromium_sub_image_thunks))
+    g_impl_chromium_sub_image_thunks = *gles2_impl_chromium_sub_image_thunks;
+  return sizeof(g_impl_chromium_sub_image_thunks);
+}
+
+}  // extern "C"

third_party/mojo/src/mojo/public/platform/native/gles2_impl_chromium_sub_image_thunks.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_SUB_IMAGE_THUNKS_H_
+#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_SUB_IMAGE_THUNKS_H_
+
+#include <stddef.h>
+
+#include "mojo/public/c/gles2/chromium_sub_image.h"
+
+// Specifies the frozen API for the GLES2 CHROMIUM_sub_image extension.
+#pragma pack(push, 8)
+struct MojoGLES2ImplChromiumSubImageThunks {
+  size_t size;  // Should be set to sizeof(*this).
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  ReturnType(*Function) PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_sub_image_autogen.h"
+#undef VISIT_GL_CALL
+};
+#pragma pack(pop)
+
+// Intended to be called from the embedder to get the embedder's implementation
+// of GLES2.
+inline MojoGLES2ImplChromiumSubImageThunks
+MojoMakeGLES2ImplChromiumSubImageThunks() {
+  MojoGLES2ImplChromiumSubImageThunks gles2_impl_chromium_sub_image_thunks = {
+      sizeof(MojoGLES2ImplChromiumSubImageThunks),
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) gl##Function,
+#include "mojo/public/c/gles2/gles2_call_visitor_chromium_sub_image_autogen.h"
+#undef VISIT_GL_CALL
+  };
+
+  return gles2_impl_chromium_sub_image_thunks;
+}
+
+// Use this type for the function found by dynamically discovering it in
+// a DSO linked with mojo_system.
+// The contents of |gles2_impl_chromium_sub_image_thunks| are copied.
+typedef size_t (*MojoSetGLES2ImplChromiumSubImageThunksFn)(
+    const MojoGLES2ImplChromiumSubImageThunks* thunks);
+
+#endif  // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_SUB_IMAGE_THUNKS_H_

third_party/mojo/src/mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.cc

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h"
+
+#include <assert.h>
+
+#include "mojo/public/platform/native/thunk_export.h"
+
+extern "C" {
+static MojoGLES2ImplOcclusionQueryExtThunks g_impl_occlusion_query_ext_thunks =
+    {0};
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  ReturnType gl##Function PARAMETERS {                             \
+    assert(g_impl_occlusion_query_ext_thunks.Function);            \
+    return g_impl_occlusion_query_ext_thunks.Function ARGUMENTS;   \
+  }
+#include "mojo/public/c/gles2/gles2_call_visitor_occlusion_query_ext_autogen.h"
+#undef VISIT_GL_CALL
+
+extern "C" THUNK_EXPORT size_t MojoSetGLES2ImplOcclusionQueryExtThunks(
+    const MojoGLES2ImplOcclusionQueryExtThunks*
+        gles2_impl_occlusion_query_ext_thunks) {
+  if (gles2_impl_occlusion_query_ext_thunks->size >=
+      sizeof(g_impl_occlusion_query_ext_thunks))
+    g_impl_occlusion_query_ext_thunks = *gles2_impl_occlusion_query_ext_thunks;
+  return sizeof(g_impl_occlusion_query_ext_thunks);
+}
+
+}  // extern "C"

third_party/mojo/src/mojo/public/platform/native/gles2_impl_occlusion_query_ext_thunks.h

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_OCCLUSION_QUERY_EXT_THUNKS_H_
+#define MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_OCCLUSION_QUERY_EXT_THUNKS_H_
+
+#include <stddef.h>
+
+#include "mojo/public/c/gles2/occlusion_query_ext.h"
+
+// Specifies the frozen API for the Occlusion Query Extension.
+#pragma pack(push, 8)
+struct MojoGLES2ImplOcclusionQueryExtThunks {
+  size_t size;  // Should be set to sizeof(*this).
+
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
+  ReturnType(*Function) PARAMETERS;
+#include "mojo/public/c/gles2/gles2_call_visitor_occlusion_query_ext_autogen.h"
+#undef VISIT_GL_CALL
+};
+#pragma pack(pop)
+
+// Intended to be called from the embedder to get the embedder's implementation
+// of GLES2.
+inline MojoGLES2ImplOcclusionQueryExtThunks
+MojoMakeGLES2ImplOcclusionQueryExtThunks() {
+  MojoGLES2ImplOcclusionQueryExtThunks gles2_impl_occlusion_query_ext_thunks = {
+      sizeof(MojoGLES2ImplOcclusionQueryExtThunks),
+#define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) gl##Function,
+#include "mojo/public/c/gles2/gles2_call_visitor_occlusion_query_ext_autogen.h"
+#undef VISIT_GL_CALL
+  };
+
+  return gles2_impl_occlusion_query_ext_thunks;
+}
+
+// Use this type for the function found by dynamically discovering it in
+// a DSO linked with mojo_system.
+// The contents of |gles2_impl_occlusion_query_ext_thunks| are copied.
+typedef size_t (*MojoSetGLES2ImplOcclusionQueryExtThunksFn)(
+    const MojoGLES2ImplOcclusionQueryExtThunks* thunks);
+
+#endif  // MOJO_PUBLIC_PLATFORM_NATIVE_GLES2_IMPL_CHROMIUM_SYNC_POINT_THUNKS_H_