X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fcc%2Flayers%2Fpainted_scrollbar_layer_impl.h;h=d54de6b38ac846038ca24eb824de9bae7f965689;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=4ebefb677dd41f3a14fdf95c3e829c124f638cc4;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/cc/layers/painted_scrollbar_layer_impl.h b/src/cc/layers/painted_scrollbar_layer_impl.h index 4ebefb6..d54de6b 100644 --- a/src/cc/layers/painted_scrollbar_layer_impl.h +++ b/src/cc/layers/painted_scrollbar_layer_impl.h @@ -21,18 +21,17 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase { LayerTreeImpl* tree_impl, int id, ScrollbarOrientation orientation); - virtual ~PaintedScrollbarLayerImpl(); + ~PaintedScrollbarLayerImpl() override; // LayerImpl implementation. - virtual scoped_ptr CreateLayerImpl(LayerTreeImpl* tree_impl) - OVERRIDE; - virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE; + scoped_ptr CreateLayerImpl(LayerTreeImpl* tree_impl) override; + void PushPropertiesTo(LayerImpl* layer) override; - virtual bool WillDraw(DrawMode draw_mode, - ResourceProvider* resource_provider) OVERRIDE; - virtual void AppendQuads(RenderPass* render_pass, - const OcclusionTracker& occlusion_tracker, - AppendQuadsData* append_quads_data) OVERRIDE; + bool WillDraw(DrawMode draw_mode, + ResourceProvider* resource_provider) override; + void AppendQuads(RenderPass* render_pass, + const Occlusion& occlusion_in_content_space, + AppendQuadsData* append_quads_data) override; void SetThumbThickness(int thumb_thickness); void SetThumbLength(int thumb_length); @@ -52,14 +51,14 @@ class CC_EXPORT PaintedScrollbarLayerImpl : public ScrollbarLayerImplBase { ScrollbarOrientation orientation); // ScrollbarLayerImplBase implementation. - virtual int ThumbThickness() const OVERRIDE; - virtual int ThumbLength() const OVERRIDE; - virtual float TrackLength() const OVERRIDE; - virtual int TrackStart() const OVERRIDE; - virtual bool IsThumbResizable() const OVERRIDE; + int ThumbThickness() const override; + int ThumbLength() const override; + float TrackLength() const override; + int TrackStart() const override; + bool IsThumbResizable() const override; private: - virtual const char* LayerTypeAsString() const OVERRIDE; + const char* LayerTypeAsString() const override; UIResourceId track_ui_resource_id_; UIResourceId thumb_ui_resource_id_;