Index: cc/test/tiled_layer_test_common.h |
diff --git a/cc/test/tiled_layer_test_common.h b/cc/test/tiled_layer_test_common.h |
index a54cb374626560b36129dfc7723fdcc7adc1a619..18b981797df6668c5e1ca1d95a7b0faf4813e16b 100644 |
--- a/cc/test/tiled_layer_test_common.h |
+++ b/cc/test/tiled_layer_test_common.h |
@@ -25,12 +25,12 @@ class FakeLayerUpdater : public LayerUpdater { |
public: |
Resource(FakeLayerUpdater* updater, |
scoped_ptr<PrioritizedResource> resource); |
- virtual ~Resource(); |
+ ~Resource() override; |
- virtual void Update(ResourceUpdateQueue* queue, |
- const gfx::Rect& source_rect, |
- const gfx::Vector2d& dest_offset, |
- bool partial_update) override; |
+ void Update(ResourceUpdateQueue* queue, |
+ const gfx::Rect& source_rect, |
+ const gfx::Vector2d& dest_offset, |
+ bool partial_update) override; |
private: |
FakeLayerUpdater* layer_; |
@@ -41,14 +41,14 @@ class FakeLayerUpdater : public LayerUpdater { |
FakeLayerUpdater(); |
- virtual scoped_ptr<LayerUpdater::Resource> CreateResource( |
+ scoped_ptr<LayerUpdater::Resource> CreateResource( |
PrioritizedResourceManager* resource) override; |
- virtual void PrepareToUpdate(const gfx::Size& content_size, |
- const gfx::Rect& paint_rect, |
- const gfx::Size& tile_size, |
- float contents_width_scale, |
- float contents_height_scale) override; |
+ void PrepareToUpdate(const gfx::Size& content_size, |
+ const gfx::Rect& paint_rect, |
+ const gfx::Size& tile_size, |
+ float contents_width_scale, |
+ float contents_height_scale) override; |
// Sets the rect to invalidate during the next call to PrepareToUpdate(). |
// After the next call to PrepareToUpdate() the rect is reset. |
void SetRectToInvalidate(const gfx::Rect& rect, FakeTiledLayer* layer); |
@@ -68,7 +68,7 @@ class FakeLayerUpdater : public LayerUpdater { |
void Update() { update_count_++; } |
protected: |
- virtual ~FakeLayerUpdater(); |
+ ~FakeLayerUpdater() override; |
private: |
int prepare_count_; |
@@ -84,7 +84,7 @@ class FakeLayerUpdater : public LayerUpdater { |
class FakeTiledLayerImpl : public TiledLayerImpl { |
public: |
FakeTiledLayerImpl(LayerTreeImpl* tree_impl, int id); |
- virtual ~FakeTiledLayerImpl(); |
+ ~FakeTiledLayerImpl() override; |
using TiledLayerImpl::HasTileAt; |
using TiledLayerImpl::HasResourceIdForTileAt; |
@@ -102,15 +102,15 @@ class FakeTiledLayer : public TiledLayer { |
using TiledLayer::NumPaintedTiles; |
using TiledLayer::IdlePaintRect; |
- virtual void SetNeedsDisplayRect(const gfx::Rect& rect) override; |
+ void SetNeedsDisplayRect(const gfx::Rect& rect) override; |
const gfx::Rect& last_needs_display_rect() const { |
return last_needs_display_rect_; |
} |
- virtual void SetTexturePriorities( |
+ void SetTexturePriorities( |
const PriorityCalculator& priority_calculator) override; |
- virtual PrioritizedResourceManager* ResourceManager() override; |
+ PrioritizedResourceManager* ResourceManager() override; |
FakeLayerUpdater* fake_layer_updater() { return fake_updater_.get(); } |
gfx::RectF update_rect() { return update_rect_; } |
@@ -120,9 +120,9 @@ class FakeTiledLayer : public TiledLayer { |
void ResetNumDependentsNeedPushProperties(); |
protected: |
- virtual LayerUpdater* Updater() const override; |
- virtual void CreateUpdaterIfNeeded() override {} |
- virtual ~FakeTiledLayer(); |
+ LayerUpdater* Updater() const override; |
+ void CreateUpdaterIfNeeded() override {} |
+ ~FakeTiledLayer() override; |
private: |
scoped_refptr<FakeLayerUpdater> fake_updater_; |
@@ -138,13 +138,13 @@ class FakeTiledLayerWithScaledBounds : public FakeTiledLayer { |
PrioritizedResourceManager* resource_manager); |
void SetContentBounds(const gfx::Size& content_bounds); |
- virtual void CalculateContentsScale(float ideal_contents_scale, |
- float* contents_scale_x, |
- float* contents_scale_y, |
- gfx::Size* content_bounds) override; |
+ void CalculateContentsScale(float ideal_contents_scale, |
+ float* contents_scale_x, |
+ float* contents_scale_y, |
+ gfx::Size* content_bounds) override; |
protected: |
- virtual ~FakeTiledLayerWithScaledBounds(); |
+ ~FakeTiledLayerWithScaledBounds() override; |
gfx::Size forced_content_bounds_; |
private: |