cc: Move WebCompositorOutputSurface and related classes into cc/

cc/output_surface.h

Index: cc/output_surface.h
diff --git a/cc/output_surface.h b/cc/output_surface.h
new file mode 100644
index 0000000000000000000000000000000000000000..e9215099ce3e79ffcd83da7b811f48e145efc007
--- /dev/null
+++ b/cc/output_surface.h
@@ -0,0 +1,55 @@
+// Copyright 2012 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 CC_OUTPUT_SURFACE_H_
+#define CC_OUTPUT_SURFACE_H_
+
+#define USE_CC_OUTPUT_SURFACE // TODO(danakj): Remove this.
+
+#include <public/WebCompositorOutputSurface.h>
+
+namespace cc {
+
+class CompositorFrame;
+class OutputSurfaceClient;
+class SoftwareOutputDevice;
+
+// Represents the output surface for a compositor. The compositor owns
+// and manages its destruction. Its lifetime is:
+//   1. Created on the main thread via WebLayerTreeView::createOutputSurface.

[piman, 2012/12/04 06:41:06]

nit: doc probably needs updating

[danakj, 2012/12/04 18:15:34]

I don't think this changed. The code paths are the same, just the data type
names changed. It still goes through this function.

[piman, 2012/12/04 22:24:42]

I was thinking here and below.

couple of things:
- this isn't created through WebLayerTreeView::createOutputSurface on Aura
(since we use cc/ directly). Generically I wouldn't define the API in cc in
terms of what happens in WebKit.
- below, s/bindToClient/BindToClient/

+//   2. Passed to the compositor thread and bound to a client via bindToClient.
+//      From here on, it will only be used on the compositor thread.
+//   3. If the 3D context is lost, then the compositor will delete the output surface
+//      (on the compositor thread) and go back to step 1.
+class OutputSurface : public WebKit::WebCompositorOutputSurface {
+ public:
+  virtual ~OutputSurface() {}
+
+  // Called by the compositor on the compositor thread. This is a place where thread-specific
+  // data for the output surface can be initialized, since from this point on the output surface
+  // will only be used on the compositor thread.
+  virtual bool BindToClient(OutputSurfaceClient*) = 0;
+
+  struct Capabilities {
+    Capabilities()
+        : has_parent_compositor(false) {}
+
+    bool has_parent_compositor;
+  };
+
+  virtual const Capabilities& Capabilities() const = 0;
+
+  // Obtain the 3d context or the software device associated with this output surface. Either of these may return a null pointer, but not both.

[jamesr, 2012/12/04 07:06:51]

80col

+  // In the event of a lost context, the entire output surface should be recreated.
+  virtual WebKit::WebGraphicsContext3D* Context3D() const = 0;
+  virtual SoftwareOutputDevice* SoftwareDevice() const = 0;
+
+  // Sends frame data to the parent compositor. This should only be called
+  // when capabilities().has_parent_pompositor.
+  virtual void SendFrameToParentCompositor(const CompositorFrame&) {}
+};
+
+}  // namespace cc
+
+#endif  // CC_OUTPUT_SURFACE_H_