diff options
29 files changed, 44 insertions, 45 deletions
diff --git a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc index 4c8b49b..2295124 100644 --- a/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc +++ b/cc/animation/scrollbar_animation_controller_linear_fade_unittest.cc @@ -30,7 +30,7 @@ class ScrollbarAnimationControllerLinearFadeTest void SetNeedsScrollbarAnimationFrame() override { needs_frame_count_++; } protected: - virtual void SetUp() { + void SetUp() override { const int kThumbThickness = 10; const int kTrackStart = 0; const bool kIsLeftSideVerticalScrollbar = false; diff --git a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc index 74e9517..04036ba 100644 --- a/cc/animation/scrollbar_animation_controller_thinning_unittest.cc +++ b/cc/animation/scrollbar_animation_controller_thinning_unittest.cc @@ -29,7 +29,7 @@ class ScrollbarAnimationControllerThinningTest void SetNeedsScrollbarAnimationFrame() override {} protected: - virtual void SetUp() { + void SetUp() override { scoped_ptr<LayerImpl> scroll_layer = LayerImpl::Create(host_impl_.active_tree(), 1); clip_layer_ = LayerImpl::Create(host_impl_.active_tree(), 3); diff --git a/cc/input/scroll_elasticity_helper.cc b/cc/input/scroll_elasticity_helper.cc index 7065e86..e5bbe2b 100644 --- a/cc/input/scroll_elasticity_helper.cc +++ b/cc/input/scroll_elasticity_helper.cc @@ -13,7 +13,7 @@ namespace cc { class ScrollElasticityHelperImpl : public ScrollElasticityHelper { public: explicit ScrollElasticityHelperImpl(LayerTreeHostImpl* layer_tree_host_impl); - virtual ~ScrollElasticityHelperImpl(); + ~ScrollElasticityHelperImpl() override; // The amount that the view is stretched past the normal allowable bounds. // The "overhang" amount. diff --git a/cc/layers/nine_patch_layer_unittest.cc b/cc/layers/nine_patch_layer_unittest.cc index 587fb07..1783ba9 100644 --- a/cc/layers/nine_patch_layer_unittest.cc +++ b/cc/layers/nine_patch_layer_unittest.cc @@ -34,11 +34,11 @@ class NinePatchLayerTest : public testing::Test { NinePatchLayerTest() : fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {} protected: - virtual void SetUp() { + void SetUp() override { layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_); } - virtual void TearDown() { + void TearDown() override { Mock::VerifyAndClearExpectations(layer_tree_host_.get()); } diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index ceac16d..695ccd2 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -86,8 +86,7 @@ class PictureLayerImplTest : public testing::Test { host_impl_.SetViewportSize(gfx::Size(10000, 10000)); } - virtual ~PictureLayerImplTest() { - } + ~PictureLayerImplTest() override {} void SetUp() override { InitializeRenderer(); } diff --git a/cc/layers/surface_layer_unittest.cc b/cc/layers/surface_layer_unittest.cc index 436eadc..f6e1eb6 100644 --- a/cc/layers/surface_layer_unittest.cc +++ b/cc/layers/surface_layer_unittest.cc @@ -29,12 +29,12 @@ class SurfaceLayerTest : public testing::Test { FakeLayerTreeHostClient(FakeLayerTreeHostClient::DIRECT_3D)) {} protected: - virtual void SetUp() { + void SetUp() override { layer_tree_host_ = FakeLayerTreeHost::Create(&fake_client_); layer_tree_host_->SetViewportSize(gfx::Size(10, 10)); } - virtual void TearDown() { + void TearDown() override { if (layer_tree_host_) { layer_tree_host_->SetRootLayer(nullptr); layer_tree_host_ = nullptr; diff --git a/cc/layers/texture_layer_unittest.cc b/cc/layers/texture_layer_unittest.cc index f2dbb33..33291be 100644 --- a/cc/layers/texture_layer_unittest.cc +++ b/cc/layers/texture_layer_unittest.cc @@ -176,14 +176,14 @@ class TextureLayerTest : public testing::Test { test_data_(&shared_bitmap_manager_) {} protected: - virtual void SetUp() { + void SetUp() override { layer_tree_host_.reset(new MockLayerTreeHost(&fake_client_)); EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AnyNumber()); layer_tree_host_->SetViewportSize(gfx::Size(10, 10)); Mock::VerifyAndClearExpectations(layer_tree_host_.get()); } - virtual void TearDown() { + void TearDown() override { Mock::VerifyAndClearExpectations(layer_tree_host_.get()); EXPECT_CALL(*layer_tree_host_, SetNeedsCommit()).Times(AnyNumber()); @@ -303,7 +303,7 @@ class TestMailboxHolder : public TextureLayer::TextureMailboxHolder { class TextureLayerWithMailboxTest : public TextureLayerTest { protected: - virtual void TearDown() { + void TearDown() override { Mock::VerifyAndClearExpectations(&test_data_.mock_callback_); EXPECT_CALL(test_data_.mock_callback_, Release(test_data_.mailbox_name1_, @@ -929,7 +929,7 @@ class TextureLayerImplWithMailboxTest : public TextureLayerTest { : fake_client_( FakeLayerTreeHostClient(FakeLayerTreeHostClient::DIRECT_3D)) {} - virtual void SetUp() { + void SetUp() override { TextureLayerTest::SetUp(); layer_tree_host_.reset(new MockLayerTreeHost(&fake_client_)); EXPECT_TRUE(host_impl_.InitializeRenderer(FakeOutputSurface::Create3d())); diff --git a/cc/layers/tiled_layer_unittest.cc b/cc/layers/tiled_layer_unittest.cc index 4b9430d..03d9b19a 100644 --- a/cc/layers/tiled_layer_unittest.cc +++ b/cc/layers/tiled_layer_unittest.cc @@ -119,7 +119,7 @@ class TiledLayerTest : public testing::Test { new FakeLayerTreeHostImpl(proxy_, shared_bitmap_manager_.get())); } - virtual ~TiledLayerTest() { + ~TiledLayerTest() override { ResourceManagerClearAllMemory(resource_manager_.get(), resource_provider_.get()); diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc index b72c76b..3238d2d 100644 --- a/cc/output/delegating_renderer_unittest.cc +++ b/cc/output/delegating_renderer_unittest.cc @@ -15,7 +15,7 @@ namespace cc { class DelegatingRendererTest : public LayerTreeTest { public: DelegatingRendererTest() : LayerTreeTest(), output_surface_(NULL) {} - virtual ~DelegatingRendererTest() {} + ~DelegatingRendererTest() override {} scoped_ptr<OutputSurface> CreateOutputSurface() override { scoped_ptr<FakeOutputSurface> output_surface = diff --git a/cc/output/overlay_unittest.cc b/cc/output/overlay_unittest.cc index c98b3e8..8fa35cb 100644 --- a/cc/output/overlay_unittest.cc +++ b/cc/output/overlay_unittest.cc @@ -257,7 +257,7 @@ TEST(OverlayTest, OverlaysProcessorHasStrategy) { class SingleOverlayOnTopTest : public testing::Test { protected: - virtual void SetUp() { + void SetUp() override { provider_ = TestContextProvider::Create(); output_surface_.reset(new OverlayOutputSurface(provider_)); EXPECT_TRUE(output_surface_->BindToClient(&client_)); diff --git a/cc/resources/clip_display_item.h b/cc/resources/clip_display_item.h index 55c1ffd..2060393 100644 --- a/cc/resources/clip_display_item.h +++ b/cc/resources/clip_display_item.h @@ -20,7 +20,7 @@ namespace cc { class CC_EXPORT ClipDisplayItem : public DisplayItem { public: - virtual ~ClipDisplayItem(); + ~ClipDisplayItem() override; static scoped_ptr<ClipDisplayItem> Create( gfx::Rect clip_rect, @@ -45,7 +45,7 @@ class CC_EXPORT ClipDisplayItem : public DisplayItem { class CC_EXPORT EndClipDisplayItem : public DisplayItem { public: - virtual ~EndClipDisplayItem(); + ~EndClipDisplayItem() override; static scoped_ptr<EndClipDisplayItem> Create() { return make_scoped_ptr(new EndClipDisplayItem()); diff --git a/cc/resources/drawing_display_item.h b/cc/resources/drawing_display_item.h index 544e4eb..5723dc4 100644 --- a/cc/resources/drawing_display_item.h +++ b/cc/resources/drawing_display_item.h @@ -19,7 +19,7 @@ namespace cc { class CC_EXPORT DrawingDisplayItem : public DisplayItem { public: - virtual ~DrawingDisplayItem(); + ~DrawingDisplayItem() override; static scoped_ptr<DrawingDisplayItem> Create(skia::RefPtr<SkPicture> picture, gfx::PointF location) { diff --git a/cc/resources/filter_display_item.h b/cc/resources/filter_display_item.h index 4c1b265..a4ac8c7 100644 --- a/cc/resources/filter_display_item.h +++ b/cc/resources/filter_display_item.h @@ -19,7 +19,7 @@ namespace cc { class CC_EXPORT FilterDisplayItem : public DisplayItem { public: - virtual ~FilterDisplayItem(); + ~FilterDisplayItem() override; static scoped_ptr<FilterDisplayItem> Create( skia::RefPtr<SkImageFilter> filter, @@ -43,7 +43,7 @@ class CC_EXPORT FilterDisplayItem : public DisplayItem { class CC_EXPORT EndFilterDisplayItem : public DisplayItem { public: - virtual ~EndFilterDisplayItem(); + ~EndFilterDisplayItem() override; static scoped_ptr<EndFilterDisplayItem> Create() { return make_scoped_ptr(new EndFilterDisplayItem()); diff --git a/cc/resources/picture_layer_tiling_unittest.cc b/cc/resources/picture_layer_tiling_unittest.cc index 3ebcc50..70e0bd8 100644 --- a/cc/resources/picture_layer_tiling_unittest.cc +++ b/cc/resources/picture_layer_tiling_unittest.cc @@ -76,7 +76,7 @@ class TestablePictureLayerTiling : public PictureLayerTiling { class PictureLayerTilingIteratorTest : public testing::Test { public: PictureLayerTilingIteratorTest() {} - virtual ~PictureLayerTilingIteratorTest() {} + ~PictureLayerTilingIteratorTest() override {} void Initialize(const gfx::Size& tile_size, float contents_scale, diff --git a/cc/resources/prioritized_resource_unittest.cc b/cc/resources/prioritized_resource_unittest.cc index 8869e70..f08af8b 100644 --- a/cc/resources/prioritized_resource_unittest.cc +++ b/cc/resources/prioritized_resource_unittest.cc @@ -37,7 +37,7 @@ class PrioritizedResourceTest : public testing::Test { 1); } - virtual ~PrioritizedResourceTest() { + ~PrioritizedResourceTest() override { DebugScopedSetImplThread impl_thread(&proxy_); resource_provider_ = nullptr; } diff --git a/cc/resources/resource_update_controller_unittest.cc b/cc/resources/resource_update_controller_unittest.cc index d6b4f39..1aa0902 100644 --- a/cc/resources/resource_update_controller_unittest.cc +++ b/cc/resources/resource_update_controller_unittest.cc @@ -66,7 +66,7 @@ class ResourceUpdateControllerTest : public Test { num_total_uploads_(0), num_total_flushes_(0) {} - virtual ~ResourceUpdateControllerTest() { + ~ResourceUpdateControllerTest() override { DebugScopedSetImplThreadAndMainThreadBlocked impl_thread_and_main_thread_blocked(&proxy_); resource_manager_->ClearAllMemory(resource_provider_.get()); @@ -106,7 +106,7 @@ class ResourceUpdateControllerTest : public Test { } protected: - virtual void SetUp() { + void SetUp() override { bitmap_.allocN32Pixels(300, 150); for (int i = 0; i < 4; i++) { diff --git a/cc/resources/transform_display_item.h b/cc/resources/transform_display_item.h index 1671f49..075c03a 100644 --- a/cc/resources/transform_display_item.h +++ b/cc/resources/transform_display_item.h @@ -17,7 +17,7 @@ namespace cc { class CC_EXPORT TransformDisplayItem : public DisplayItem { public: - virtual ~TransformDisplayItem(); + ~TransformDisplayItem() override; static scoped_ptr<TransformDisplayItem> Create( const gfx::Transform& transform) { @@ -39,7 +39,7 @@ class CC_EXPORT TransformDisplayItem : public DisplayItem { class CC_EXPORT EndTransformDisplayItem : public DisplayItem { public: - virtual ~EndTransformDisplayItem(); + ~EndTransformDisplayItem() override; static scoped_ptr<EndTransformDisplayItem> Create() { return make_scoped_ptr(new EndTransformDisplayItem()); diff --git a/cc/resources/transparency_display_item.h b/cc/resources/transparency_display_item.h index 6766d91..d5417bc 100644 --- a/cc/resources/transparency_display_item.h +++ b/cc/resources/transparency_display_item.h @@ -19,7 +19,7 @@ namespace cc { class CC_EXPORT TransparencyDisplayItem : public DisplayItem { public: - virtual ~TransparencyDisplayItem(); + ~TransparencyDisplayItem() override; static scoped_ptr<TransparencyDisplayItem> Create( float opacity, @@ -43,7 +43,7 @@ class CC_EXPORT TransparencyDisplayItem : public DisplayItem { class CC_EXPORT EndTransparencyDisplayItem : public DisplayItem { public: - virtual ~EndTransparencyDisplayItem(); + ~EndTransparencyDisplayItem() override; static scoped_ptr<EndTransparencyDisplayItem> Create() { return make_scoped_ptr(new EndTransparencyDisplayItem()); diff --git a/cc/scheduler/scheduler_unittest.cc b/cc/scheduler/scheduler_unittest.cc index 80d54d2..ea2b874 100644 --- a/cc/scheduler/scheduler_unittest.cc +++ b/cc/scheduler/scheduler_unittest.cc @@ -59,7 +59,7 @@ class FakeSchedulerClient : public SchedulerClient { public: explicit FakeExternalBeginFrameSource(FakeSchedulerClient* client) : client_(client) {} - virtual ~FakeExternalBeginFrameSource() {} + ~FakeExternalBeginFrameSource() override {} void OnNeedsBeginFramesChange(bool needs_begin_frames) override { if (needs_begin_frames) { diff --git a/cc/surfaces/surface_aggregator_unittest.cc b/cc/surfaces/surface_aggregator_unittest.cc index 459da80..1dff7ec 100644 --- a/cc/surfaces/surface_aggregator_unittest.cc +++ b/cc/surfaces/surface_aggregator_unittest.cc @@ -69,13 +69,13 @@ class SurfaceAggregatorValidSurfaceTest : public SurfaceAggregatorTest { public: SurfaceAggregatorValidSurfaceTest() : allocator_(1u), child_allocator_(2u) {} - virtual void SetUp() { + void SetUp() override { SurfaceAggregatorTest::SetUp(); root_surface_id_ = allocator_.GenerateId(); factory_.Create(root_surface_id_); } - virtual void TearDown() { + void TearDown() override { factory_.Destroy(root_surface_id_); SurfaceAggregatorTest::TearDown(); } @@ -1220,7 +1220,7 @@ TEST_F(SurfaceAggregatorValidSurfaceTest, AggregateDamageRect) { class SurfaceAggregatorWithResourcesTest : public testing::Test { public: - virtual void SetUp() { + void SetUp() override { output_surface_ = FakeOutputSurface::CreateSoftware( make_scoped_ptr(new SoftwareOutputDevice)); output_surface_->BindToClient(&output_surface_client_); diff --git a/cc/surfaces/surface_factory_unittest.cc b/cc/surfaces/surface_factory_unittest.cc index 1a87c0f..9d38689 100644 --- a/cc/surfaces/surface_factory_unittest.cc +++ b/cc/surfaces/surface_factory_unittest.cc @@ -43,7 +43,7 @@ class SurfaceFactoryTest : public testing::Test { factory_.Create(surface_id_); } - virtual ~SurfaceFactoryTest() { + ~SurfaceFactoryTest() override { if (!surface_id_.is_null()) factory_.Destroy(surface_id_); } diff --git a/cc/test/fake_external_begin_frame_source.h b/cc/test/fake_external_begin_frame_source.h index 9262dd2..d5b14e7 100644 --- a/cc/test/fake_external_begin_frame_source.h +++ b/cc/test/fake_external_begin_frame_source.h @@ -15,7 +15,7 @@ class FakeExternalBeginFrameSource public NON_EXPORTED_BASE(base::NonThreadSafe) { public: explicit FakeExternalBeginFrameSource(double refresh_rate); - virtual ~FakeExternalBeginFrameSource(); + ~FakeExternalBeginFrameSource() override; bool is_ready() const { return is_ready_; } diff --git a/cc/test/layer_tree_pixel_test.h b/cc/test/layer_tree_pixel_test.h index 60ea727..91081f8 100644 --- a/cc/test/layer_tree_pixel_test.h +++ b/cc/test/layer_tree_pixel_test.h @@ -38,7 +38,7 @@ class LayerTreePixelTest : public LayerTreeTest { protected: LayerTreePixelTest(); - virtual ~LayerTreePixelTest(); + ~LayerTreePixelTest() override; scoped_ptr<OutputSurface> CreateOutputSurface() override; void CommitCompleteOnThread(LayerTreeHostImpl* impl) override; diff --git a/cc/test/layer_tree_test.h b/cc/test/layer_tree_test.h index e071f34..3fae7b7 100644 --- a/cc/test/layer_tree_test.h +++ b/cc/test/layer_tree_test.h @@ -132,7 +132,7 @@ class TimeoutTask; // thread, but be aware that ending the test is an asynchronous process. class LayerTreeTest : public testing::Test, public TestHooks { public: - virtual ~LayerTreeTest(); + ~LayerTreeTest() override; virtual void EndTest(); void EndTestAfterDelayMs(int delay_milliseconds); diff --git a/cc/test/ordered_simple_task_runner_unittest.cc b/cc/test/ordered_simple_task_runner_unittest.cc index 8cafa16..568cbb5 100644 --- a/cc/test/ordered_simple_task_runner_unittest.cc +++ b/cc/test/ordered_simple_task_runner_unittest.cc @@ -59,7 +59,7 @@ class OrderedSimpleTaskRunnerTest : public testing::Test { : now_src_(TestNowSource::Create(base::TimeTicks())) { task_runner_ = new OrderedSimpleTaskRunner(now_src_, true); } - virtual ~OrderedSimpleTaskRunnerTest() {} + ~OrderedSimpleTaskRunnerTest() override {} protected: std::string executed_tasks_; diff --git a/cc/test/pixel_test.h b/cc/test/pixel_test.h index 3c5350c..78b8f4a 100644 --- a/cc/test/pixel_test.h +++ b/cc/test/pixel_test.h @@ -27,7 +27,7 @@ class TestSharedBitmapManager; class PixelTest : public testing::Test, RendererClient { protected: PixelTest(); - virtual ~PixelTest(); + ~PixelTest() override; bool RunPixelTest(RenderPassList* pass_list, const base::FilePath& ref_file, diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc index 72eb287..01941c1 100644 --- a/cc/trees/layer_tree_host_common_unittest.cc +++ b/cc/trees/layer_tree_host_common_unittest.cc @@ -5672,7 +5672,7 @@ class LCDTextTest : public LayerTreeHostCommonTestBase, public testing::TestWithParam<LCDTextTestParam> { protected: - virtual void SetUp() { + void SetUp() override { can_use_lcd_text_ = std::tr1::get<0>(GetParam()); layers_always_allowed_lcd_text_ = std::tr1::get<1>(GetParam()); diff --git a/cc/trees/layer_tree_host_unittest_no_message_loop.cc b/cc/trees/layer_tree_host_unittest_no_message_loop.cc index 102e8ac..3e87b55 100644 --- a/cc/trees/layer_tree_host_unittest_no_message_loop.cc +++ b/cc/trees/layer_tree_host_unittest_no_message_loop.cc @@ -51,7 +51,7 @@ class LayerTreeHostNoMessageLoopTest did_commit_and_draw_frame_(false), size_(100, 100), no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} - virtual ~LayerTreeHostNoMessageLoopTest() {} + ~LayerTreeHostNoMessageLoopTest() override {} // LayerTreeHostClient overrides. void WillBeginMainFrame(int frame_id) override {} diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc index f27b553..3135103 100644 --- a/cc/trees/layer_tree_host_unittest_proxy.cc +++ b/cc/trees/layer_tree_host_unittest_proxy.cc @@ -28,7 +28,7 @@ namespace cc { class ProxyTest : public LayerTreeTest { protected: ProxyTest() {} - virtual ~ProxyTest() {} + ~ProxyTest() override {} void Run(bool threaded, bool impl_side_painting) { // We don't need to care about delegating mode. @@ -67,7 +67,7 @@ class ProxyTestScheduledActionsBasic : public ProxyTest { ProxyTestScheduledActionsBasic() : action_phase_(0) { } - virtual ~ProxyTestScheduledActionsBasic() {} + ~ProxyTestScheduledActionsBasic() override {} private: int action_phase_; @@ -80,7 +80,7 @@ PROXY_TEST_SCHEDULED_ACTION(ProxyTestScheduledActionsBasic); class ThreadProxyTest : public ProxyTest { protected: ThreadProxyTest() {} - virtual ~ThreadProxyTest() {} + ~ThreadProxyTest() override {} const ThreadProxy::MainThreadOnly& ThreadProxyMainOnly() const { DCHECK(proxy()); @@ -101,7 +101,7 @@ class ThreadProxyTest : public ProxyTest { class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { protected: ThreadProxyTestSetNeedsCommit() {} - virtual ~ThreadProxyTestSetNeedsCommit() {} + ~ThreadProxyTestSetNeedsCommit() override {} void BeginTest() override { EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); |