summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 09:51:55 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 09:51:55 +0000
commit9f93027279b04fab04d10e80d9ba166439ebe685 (patch)
treeaf382ddabdd38b7ab916c6dc50b939f92bf608b5
parentba91a797de94b0ed95c180e7b9c3e0d8546915e2 (diff)
downloadchromium_src-9f93027279b04fab04d10e80d9ba166439ebe685.zip
chromium_src-9f93027279b04fab04d10e80d9ba166439ebe685.tar.gz
chromium_src-9f93027279b04fab04d10e80d9ba166439ebe685.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, cc/ edition.
Automated clean up of style checker errors that were missed due to the plugin not being executed on implementation files. BUG=115047 Review URL: https://chromiumcodereview.appspot.com/12218028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--cc/frame_rate_controller_unittest.cc4
-rw-r--r--cc/gl_renderer_pixeltest.cc2
-rw-r--r--cc/gl_renderer_unittest.cc2
-rw-r--r--cc/layer_tree_host_impl_unittest.cc8
-rw-r--r--cc/layer_tree_host_unittest_context.cc12
-rw-r--r--cc/picture_layer_impl_unittest.cc4
-rw-r--r--cc/resource_update_controller_unittest.cc2
-rw-r--r--cc/test/layer_tree_test_common.cc2
-rw-r--r--cc/tree_synchronizer_unittest.cc2
9 files changed, 20 insertions, 18 deletions
diff --git a/cc/frame_rate_controller_unittest.cc b/cc/frame_rate_controller_unittest.cc
index 17168dd..d150248 100644
--- a/cc/frame_rate_controller_unittest.cc
+++ b/cc/frame_rate_controller_unittest.cc
@@ -17,7 +17,9 @@ public:
void reset() { m_vsyncTicked = false; }
bool vsyncTicked() const { return m_vsyncTicked; }
- virtual void vsyncTick(bool throttled) { m_vsyncTicked = !throttled; }
+ virtual void vsyncTick(bool throttled) OVERRIDE {
+ m_vsyncTicked = !throttled;
+ }
protected:
bool m_vsyncTicked;
diff --git a/cc/gl_renderer_pixeltest.cc b/cc/gl_renderer_pixeltest.cc
index 3507d77..74ec0b9 100644
--- a/cc/gl_renderer_pixeltest.cc
+++ b/cc/gl_renderer_pixeltest.cc
@@ -42,7 +42,7 @@ class FakeRendererClient : public RendererClient {
virtual void enforceManagedMemoryPolicy(
const ManagedMemoryPolicy&) OVERRIDE {}
virtual bool hasImplThread() const OVERRIDE { return false; }
- virtual bool shouldClearRootRenderPass() const { return true; }
+ virtual bool shouldClearRootRenderPass() const OVERRIDE { return true; }
virtual CompositorFrameMetadata makeCompositorFrameMetadata() const
OVERRIDE { return CompositorFrameMetadata(); }
};
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index e9665ab..23c48f7 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -581,7 +581,7 @@ TEST(GLRendererTest2, activeTextureState)
class NoClearRootRenderPassFakeClient : public FakeRendererClient {
public:
- virtual bool shouldClearRootRenderPass() const { return false; }
+ virtual bool shouldClearRootRenderPass() const OVERRIDE { return false; }
};
class NoClearRootRenderPassMockContext : public FakeWebGraphicsContext3D {
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 06a4e96..b3b0cab 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -2405,14 +2405,14 @@ TEST_P(LayerTreeHostImplTest, partialSwap)
class PartialSwapContext : public FakeWebGraphicsContext3D {
public:
- WebKit::WebString getString(WebKit::WGC3Denum name)
+ virtual WebKit::WebString getString(WebKit::WGC3Denum name)
{
if (name == GL_EXTENSIONS)
return WebKit::WebString("GL_CHROMIUM_post_sub_buffer");
return WebKit::WebString();
}
- WebKit::WebString getRequestableExtensionsCHROMIUM()
+ virtual WebKit::WebString getRequestableExtensionsCHROMIUM()
{
return WebKit::WebString("GL_CHROMIUM_post_sub_buffer");
}
@@ -4017,7 +4017,7 @@ TEST_P(LayerTreeHostImplTest, testRemoveRenderPasses)
class LayerTreeHostImplTestWithDelegatingRenderer : public LayerTreeHostImplTest {
protected:
- virtual scoped_ptr<OutputSurface> createOutputSurface()
+ virtual scoped_ptr<OutputSurface> createOutputSurface() OVERRIDE
{
// Creates an output surface with a parent to use a delegating renderer.
WebKit::WebGraphicsContext3D::Attributes attrs;
@@ -4061,7 +4061,7 @@ public:
return make_scoped_ptr(new FakeMaskLayerImpl(treeImpl, id));
}
- virtual ResourceProvider::ResourceId contentsResourceId() const { return 0; }
+ virtual ResourceProvider::ResourceId contentsResourceId() const OVERRIDE { return 0; }
private:
FakeMaskLayerImpl(LayerTreeImpl* treeImpl, int id) : LayerImpl(treeImpl, id) { }
diff --git a/cc/layer_tree_host_unittest_context.cc b/cc/layer_tree_host_unittest_context.cc
index 751e7d7..7b84656 100644
--- a/cc/layer_tree_host_unittest_context.cc
+++ b/cc/layer_tree_host_unittest_context.cc
@@ -300,7 +300,7 @@ class LayerTreeHostContextTestLostContextSucceedsWithContent :
LayerTreeHostContextTestLostContextSucceeds::InvalidateAndSetNeedsCommit();
}
- virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) {
+ virtual void drawLayersOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
FakeContentLayerImpl* content_impl = static_cast<FakeContentLayerImpl*>(
host_impl->rootLayer()->children()[0]);
// Even though the context was lost, we should have a resource. The
@@ -549,7 +549,7 @@ class LayerTreeHostContextTestLostContextWhileUpdatingResources :
times_to_lose_on_end_query_(3) {
}
- virtual scoped_ptr<FakeWebGraphicsContext3D> CreateContext3d() {
+ virtual scoped_ptr<FakeWebGraphicsContext3D> CreateContext3d() OVERRIDE {
scoped_ptr<FakeWebGraphicsContext3D> context =
LayerTreeHostContextTest::CreateContext3d();
if (times_to_lose_on_end_query_) {
@@ -559,7 +559,7 @@ class LayerTreeHostContextTestLostContextWhileUpdatingResources :
return context.Pass();
}
- virtual void setupTree() {
+ virtual void setupTree() OVERRIDE {
parent_->setBounds(gfx::Size(num_children_, 1));
for (int i = 0; i < num_children_; i++) {
@@ -574,11 +574,11 @@ class LayerTreeHostContextTestLostContextWhileUpdatingResources :
LayerTreeHostContextTest::setupTree();
}
- virtual void beginTest() {
+ virtual void beginTest() OVERRIDE {
postSetNeedsCommitToMainThread();
}
- virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) {
+ virtual void commitCompleteOnThread(LayerTreeHostImpl* impl) OVERRIDE {
endTest();
}
@@ -586,7 +586,7 @@ class LayerTreeHostContextTestLostContextWhileUpdatingResources :
EXPECT_TRUE(succeeded);
}
- virtual void afterTest() {
+ virtual void afterTest() OVERRIDE {
EXPECT_EQ(0, times_to_lose_on_end_query_);
}
diff --git a/cc/picture_layer_impl_unittest.cc b/cc/picture_layer_impl_unittest.cc
index 340e60c..c1845ce 100644
--- a/cc/picture_layer_impl_unittest.cc
+++ b/cc/picture_layer_impl_unittest.cc
@@ -112,7 +112,7 @@ class TestablePicturePileImpl : public PicturePileImpl {
}
protected:
- ~TestablePicturePileImpl() {
+ virtual ~TestablePicturePileImpl() {
}
};
@@ -131,7 +131,7 @@ class PictureLayerImplTest : public testing::Test {
host_impl_.initializeRenderer(createFakeOutputSurface());
}
- ~PictureLayerImplTest() {
+ virtual ~PictureLayerImplTest() {
}
void SetupTrees(
diff --git a/cc/resource_update_controller_unittest.cc b/cc/resource_update_controller_unittest.cc
index 2da1460a..8fb7d18 100644
--- a/cc/resource_update_controller_unittest.cc
+++ b/cc/resource_update_controller_unittest.cc
@@ -78,7 +78,7 @@ public:
{
}
- ~ResourceUpdateControllerTest()
+ virtual ~ResourceUpdateControllerTest()
{
DebugScopedSetImplThreadAndMainThreadBlocked
implThreadAndMainThreadBlocked(&m_proxy);
diff --git a/cc/test/layer_tree_test_common.cc b/cc/test/layer_tree_test_common.cc
index f710f4b..c7528fc 100644
--- a/cc/test/layer_tree_test_common.cc
+++ b/cc/test/layer_tree_test_common.cc
@@ -121,7 +121,7 @@ public:
return layerTreeHost.Pass();
}
- virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerTreeHostImplClient* client)
+ virtual scoped_ptr<cc::LayerTreeHostImpl> createLayerTreeHostImpl(cc::LayerTreeHostImplClient* client) OVERRIDE
{
return MockLayerTreeHostImpl::create(m_testHooks, settings(), client, proxy()).PassAs<cc::LayerTreeHostImpl>();
}
diff --git a/cc/tree_synchronizer_unittest.cc b/cc/tree_synchronizer_unittest.cc
index 30c09f6..d4e9def 100644
--- a/cc/tree_synchronizer_unittest.cc
+++ b/cc/tree_synchronizer_unittest.cc
@@ -91,7 +91,7 @@ private:
virtual ~FakeLayerAnimationController() { }
- virtual void pushAnimationUpdatesTo(LayerAnimationController* controllerImpl)
+ virtual void pushAnimationUpdatesTo(LayerAnimationController* controllerImpl) OVERRIDE
{
LayerAnimationController::pushAnimationUpdatesTo(controllerImpl);
m_synchronizedAnimations = true;
generated by cgit v1.1 at 2025-03-02 08:23:40 +0000