Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / cc / output / renderer.h

diff --git a/src/cc/output/renderer.h b/src/cc/output/renderer.h
index b6d0cd4..da0ddc1 100644 (file)
--- a/src/cc/output/renderer.h
+++ b/src/cc/output/renderer.h
@@ -7,16 +7,20 @@
 
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
-#include "cc/quads/render_pass.h"
+#include "cc/base/scoped_ptr_vector.h"
 #include "cc/trees/layer_tree_host.h"
 
 namespace cc {
 
 class CompositorFrameAck;
 class CompositorFrameMetadata;
+class RenderPass;
+class RenderPassId;
 class ScopedResource;
 class Task;
 
+typedef ScopedPtrVector<RenderPass> RenderPassList;
+
 struct RendererCapabilitiesImpl {
   RendererCapabilitiesImpl();
   ~RendererCapabilitiesImpl();
@@ -40,7 +44,6 @@ struct RendererCapabilitiesImpl {
 class CC_EXPORT RendererClient {
  public:
   virtual void SetFullRootLayerDamage() = 0;
-  virtual void RunOnDemandRasterTask(Task* on_demand_raster_task) = 0;
 };
 
 class CC_EXPORT Renderer {
@@ -51,7 +54,7 @@ class CC_EXPORT Renderer {
 
   virtual void DecideRenderPassAllocationsForFrame(
       const RenderPassList& render_passes_in_draw_order) {}
-  virtual bool HasAllocatedResourcesForTesting(RenderPass::Id id) const;
+  virtual bool HasAllocatedResourcesForTesting(RenderPassId id) const;
 
   // This passes ownership of the render passes to the renderer. It should
   // consume them, and empty the list. The parameters here may change from frame