BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 37 insertions, 19 deletions

diff --git a/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h b/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h
index 638e5a294b4..45432412dd7 100644
--- a/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h
+++ b/chromium/gpu/command_buffer/client/gles2_c_lib_autogen.h
@@ -1246,6 +1246,11 @@ void* GL_APIENTRY GLES2MapBufferRange(GLenum target,
 GLboolean GL_APIENTRY GLES2UnmapBuffer(GLenum target) {
   return gles2::GetGLContext()->UnmapBuffer(target);
 }
+void GL_APIENTRY GLES2FlushMappedBufferRange(GLenum target,
+                                             GLintptr offset,
+                                             GLsizeiptr size) {
+  gles2::GetGLContext()->FlushMappedBufferRange(target, offset, size);
+}
 void* GL_APIENTRY GLES2MapTexSubImage2DCHROMIUM(GLenum target,
                                                 GLint level,
                                                 GLint xoffset,
@@ -1316,11 +1321,6 @@ GLES2CreateGpuMemoryBufferImageCHROMIUM(GLsizei width,
   return gles2::GetGLContext()->CreateGpuMemoryBufferImageCHROMIUM(
       width, height, internalformat, usage);
 }
-void GL_APIENTRY GLES2GetImageivCHROMIUM(GLuint image_id,
-                                         GLenum param,
-                                         GLint* data) {
-  gles2::GetGLContext()->GetImageivCHROMIUM(image_id, param, data);
-}
 void GL_APIENTRY GLES2DescheduleUntilFinishedCHROMIUM() {
   gles2::GetGLContext()->DescheduleUntilFinishedCHROMIUM();
 }
@@ -1472,21 +1472,24 @@ void GL_APIENTRY GLES2ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,
       plane_z_order, plane_transform, overlay_texture_id, bounds_x, bounds_y,
       bounds_width, bounds_height, uv_x, uv_y, uv_width, uv_height);
 }
+void GL_APIENTRY
+GLES2ScheduleCALayerSharedStateCHROMIUM(GLfloat opacity,
+                                        GLboolean is_clipped,
+                                        const GLfloat* clip_rect,
+                                        GLint sorting_context_id,
+                                        const GLfloat* transform) {
+  gles2::GetGLContext()->ScheduleCALayerSharedStateCHROMIUM(
+      opacity, is_clipped, clip_rect, sorting_context_id, transform);
+}
 void GL_APIENTRY GLES2ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
                                               const GLfloat* contents_rect,
-                                              GLfloat opacity,
                                               GLuint background_color,
                                               GLuint edge_aa_mask,
                                               const GLfloat* bounds_rect,
-                                              GLboolean is_clipped,
-                                              const GLfloat* clip_rect,
-                                              GLint sorting_context_id,
-                                              const GLfloat* transform,
                                               GLuint filter) {
   gles2::GetGLContext()->ScheduleCALayerCHROMIUM(
-      contents_texture_id, contents_rect, opacity, background_color,
-      edge_aa_mask, bounds_rect, is_clipped, clip_rect, sorting_context_id,
-      transform, filter);
+      contents_texture_id, contents_rect, background_color, edge_aa_mask,
+      bounds_rect, filter);
 }
 void GL_APIENTRY
 GLES2ScheduleCALayerInUseQueryCHROMIUM(GLsizei count, const GLuint* textures) {
@@ -1696,9 +1699,15 @@ GLint GL_APIENTRY GLES2GetFragDataIndexEXT(GLuint program, const char* name) {
 void GL_APIENTRY
 GLES2UniformMatrix4fvStreamTextureMatrixCHROMIUM(GLint location,
                                                  GLboolean transpose,
-                                                 const GLfloat* default_value) {
+                                                 const GLfloat* transform) {
   gles2::GetGLContext()->UniformMatrix4fvStreamTextureMatrixCHROMIUM(
-      location, transpose, default_value);
+      location, transpose, transform);
+}
+void GL_APIENTRY GLES2SwapBuffersWithDamageCHROMIUM(GLint x,
+                                                    GLint y,
+                                                    GLint width,
+                                                    GLint height) {
+  gles2::GetGLContext()->SwapBuffersWithDamageCHROMIUM(x, y, width, height);
 }
 
 namespace gles2 {
@@ -2654,6 +2663,10 @@ extern const NameToFunc g_gles2_function_table[] = {
         "glUnmapBuffer", reinterpret_cast<GLES2FunctionPointer>(glUnmapBuffer),
     },
     {
+        "glFlushMappedBufferRange",
+        reinterpret_cast<GLES2FunctionPointer>(glFlushMappedBufferRange),
+    },
+    {
         "glMapTexSubImage2DCHROMIUM",
         reinterpret_cast<GLES2FunctionPointer>(glMapTexSubImage2DCHROMIUM),
     },
@@ -2705,10 +2718,6 @@ extern const NameToFunc g_gles2_function_table[] = {
             glCreateGpuMemoryBufferImageCHROMIUM),
     },
     {
-        "glGetImageivCHROMIUM",
-        reinterpret_cast<GLES2FunctionPointer>(glGetImageivCHROMIUM),
-    },
-    {
         "glDescheduleUntilFinishedCHROMIUM",
         reinterpret_cast<GLES2FunctionPointer>(
             glDescheduleUntilFinishedCHROMIUM),
@@ -2829,6 +2838,11 @@ extern const NameToFunc g_gles2_function_table[] = {
         reinterpret_cast<GLES2FunctionPointer>(glScheduleOverlayPlaneCHROMIUM),
     },
     {
+        "glScheduleCALayerSharedStateCHROMIUM",
+        reinterpret_cast<GLES2FunctionPointer>(
+            glScheduleCALayerSharedStateCHROMIUM),
+    },
+    {
         "glScheduleCALayerCHROMIUM",
         reinterpret_cast<GLES2FunctionPointer>(glScheduleCALayerCHROMIUM),
     },
@@ -2991,6 +3005,10 @@ extern const NameToFunc g_gles2_function_table[] = {
             glUniformMatrix4fvStreamTextureMatrixCHROMIUM),
     },
     {
+        "glSwapBuffersWithDamageCHROMIUM",
+        reinterpret_cast<GLES2FunctionPointer>(glSwapBuffersWithDamageCHROMIUM),
+    },
+    {
         NULL, NULL,
     },
 };