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, 0 insertions, 57 deletions

diff --git a/chromium/components/mus/gles2/gl_surface_adapter.cc b/chromium/components/mus/gles2/gl_surface_adapter.cc
deleted file mode 100644
index df1761b5854..00000000000
--- a/chromium/components/mus/gles2/gl_surface_adapter.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2016 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 "components/mus/gles2/gl_surface_adapter.h"
-
-#include "base/bind.h"
-
-namespace mus {
-
-GLSurfaceAdapterMus::GLSurfaceAdapterMus(scoped_refptr<gl::GLSurface> surface)
-    : gl::GLSurfaceAdapter(surface.get()),
-      surface_(surface),
-      weak_ptr_factory_(this) {}
-
-GLSurfaceAdapterMus::~GLSurfaceAdapterMus() {}
-
-void GLSurfaceAdapterMus::SwapBuffersAsync(
-    const GLSurface::SwapCompletionCallback& callback) {
-  gl::GLSurfaceAdapter::SwapBuffersAsync(
-      base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
-                 weak_ptr_factory_.GetWeakPtr(), callback));
-}
-
-void GLSurfaceAdapterMus::PostSubBufferAsync(
-    int x,
-    int y,
-    int width,
-    int height,
-    const GLSurface::SwapCompletionCallback& callback) {
-  gl::GLSurfaceAdapter::PostSubBufferAsync(
-      x, y, width, height,
-      base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
-                 weak_ptr_factory_.GetWeakPtr(), callback));
-}
-
-void GLSurfaceAdapterMus::CommitOverlayPlanesAsync(
-    const GLSurface::SwapCompletionCallback& callback) {
-  gl::GLSurfaceAdapter::CommitOverlayPlanesAsync(
-      base::Bind(&GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync,
-                 weak_ptr_factory_.GetWeakPtr(), callback));
-}
-
-void GLSurfaceAdapterMus::WrappedCallbackForSwapBuffersAsync(
-    const gl::GLSurface::SwapCompletionCallback& original_callback,
-    gfx::SwapResult result) {
-  if (!adapter_callback_.is_null())
-    adapter_callback_.Run(result);
-  original_callback.Run(result);
-}
-
-void GLSurfaceAdapterMus::SetGpuCompletedSwapBuffersCallback(
-    gl::GLSurface::SwapCompletionCallback callback) {
-  adapter_callback_ = std::move(callback);
-}
-
-}  // namespace mus