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>

3 files changed, 39 insertions, 18 deletions

diff --git a/chromium/third_party/khronos/EGL/eglext.h b/chromium/third_party/khronos/EGL/eglext.h
index 0acc2803560..610c9aefd3e 100644
--- a/chromium/third_party/khronos/EGL/eglext.h
+++ b/chromium/third_party/khronos/EGL/eglext.h
@@ -445,6 +445,21 @@ typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYSTREAMTIMEKHRPROC)(EGLDisplay dpy, E
 /* No tokens/entry points, just relaxes an error condition */
 #endif
 
+#ifndef EGL_KHR_swap_buffers_with_damage
+#define EGL_KHR_swap_buffers_with_damage 1
+typedef EGLBoolean(EGLAPIENTRYP PFNEGLSWAPBUFFERSWITHDAMAGEKHRPROC)(
+    EGLDisplay dpy,
+    EGLSurface surface,
+    EGLint* rects,
+    EGLint n_rects);
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffersWithDamageKHR(EGLDisplay dpy,
+                                                          EGLSurface surface,
+                                                          EGLint* rects,
+                                                          EGLint n_rects);
+#endif
+#endif /* EGL_KHR_swap_buffers_with_damage */
+
 #ifdef EGL_KHR_stream /* Requires KHR_stream extension */
 #ifndef EGL_KHR_stream_cross_process_fd
 #define EGL_KHR_stream_cross_process_fd 1
@@ -561,6 +576,12 @@ typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC)(EGLDisplay dpy,
 #define EGL_YUV_NARROW_RANGE_EXT		0x3283
 #define EGL_YUV_CHROMA_SITING_0_EXT		0x3284
 #define EGL_YUV_CHROMA_SITING_0_5_EXT		0x3285
+#define EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT	0x3286
+#define EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT	0x3287
+#define EGL_LINUX_DRM_PLANE1_MODIFIER0_EXT	0x3288
+#define EGL_LINUX_DRM_PLANE1_MODIFIER1_EXT	0x3289
+#define EGL_LINUX_DRM_PLANE2_MODIFIER0_EXT	0x328a
+#define EGL_LINUX_DRM_PLANE2_MODIFIER1_EXT	0x328b
 #endif
 
 #ifndef EGL_ARM_implicit_external_sync
@@ -568,6 +589,21 @@ typedef EGLint (EGLAPIENTRYP PFNEGLDUPNATIVEFENCEFDANDROIDPROC)(EGLDisplay dpy,
 #define EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM 0x328A
 #endif /* EGL_ARM_implicit_external_sync */
 
+#ifndef EGL_EXT_image_flush_external
+#define EGL_EXT_image_flush_external 1
+#ifdef EGL_EGLEXT_PROTOTYPES
+EGLAPI EGLBoolean EGLAPIENTRY
+eglImageFlushExternalEXT(EGLDisplay dpy,
+                         EGLImageKHR image,
+                         const EGLint* attrib_list);
+#else
+typedef EGLBoolean(EGLAPIENTRYP PFNGLEGLIMAGEFLUSHEXTERNALEXT)(
+    EGLDisplay dpy,
+    EGLImageKHR image,
+    const EGLint* attrib_list);
+#endif
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/chromium/third_party/khronos/README.chromium b/chromium/third_party/khronos/README.chromium
index 3d9c6c18104..88ce26d0388 100644
--- a/chromium/third_party/khronos/README.chromium
+++ b/chromium/third_party/khronos/README.chromium
@@ -35,6 +35,9 @@ EGL/eglplatform.h
  - Added EGLNative*Type for native linux framebuffers.
 EGL/eglext.h
  - Added EGL_ARM_implicit_external_sync extension tokens
+ - Added format modifier for EGL_EXT_image_dma_buf_import extension
+ - Added support for EGL_EXT_image_flush_external extension
+ - Added support for EGL_KHR_swap_buffers_with_damage
 KHR/khrplatform.h
  - Modified KHRONOS_APICALL
 DEPS
diff --git a/chromium/third_party/khronos/khronos.gyp b/chromium/third_party/khronos/khronos.gyp
deleted file mode 100644
index 8a855728d52..00000000000
--- a/chromium/third_party/khronos/khronos.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2012 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'khronos_headers',
-      'type': 'none',
-      'all_dependent_settings': {
-        'include_dirs': [
-          '.',
-          '../../gpu',  # Contains GLES2/gl2chromium.h
-        ],
-      },
-    },
-  ],
-}