diff options
| author | dcheng <dcheng@chromium.org> | 2014-10-21 02:51:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 09:51:37 +0000 |
| commit | 716bedf160f4c4c1945cab54c3f490424a0eb779 (patch) | |
| tree | c9592751a48527e3278a8a1e001b0569c97ff1d5 /cc/layers/ui_resource_layer.h | |
| parent | 6c879fbd35d14af9ca4fe53bc622edac2d3fd5f1 (diff) | |
| download | chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.zip chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.gz chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.bz2 | |
Standardize usage of virtual/override/final in cc/
BUG=417463
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/645853008
Cr-Commit-Position: refs/heads/master@{#300439}
Diffstat (limited to 'cc/layers/ui_resource_layer.h')
| -rw-r--r-- | cc/layers/ui_resource_layer.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/cc/layers/ui_resource_layer.h b/cc/layers/ui_resource_layer.h index f79389b..e22318c 100644 --- a/cc/layers/ui_resource_layer.h +++ b/cc/layers/ui_resource_layer.h @@ -20,9 +20,9 @@ class CC_EXPORT UIResourceLayer : public Layer { public: static scoped_refptr<UIResourceLayer> Create(); - virtual void PushPropertiesTo(LayerImpl* layer) override; + void PushPropertiesTo(LayerImpl* layer) override; - virtual void SetLayerTreeHost(LayerTreeHost* host) override; + void SetLayerTreeHost(LayerTreeHost* host) override; void SetBitmap(const SkBitmap& skbitmap); @@ -47,9 +47,9 @@ class CC_EXPORT UIResourceLayer : public Layer { protected: UIResourceLayer(); - virtual ~UIResourceLayer(); + ~UIResourceLayer() override; - virtual bool HasDrawableContent() const override; + bool HasDrawableContent() const override; scoped_ptr<UIResourceHolder> ui_resource_holder_; SkBitmap bitmap_; @@ -59,8 +59,7 @@ class CC_EXPORT UIResourceLayer : public Layer { float vertex_opacity_[4]; private: - virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) - override; + scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl) override; void RecreateUIResourceHolder(); |