services/ui: Revert CLs that broke Windows.

services/ui/gles2/gl_surface_adapter.cc

+// 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 "services/ui/gles2/gl_surface_adapter.h"
+
+#include "base/bind.h"
+
+namespace ui {
+
+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 ui