Revert 245131 "Add the UI compositor to the Mac build", which caused Mac ASan redness

> Add the UI compositor to the Mac build
> 
> Move the bulk of the files in content/browser/aura to
> content/browser/compositor, since they're not aura-specific.
> 
> Build all of those files in the Mac build, and add ui/compositor
> to the dependencies of the Mac build. These files will soon only
> be excluded from the Android build.
> 
> BUG=314190
> 
> Review URL: https://codereview.chromium.org/137893007

TBR=ccameron@chromium.org
BUG=335083

Review URL: https://codereview.chromium.org/137853019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245195 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 36 insertions, 0 deletions

diff --git a/content/browser/aura/gpu_browser_compositor_output_surface.h b/content/browser/aura/gpu_browser_compositor_output_surface.h
new file mode 100644
index 0000000..76b9724
--- /dev/null
+++ b/content/browser/aura/gpu_browser_compositor_output_surface.h
@@ -0,0 +1,36 @@
+// Copyright 2013 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_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+#define CONTENT_BROWSER_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_
+
+#include "content/browser/aura/browser_compositor_output_surface.h"
+
+namespace content {
+
+// Adapts a WebGraphicsContext3DCommandBufferImpl into a
+// cc::OutputSurface that also handles vsync parameter updates
+// arriving from the GPU process.
+class GpuBrowserCompositorOutputSurface
+    : public BrowserCompositorOutputSurface {
+ public:
+  GpuBrowserCompositorOutputSurface(
+      const scoped_refptr<ContextProviderCommandBuffer>& context,
+      int surface_id,
+      IDMap<BrowserCompositorOutputSurface>* output_surface_map,
+      base::MessageLoopProxy* compositor_message_loop,
+      base::WeakPtr<ui::Compositor> compositor);
+
+  virtual ~GpuBrowserCompositorOutputSurface();
+
+ private:
+  // cc::OutputSurface implementation.
+  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
+
+  DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_AURA_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_