Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / surfaces / surface.h

diff --git a/src/cc/surfaces/surface.h b/src/cc/surfaces/surface.h
index 403d2e5..718fef4 100644 (file)
--- a/src/cc/surfaces/surface.h
+++ b/src/cc/surfaces/surface.h
@@ -5,15 +5,25 @@
 #ifndef CC_SURFACES_SURFACE_H_
 #define CC_SURFACES_SURFACE_H_
 
+#include <vector>
+
+#include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
+#include "cc/base/scoped_ptr_vector.h"
+#include "cc/output/copy_output_request.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surfaces_export.h"
 #include "ui/gfx/size.h"
 
+namespace ui {
+struct LatencyInfo;
+}
+
 namespace cc {
 class CompositorFrame;
+class CopyOutputRequest;
 class SurfaceManager;
 class SurfaceFactory;
 class SurfaceResourceHolder;
@@ -26,10 +36,20 @@ class CC_SURFACES_EXPORT Surface {
   const gfx::Size& size() const { return size_; }
   SurfaceId surface_id() const { return surface_id_; }
 
-  void QueueFrame(scoped_ptr<CompositorFrame> frame);
+  void QueueFrame(scoped_ptr<CompositorFrame> frame,
+                  const base::Closure& draw_callback);
+  void RequestCopyOfOutput(scoped_ptr<CopyOutputRequest> copy_request);
+  void TakeCopyOutputRequests(
+      ScopedPtrVector<CopyOutputRequest>* copy_requests);
   // Returns the most recent frame that is eligible to be rendered.
   const CompositorFrame* GetEligibleFrame();
 
+  // Returns a number that increments by 1 every time a new frame is enqueued.
+  int frame_index() const { return frame_index_; }
+
+  void TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info);
+  void RunDrawCallbacks();
+
   SurfaceFactory* factory() { return factory_; }
 
  private:
@@ -38,6 +58,10 @@ class CC_SURFACES_EXPORT Surface {
   SurfaceFactory* factory_;
   // TODO(jamesr): Support multiple frames in flight.
   scoped_ptr<CompositorFrame> current_frame_;
+  int frame_index_;
+  ScopedPtrVector<CopyOutputRequest> copy_requests_;
+
+  base::Closure draw_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };