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/tiled_layer_impl.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/tiled_layer_impl.h')
-rw-r--r-- | cc/layers/tiled_layer_impl.h | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/cc/layers/tiled_layer_impl.h b/cc/layers/tiled_layer_impl.h index fb6502c..e3ace34 100644 --- a/cc/layers/tiled_layer_impl.h +++ b/cc/layers/tiled_layer_impl.h @@ -20,20 +20,19 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl { static scoped_ptr<TiledLayerImpl> Create(LayerTreeImpl* tree_impl, int id) { return make_scoped_ptr(new TiledLayerImpl(tree_impl, id)); } - virtual ~TiledLayerImpl(); + ~TiledLayerImpl() override; - 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 void GetContentsResourceId(ResourceProvider::ResourceId* resource_id, - gfx::Size* resource_size) const override; + void GetContentsResourceId(ResourceProvider::ResourceId* resource_id, + gfx::Size* resource_size) const override; void set_skips_draw(bool skips_draw) { skips_draw_ = skips_draw; } void SetTilingData(const LayerTilingData& tiler); @@ -43,12 +42,12 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl { bool contents_swizzled); void PushInvalidTile(int i, int j); - virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const override; - virtual void ReleaseResources() override; + SimpleEnclosedRegion VisibleContentOpaqueRegion() const override; + void ReleaseResources() override; const LayerTilingData* TilingForTesting() const { return tiler_.get(); } - virtual size_t GPUMemoryUsageInBytes() const override; + size_t GPUMemoryUsageInBytes() const override; protected: TiledLayerImpl(LayerTreeImpl* tree_impl, int id); @@ -56,12 +55,11 @@ class CC_EXPORT TiledLayerImpl : public LayerImpl { bool HasTileAt(int i, int j) const; bool HasResourceIdForTileAt(int i, int j) const; - virtual void GetDebugBorderProperties(SkColor* color, float* width) const - override; - virtual void AsValueInto(base::debug::TracedValue* dict) const override; + void GetDebugBorderProperties(SkColor* color, float* width) const override; + void AsValueInto(base::debug::TracedValue* dict) const override; private: - virtual const char* LayerTypeAsString() const override; + const char* LayerTypeAsString() const override; DrawableTile* TileAt(int i, int j) const; DrawableTile* CreateTile(int i, int j); |