Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / layers / solid_color_layer_impl.h

diff --git a/src/cc/layers/solid_color_layer_impl.h b/src/cc/layers/solid_color_layer_impl.h
index e38fe52..3793481 100644 (file)
--- a/src/cc/layers/solid_color_layer_impl.h
+++ b/src/cc/layers/solid_color_layer_impl.h
@@ -18,28 +18,26 @@ class CC_EXPORT SolidColorLayerImpl : public LayerImpl {
     return make_scoped_ptr(new SolidColorLayerImpl(tree_impl, id));
   }
 
-  static void AppendSolidQuads(
-      RenderPass* render_pass,
-      const OcclusionTracker<LayerImpl>& occlusion_tracker,
-      SharedQuadState* shared_quad_state,
-      const gfx::Rect& visible_content_rect,
-      const gfx::Transform& target_space_transform,
-      SkColor color);
+  static void AppendSolidQuads(RenderPass* render_pass,
+                               const Occlusion& occlusion_in_content_space,
+                               SharedQuadState* shared_quad_state,
+                               const gfx::Rect& visible_content_rect,
+                               SkColor color,
+                               AppendQuadsData* append_quads_data);
 
-  virtual ~SolidColorLayerImpl();
+  ~SolidColorLayerImpl() override;
 
   // LayerImpl overrides.
-  virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
-      OVERRIDE;
-  virtual void AppendQuads(RenderPass* render_pass,
-                           const OcclusionTracker<LayerImpl>& occlusion_tracker,
-                           AppendQuadsData* append_quads_data) OVERRIDE;
+  scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override;
+  void AppendQuads(RenderPass* render_pass,
+                   const Occlusion& occlusion_in_content_space,
+                   AppendQuadsData* append_quads_data) override;
 
  protected:
   SolidColorLayerImpl(LayerTreeImpl* tree_impl, int id);
 
  private:
-  virtual const char* LayerTypeAsString() const OVERRIDE;
+  const char* LayerTypeAsString() const override;
 
   DISALLOW_COPY_AND_ASSIGN(SolidColorLayerImpl);
 };