Start of hardware overlay support in CC with Ubercompositor.

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index b751f06c9416b1ccfec2e2cb26ad723d6925fa4d..53beb9d3a22ee3e26498bbf3bd360cd8a7216d6e 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -14,6 +14,7 @@
 #include "cc/base/cc_export.h"
 #include "cc/base/rolling_time_delta_history.h"
 #include "cc/output/context_provider.h"
+#include "cc/output/overlay_candidates.h"
 #include "cc/output/software_output_device.h"
 #include "cc/scheduler/frame_rate_controller.h"
 
@@ -139,6 +140,11 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   // device is present, returns 0.
   base::TimeDelta GpuLatencyEstimate();
 
+  // Get the class capable of informing cc of hardware overlay capability.
+  OverlayCandidates* overlay_candidates() const {
+    return overlay_candidates_.get();
+  }
+
  protected:
   // Synchronously initialize context3d and enter hardware mode.
   // This can only supported in threaded compositing mode.
@@ -154,6 +160,7 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   struct OutputSurface::Capabilities capabilities_;
   scoped_refptr<ContextProvider> context_provider_;
   scoped_ptr<SoftwareOutputDevice> software_device_;
+  scoped_ptr<OverlayCandidates> overlay_candidates_;
   gfx::Size surface_size_;
   float device_scale_factor_;