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

Unified Diff: cc/output/delegating_renderer_unittest.cc

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/output/delegating_renderer.h ('k') | cc/output/direct_renderer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/delegating_renderer_unittest.cc
diff --git a/cc/output/delegating_renderer_unittest.cc b/cc/output/delegating_renderer_unittest.cc
index 48bacd5b76e5825f811008c13e01578e51409999..4c9deb211effbf0eaa6689437e68377e0a34e021 100644
--- a/cc/output/delegating_renderer_unittest.cc
+++ b/cc/output/delegating_renderer_unittest.cc
@@ -18,7 +18,7 @@ class DelegatingRendererTest : public LayerTreeTest {
virtual ~DelegatingRendererTest() {}
virtual scoped_ptr<OutputSurface> CreateOutputSurface(bool fallback)
- OVERRIDE {
+ override {
scoped_ptr<FakeOutputSurface> output_surface =
FakeOutputSurface::CreateDelegating3d();
output_surface_ = output_surface.get();
@@ -32,17 +32,17 @@ class DelegatingRendererTest : public LayerTreeTest {
class DelegatingRendererTestDraw : public DelegatingRendererTest {
public:
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.5f, 4.f);
PostSetNeedsCommitToMainThread();
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
virtual DrawResult PrepareToDrawOnThread(
LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame,
- DrawResult draw_result) OVERRIDE {
+ DrawResult draw_result) override {
EXPECT_EQ(0u, output_surface_->num_sent_frames());
const CompositorFrame& last_frame = output_surface_->last_sent_frame();
@@ -53,12 +53,12 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest {
return DRAW_SUCCESS;
}
- virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
EXPECT_EQ(0u, output_surface_->num_sent_frames());
}
virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
- bool result) OVERRIDE {
+ bool result) override {
EXPECT_TRUE(result);
EXPECT_EQ(1u, output_surface_->num_sent_frames());
@@ -83,15 +83,15 @@ SINGLE_AND_MULTI_THREAD_DELEGATING_RENDERER_TEST_F(DelegatingRendererTestDraw);
class DelegatingRendererTestResources : public DelegatingRendererTest {
public:
- virtual void BeginTest() OVERRIDE {
+ virtual void BeginTest() override {
PostSetNeedsCommitToMainThread();
}
- virtual void AfterTest() OVERRIDE {}
+ virtual void AfterTest() override {}
virtual DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
LayerTreeHostImpl::FrameData* frame,
- DrawResult draw_result) OVERRIDE {
+ DrawResult draw_result) override {
frame->render_passes.clear();
frame->render_passes_by_id.clear();
@@ -111,12 +111,12 @@ class DelegatingRendererTestResources : public DelegatingRendererTest {
return draw_result;
}
- virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
+ virtual void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
EXPECT_EQ(0u, output_surface_->num_sent_frames());
}
virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
- bool result) OVERRIDE {
+ bool result) override {
EXPECT_TRUE(result);
EXPECT_EQ(1u, output_surface_->num_sent_frames());
« no previous file with comments | « cc/output/delegating_renderer.h ('k') | cc/output/direct_renderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698