Update mojo surfaces bindings and mojo/cc/ glue

mojo/cc/output_surface_mojo.h

Index: mojo/cc/output_surface_mojo.h
diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h
new file mode 100644
index 0000000000000000000000000000000000000000..fbde9315a3e7ac46f594201f197e57380706fe81
--- /dev/null
+++ b/mojo/cc/output_surface_mojo.h
@@ -0,0 +1,38 @@
+// Copyright 2014 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 MOJO_CC_OUTPUT_SURFACE_MOJO_H_
+#define MOJO_CC_OUTPUT_SURFACE_MOJO_H_
+
+#include "cc/output/output_surface.h"
+#include "cc/surfaces/surface_id.h"
+#include "cc/surfaces/surface_id_allocator.h"
+#include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
+
+namespace mojo {
+
+class OutputSurfaceMojo : public cc::OutputSurface, public SurfaceClient {
+ public:
+  OutputSurfaceMojo(const scoped_refptr<cc::ContextProvider>& context_provider,
+                    SurfacePtr surface,
+                    uint32_t id_namespace);
+  virtual ~OutputSurfaceMojo();
+
+  // SurfaceClient implementation.
+  virtual void ReturnResources(Array<ReturnedResourcePtr> resources) OVERRIDE;
+
+  // cc::OutputSurface implementation.
+  virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
+
+ private:
+  SurfacePtr surface_;
+  cc::SurfaceIdAllocator id_allocator_;
+  cc::SurfaceId surface_id_;
+  gfx::Size surface_size_;
+
+  DISALLOW_COPY_AND_ASSIGN(OutputSurfaceMojo);
+};
+}
+
+#endif  // MOJO_CC_OUTPUT_SURFACE_MOJO_H_