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

Unified Diff: ui/aura/bench/bench_main.cc

Issue 684483002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | ui/aura/client/default_capture_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index 4704f7b214c0ab41dad4028e5530c39398f6f43e..ebf3131bdf5df04b0cacbf5a8e421779374c2e37 100644
--- a/ui/aura/bench/bench_main.cc
+++ b/ui/aura/bench/bench_main.cc
@@ -57,22 +57,20 @@ class ColoredLayer : public Layer, public LayerDelegate {
set_delegate(this);
}
- virtual ~ColoredLayer() {}
+ ~ColoredLayer() override {}
// Overridden from LayerDelegate:
- virtual void OnPaintLayer(gfx::Canvas* canvas) override {
+ void OnPaintLayer(gfx::Canvas* canvas) override {
if (draw_) {
canvas->DrawColor(color_);
}
}
- virtual void OnDelegatedFrameDamage(
- const gfx::Rect& damage_rect_in_dip) override {}
+ void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {
- }
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
- virtual base::Closure PrepareForLayerBoundsChange() override {
+ base::Closure PrepareForLayerBoundsChange() override {
return base::Closure();
}
@@ -97,12 +95,12 @@ class BenchCompositorObserver : public ui::CompositorObserver {
max_frames_(max_frames) {
}
- virtual void OnCompositingDidCommit(ui::Compositor* compositor) override {}
+ void OnCompositingDidCommit(ui::Compositor* compositor) override {}
- virtual void OnCompositingStarted(Compositor* compositor,
- base::TimeTicks start_time) override {}
+ void OnCompositingStarted(Compositor* compositor,
+ base::TimeTicks start_time) override {}
- virtual void OnCompositingEnded(Compositor* compositor) override {
+ void OnCompositingEnded(Compositor* compositor) override {
if (start_time_.is_null()) {
start_time_ = TimeTicks::Now();
} else {
@@ -121,10 +119,9 @@ class BenchCompositorObserver : public ui::CompositorObserver {
}
}
- virtual void OnCompositingAborted(Compositor* compositor) override {}
+ void OnCompositingAborted(Compositor* compositor) override {}
- virtual void OnCompositingLockStateChanged(
- Compositor* compositor) override {}
+ void OnCompositingLockStateChanged(Compositor* compositor) override {}
virtual void Draw() {}
@@ -222,14 +219,14 @@ class WebGLBench : public BenchCompositorObserver {
compositor->AddObserver(this);
}
- virtual ~WebGLBench() {
+ ~WebGLBench() override {
webgl_.SetShowSolidColorContent();
gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
gl->DeleteFramebuffers(1, &fbo_);
compositor_->RemoveObserver(this);
}
- virtual void Draw() override {
+ void Draw() override {
if (do_draw_) {
gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
gl->ClearColor((frames() % kFrames)*1.0/kFrames, 1.f, 0.f, 1.f);
@@ -269,11 +266,9 @@ class SoftwareScrollBench : public BenchCompositorObserver {
!CommandLine::ForCurrentProcess()->HasSwitch("disable-draw"));
}
- virtual ~SoftwareScrollBench() {
- compositor_->RemoveObserver(this);
- }
+ ~SoftwareScrollBench() override { compositor_->RemoveObserver(this); }
- virtual void Draw() override {
+ void Draw() override {
layer_->set_color(
SkColorSetARGBInline(255*(frames() % kFrames)/kFrames, 255, 0, 255));
layer_->SchedulePaint(gfx::Rect(layer_->bounds().size()));
« no previous file with comments | « no previous file | ui/aura/client/default_capture_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698