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

Side by Side Diff: content/browser/compositor/software_browser_compositor_output_surface_unittest.cc

Issue 678073006: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix bogus formatting Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 #include "cc/output/compositor_frame.h" 6 #include "cc/output/compositor_frame.h"
7 #include "cc/test/fake_output_surface_client.h" 7 #include "cc/test/fake_output_surface_client.h"
8 #include "content/browser/compositor/browser_compositor_output_surface_proxy.h" 8 #include "content/browser/compositor/browser_compositor_output_surface_proxy.h"
9 #include "content/browser/compositor/software_browser_compositor_output_surface. h" 9 #include "content/browser/compositor/software_browser_compositor_output_surface. h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 scoped_ptr<gfx::VSyncProvider> vsync_provider_; 51 scoped_ptr<gfx::VSyncProvider> vsync_provider_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(FakeSoftwareOutputDevice); 53 DISALLOW_COPY_AND_ASSIGN(FakeSoftwareOutputDevice);
54 }; 54 };
55 55
56 } // namespace 56 } // namespace
57 57
58 class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test { 58 class SoftwareBrowserCompositorOutputSurfaceTest : public testing::Test {
59 public: 59 public:
60 SoftwareBrowserCompositorOutputSurfaceTest(); 60 SoftwareBrowserCompositorOutputSurfaceTest();
61 virtual ~SoftwareBrowserCompositorOutputSurfaceTest(); 61 ~SoftwareBrowserCompositorOutputSurfaceTest() override;
62 62
63 virtual void SetUp() override; 63 void SetUp() override;
64 virtual void TearDown() override; 64 void TearDown() override;
65 65
66 scoped_ptr<content::BrowserCompositorOutputSurface> CreateSurface( 66 scoped_ptr<content::BrowserCompositorOutputSurface> CreateSurface(
67 scoped_ptr<cc::SoftwareOutputDevice> device); 67 scoped_ptr<cc::SoftwareOutputDevice> device);
68 68
69 protected: 69 protected:
70 scoped_ptr<content::BrowserCompositorOutputSurface> output_surface_; 70 scoped_ptr<content::BrowserCompositorOutputSurface> output_surface_;
71 71
72 scoped_ptr<base::MessageLoop> message_loop_; 72 scoped_ptr<base::MessageLoop> message_loop_;
73 scoped_ptr<ui::Compositor> compositor_; 73 scoped_ptr<ui::Compositor> compositor_;
74 74
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>( 146 FakeVSyncProvider* vsync_provider = static_cast<FakeVSyncProvider*>(
147 output_surface_->software_device()->GetVSyncProvider()); 147 output_surface_->software_device()->GetVSyncProvider());
148 EXPECT_EQ(0, vsync_provider->call_count()); 148 EXPECT_EQ(0, vsync_provider->call_count());
149 149
150 cc::CompositorFrame frame; 150 cc::CompositorFrame frame;
151 output_surface_->SwapBuffers(&frame); 151 output_surface_->SwapBuffers(&frame);
152 152
153 EXPECT_EQ(1, output_surface_client.swap_count()); 153 EXPECT_EQ(1, output_surface_client.swap_count());
154 EXPECT_EQ(1, vsync_provider->call_count()); 154 EXPECT_EQ(1, vsync_provider->call_count());
155 } 155 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698