mus+ash: Enable Chrome HW rendering in mus+ash

content/browser/compositor/mus_browser_compositor_output_surface.h

Index: content/browser/compositor/mus_browser_compositor_output_surface.h
diff --git a/content/browser/compositor/mus_browser_compositor_output_surface.h b/content/browser/compositor/mus_browser_compositor_output_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..90c0be3762a33e923209e55927b838423b36b4e4
--- /dev/null
+++ b/content/browser/compositor/mus_browser_compositor_output_surface.h
@@ -0,0 +1,69 @@
+// Copyright 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.
+
+#ifndef CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+
+#include <memory>
+#include <vector>
+
+#include "base/cancelable_callback.h"
+#include "base/macros.h"
+#include "build/build_config.h"
+#include "components/mus/public/cpp/window_surface_client.h"
+#include "content/browser/compositor/gpu_browser_compositor_output_surface.h"
+#include "gpu/command_buffer/common/mailbox.h"
+#include "gpu/ipc/common/surface_handle.h"
+#include "ui/gfx/swap_result.h"
+
+namespace mus {
+class Window;
+class WindowSurface;
+}
+
+namespace content {
+
+// Adapts a WebGraphicsContext3DCommandBufferImpl into a
+// cc::OutputSurface that also handles vsync parameter updates
+// arriving from the GPU process.
+class MusBrowserCompositorOutputSurface
+    : public GpuBrowserCompositorOutputSurface,
+      public mus::WindowSurfaceClient {
+ public:
+  MusBrowserCompositorOutputSurface(
+      gpu::SurfaceHandle surface_handle,
+      scoped_refptr<ContextProviderCommandBuffer> context,
+      scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
+      cc::SyntheticBeginFrameSource* begin_frame_source,
+      std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
+          overlay_candidate_validator);
+
+  ~MusBrowserCompositorOutputSurface() override;
+
+ protected:
+  // cc::OutputSurface implementation.
+  void SwapBuffers(cc::CompositorFrame frame) override;
+  bool BindToClient(cc::OutputSurfaceClient* client) override;
+
+  // mus::WindowSurfaceClient:
+  void OnResourcesReturned(
+      mus::WindowSurface* surface,
+      mojo::Array<cc::ReturnedResource> resources) override;
+
+ private:
+  uint32_t AllocateResourceId();
+  void FreeResourceId(uint32_t id);
+  const gpu::Mailbox& GetMailboxFromResourceId(uint32_t id);
+
+  mus::Window* mus_window_;
+  std::unique_ptr<mus::WindowSurface> mus_window_surface_;
+  std::vector<uint32_t> free_resource_ids_;
+  std::vector<gpu::Mailbox> mailboxs_;
+
+  DISALLOW_COPY_AND_ASSIGN(MusBrowserCompositorOutputSurface);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_COMPOSITOR_MUS_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_