diff options
Diffstat (limited to 'cc/layers/painted_scrollbar_layer.h')
| -rw-r--r-- | cc/layers/painted_scrollbar_layer.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/cc/layers/painted_scrollbar_layer.h b/cc/layers/painted_scrollbar_layer.h index 8a621e3..950c165 100644 --- a/cc/layers/painted_scrollbar_layer.h +++ b/cc/layers/painted_scrollbar_layer.h @@ -19,37 +19,36 @@ class ScrollbarThemeComposite; class CC_EXPORT PaintedScrollbarLayer : public ScrollbarLayerInterface, public ContentsScalingLayer { public: - virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) - override; + scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; static scoped_refptr<PaintedScrollbarLayer> Create( scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id); - virtual bool OpacityCanAnimateOnImplThread() const override; - virtual ScrollbarLayerInterface* ToScrollbarLayer() override; + bool OpacityCanAnimateOnImplThread() const override; + ScrollbarLayerInterface* ToScrollbarLayer() override; // ScrollbarLayerInterface - virtual int ScrollLayerId() const override; - virtual void SetScrollLayer(int layer_id) override; - virtual void SetClipLayer(int layer_id) override; + int ScrollLayerId() const override; + void SetScrollLayer(int layer_id) override; + void SetClipLayer(int layer_id) override; - virtual ScrollbarOrientation orientation() const override; + ScrollbarOrientation orientation() const override; // Layer interface - virtual bool Update(ResourceUpdateQueue* queue, - const OcclusionTracker<Layer>* occlusion) override; - virtual void SetLayerTreeHost(LayerTreeHost* host) override; - virtual void PushPropertiesTo(LayerImpl* layer) override; - virtual void PushScrollClipPropertiesTo(LayerImpl* layer) override; - virtual void CalculateContentsScale(float ideal_contents_scale, - float* contents_scale_x, - float* contents_scale_y, - gfx::Size* content_bounds) override; + bool Update(ResourceUpdateQueue* queue, + const OcclusionTracker<Layer>* occlusion) override; + void SetLayerTreeHost(LayerTreeHost* host) override; + void PushPropertiesTo(LayerImpl* layer) override; + void PushScrollClipPropertiesTo(LayerImpl* layer) override; + void CalculateContentsScale(float ideal_contents_scale, + float* contents_scale_x, + float* contents_scale_y, + gfx::Size* content_bounds) override; protected: PaintedScrollbarLayer(scoped_ptr<Scrollbar> scrollbar, int scroll_layer_id); - virtual ~PaintedScrollbarLayer(); + ~PaintedScrollbarLayer() override; // For unit tests UIResourceId track_resource_id() { |