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

Unified Diff: cc/trees/layer_tree_host_impl_unittest.cc

Issue 12965007: Fix cpplint errors in cc/(animation|input|layers|trees|test)/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl_unittest.cc
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
index f09b31a9ed70284266c0d1e6ff3b85ddb5f3e793..e47e311ec4db4e02c80ec0c71111f5c1a9ab22e8 100644
--- a/cc/trees/layer_tree_host_impl_unittest.cc
+++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -994,11 +994,11 @@ class DidDrawCheckLayer : public TiledLayerImpl {
return scoped_ptr<LayerImpl>(new DidDrawCheckLayer(tree_impl, id));
}
- virtual void DidDraw(ResourceProvider*) OVERRIDE {
+ virtual void DidDraw(ResourceProvider* provider) OVERRIDE {
did_draw_called_ = true;
}
- virtual void WillDraw(ResourceProvider*) OVERRIDE {
+ virtual void WillDraw(ResourceProvider* provider) OVERRIDE {
will_draw_called_ = true;
}
@@ -2318,7 +2318,6 @@ TEST_F(LayerTreeHostImplTest, BlendingOffWhenDrawingOpaqueLayers) {
host_impl_->DrawLayers(&frame, base::TimeTicks::Now());
EXPECT_TRUE(layer1->quads_appended());
host_impl_->DidDrawAllLayers(frame);
-
}
TEST_F(LayerTreeHostImplTest, ViewportCovered) {
@@ -2413,7 +2412,6 @@ TEST_F(LayerTreeHostImplTest, ViewportCovered) {
frame.render_passes[0]->quad_list, gfx::Rect(viewport_size));
host_impl_->DidDrawAllLayers(frame);
}
-
}
@@ -2654,8 +2652,9 @@ class MockContext : public TestWebGraphicsContext3D {
class MockContextHarness {
private:
MockContext* context_;
+
public:
- MockContextHarness(MockContext* context)
+ explicit MockContextHarness(MockContext* context)
: context_(context) {
// Catch "uninteresting" calls
EXPECT_CALL(*context_, useProgram(_))
@@ -2701,7 +2700,6 @@ class MockContextHarness {
EXPECT_CALL(*context_, useProgram(_))
.WillOnce(Return())
.RetiresOnSaturation();
-
}
void MustSetScissor(int x, int y, int width, int height) {
@@ -3282,7 +3280,6 @@ TEST_F(LayerTreeHostImplTest, TextureCachingWithOcclusion) {
my_host_impl->DrawLayers(&frame, base::TimeTicks::Now());
my_host_impl->DidDrawAllLayers(frame);
}
-
}
TEST_F(LayerTreeHostImplTest, TextureCachingWithOcclusionEarlyOut) {
@@ -4584,8 +4581,9 @@ TestCase remove_render_passes_cases[] = {
}
};
-static void VerifyRenderPassTestData(TestCase& test_case,
- RenderPassRemovalTestData& test_data) {
+static void VerifyRenderPassTestData(
+ const TestCase& test_case,
+ const RenderPassRemovalTestData& test_data) {
char actual_result[1024];
DumpRenderPassTestData(test_data, actual_result);
EXPECT_STREQ(test_case.expected_result, actual_result) << "In test case: " <<
@@ -4611,7 +4609,7 @@ TEST_F(LayerTreeHostImplTest, TestRemoveRenderPasses) {
test_data,
renderer.get());
LayerTreeHostImpl::RemoveRenderPasses(
- LayerTreeHostImpl::CullRenderPassesWithCachedTextures(*renderer),
+ LayerTreeHostImpl::CullRenderPassesWithCachedTextures(renderer.get()),
&test_data);
VerifyRenderPassTestData(remove_render_passes_cases[test_case_index],
test_data);
« no previous file with comments | « cc/trees/layer_tree_host_impl.cc ('k') | cc/trees/layer_tree_host_unittest_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698