summaryrefslogtreecommitdiffstats
path: root/cc/layers/ui_resource_layer_impl.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 02:51:08 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 09:51:37 +0000
commit716bedf160f4c4c1945cab54c3f490424a0eb779 (patch)
treec9592751a48527e3278a8a1e001b0569c97ff1d5 /cc/layers/ui_resource_layer_impl.h
parent6c879fbd35d14af9ca4fe53bc622edac2d3fd5f1 (diff)
downloadchromium_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_impl.h')
-rw-r--r--cc/layers/ui_resource_layer_impl.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/cc/layers/ui_resource_layer_impl.h b/cc/layers/ui_resource_layer_impl.h
index a0cb6ec..515a0f1 100644
--- a/cc/layers/ui_resource_layer_impl.h
+++ b/cc/layers/ui_resource_layer_impl.h
@@ -26,7 +26,7 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl {
int id) {
return make_scoped_ptr(new UIResourceLayerImpl(tree_impl, id));
}
- virtual ~UIResourceLayerImpl();
+ ~UIResourceLayerImpl() override;
void SetUIResourceId(UIResourceId uid);
@@ -39,17 +39,16 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl {
// opacity value.
void SetVertexOpacity(const float vertex_opacity[4]);
- virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
- override;
- virtual void PushPropertiesTo(LayerImpl* layer) override;
+ scoped_ptr<LayerImpl> 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 Occlusion& occlusion_in_content_space,
- 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;
- virtual base::DictionaryValue* LayerTreeAsJson() const override;
+ base::DictionaryValue* LayerTreeAsJson() const override;
protected:
UIResourceLayerImpl(LayerTreeImpl* tree_impl, int id);
@@ -64,7 +63,7 @@ class CC_EXPORT UIResourceLayerImpl : public LayerImpl {
float vertex_opacity_[4];
private:
- virtual const char* LayerTypeAsString() const override;
+ const char* LayerTypeAsString() const override;
DISALLOW_COPY_AND_ASSIGN(UIResourceLayerImpl);
};