Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1864)

Unified Diff: cc/layers/tiled_layer.h

Issue 628443002: replace OVERRIDE and FINAL with override and final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/layers/tiled_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/tiled_layer.h
diff --git a/cc/layers/tiled_layer.h b/cc/layers/tiled_layer.h
index 9f482c834546e03632a9cd9e355cdaabbbb4af79..e8ac89b27d1a1c42f25813f4998ab37d7da73216 100644
--- a/cc/layers/tiled_layer.h
+++ b/cc/layers/tiled_layer.h
@@ -25,17 +25,17 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
};
// Layer implementation.
- virtual void SetIsMask(bool is_mask) OVERRIDE;
- virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
- virtual void ReduceMemoryUsage() OVERRIDE;
- virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
- virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE;
+ virtual void SetIsMask(bool is_mask) override;
+ virtual void PushPropertiesTo(LayerImpl* layer) override;
+ virtual void ReduceMemoryUsage() override;
+ virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) override;
+ virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) override;
virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
- OVERRIDE;
- virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const OVERRIDE;
+ override;
+ virtual SimpleEnclosedRegion VisibleContentOpaqueRegion() const override;
virtual bool Update(ResourceUpdateQueue* queue,
- const OcclusionTracker<Layer>* occlusion) OVERRIDE;
- virtual void OnOutputSurfaceCreated() OVERRIDE;
+ const OcclusionTracker<Layer>* occlusion) override;
+ virtual void OnOutputSurfaceCreated() override;
protected:
TiledLayer();
@@ -67,7 +67,7 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
bool SkipsDraw() const { return skips_draw_; }
- virtual bool HasDrawableContent() const OVERRIDE;
+ virtual bool HasDrawableContent() const override;
// Virtual for testing
virtual PrioritizedResourceManager* ResourceManager();
@@ -76,7 +76,7 @@ class CC_EXPORT TiledLayer : public ContentsScalingLayer {
private:
virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
- OVERRIDE;
+ override;
void CreateTilerIfNeeded();
void set_tiling_option(TilingOption tiling_option) {
« no previous file with comments | « cc/layers/texture_layer_unittest.cc ('k') | cc/layers/tiled_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698