diff options
| -rw-r--r-- | cc/layers/delegated_renderer_layer_impl_unittest.cc | 2 | ||||
| -rw-r--r-- | cc/layers/picture_layer_impl_unittest.cc | 3 | ||||
| -rw-r--r-- | cc/resources/picture_layer_tiling.cc | 3 | ||||
| -rw-r--r-- | cc/test/animation_test_common.cc | 32 | ||||
| -rw-r--r-- | cc/test/fake_layer_tree_host_impl.cc | 6 | ||||
| -rw-r--r-- | cc/trees/damage_tracker_unittest.cc | 2 |
6 files changed, 15 insertions, 33 deletions
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc index 5a21abc..23207be 100644 --- a/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc @@ -414,7 +414,7 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) { // The DelegatedRendererLayer should have added copies of quads in its root // RenderPass to its target RenderPass. - // The m_layer_after also adds one quad. + // The layer_after also adds one quad. ASSERT_EQ(1u, frame.render_passes[3]->quad_list.size()); // Verify it added the right quads. diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index 9aff764..9ea3878 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc @@ -22,8 +22,7 @@ class TestablePictureLayerImpl : public PictureLayerImpl { static scoped_ptr<TestablePictureLayerImpl> Create( LayerTreeImpl* tree_impl, int id, - scoped_refptr<PicturePileImpl> pile) - { + scoped_refptr<PicturePileImpl> pile) { return make_scoped_ptr(new TestablePictureLayerImpl(tree_impl, id, pile)); } diff --git a/cc/resources/picture_layer_tiling.cc b/cc/resources/picture_layer_tiling.cc index 5f74b70..b1fa9a8 100644 --- a/cc/resources/picture_layer_tiling.cc +++ b/cc/resources/picture_layer_tiling.cc @@ -395,8 +395,7 @@ void PictureLayerTiling::UpdateTilePriorities( // Fast path tile priority calculation when both transforms are translations. if (last_screen_transform.IsIdentityOrTranslation() && - current_screen_transform.IsIdentityOrTranslation()) - { + current_screen_transform.IsIdentityOrTranslation()) { gfx::Vector2dF current_offset( current_screen_transform.matrix().get(0, 3), current_screen_transform.matrix().get(1, 3)); diff --git a/cc/test/animation_test_common.cc b/cc/test/animation_test_common.cc index 4f9548d..21e4583 100644 --- a/cc/test/animation_test_common.cc +++ b/cc/test/animation_test_common.cc @@ -90,17 +90,12 @@ int AddAnimatedTransform(Target* target, } FakeFloatAnimationCurve::FakeFloatAnimationCurve() - : duration_(1.0) -{ -} + : duration_(1.0) {} FakeFloatAnimationCurve::FakeFloatAnimationCurve(double duration) - : duration_(duration) -{ -} + : duration_(duration) {} -FakeFloatAnimationCurve::~FakeFloatAnimationCurve() { -} +FakeFloatAnimationCurve::~FakeFloatAnimationCurve() {} double FakeFloatAnimationCurve::Duration() const { return duration_; @@ -116,12 +111,9 @@ scoped_ptr<cc::AnimationCurve> FakeFloatAnimationCurve::Clone() const { } FakeTransformTransition::FakeTransformTransition(double duration) - : duration_(duration) -{ -} + : duration_(duration) {} -FakeTransformTransition::~FakeTransformTransition() { -} +FakeTransformTransition::~FakeTransformTransition() {} double FakeTransformTransition::Duration() const { return duration_; @@ -140,12 +132,9 @@ scoped_ptr<cc::AnimationCurve> FakeTransformTransition::Clone() const { FakeFloatTransition::FakeFloatTransition(double duration, float from, float to) : duration_(duration) , from_(from) - , to_(to) -{ -} + , to_(to) {} -FakeFloatTransition::~FakeFloatTransition() { -} +FakeFloatTransition::~FakeFloatTransition() {} double FakeFloatTransition::Duration() const { return duration_; @@ -159,12 +148,9 @@ float FakeFloatTransition::GetValue(double time) const { } FakeLayerAnimationValueObserver::FakeLayerAnimationValueObserver() - : opacity_(0.0f) -{ -} + : opacity_(0.0f) {} -FakeLayerAnimationValueObserver::~FakeLayerAnimationValueObserver() { -} +FakeLayerAnimationValueObserver::~FakeLayerAnimationValueObserver() {} void FakeLayerAnimationValueObserver::OnOpacityAnimated(float opacity) { opacity_ = opacity; diff --git a/cc/test/fake_layer_tree_host_impl.cc b/cc/test/fake_layer_tree_host_impl.cc index f393f1d..5755e98 100644 --- a/cc/test/fake_layer_tree_host_impl.cc +++ b/cc/test/fake_layer_tree_host_impl.cc @@ -10,8 +10,7 @@ FakeLayerTreeHostImpl::FakeLayerTreeHostImpl(Proxy* proxy) : LayerTreeHostImpl(LayerTreeSettings(), &client_, proxy, - &stats_instrumentation_) -{ + &stats_instrumentation_) { // Explicitly clear all debug settings. SetDebugState(LayerTreeDebugState()); } @@ -22,8 +21,7 @@ FakeLayerTreeHostImpl::FakeLayerTreeHostImpl( : LayerTreeHostImpl(settings, &client_, proxy, - &stats_instrumentation_) -{ + &stats_instrumentation_) { // Explicitly clear all debug settings. SetDebugState(LayerTreeDebugState()); } diff --git a/cc/trees/damage_tracker_unittest.cc b/cc/trees/damage_tracker_unittest.cc index c0f5d49..164ebe1 100644 --- a/cc/trees/damage_tracker_unittest.cc +++ b/cc/trees/damage_tracker_unittest.cc @@ -190,7 +190,7 @@ class DamageTrackerTest : public testing::Test { return root.Pass(); } -protected: + protected: FakeImplProxy proxy_; FakeLayerTreeHostImpl host_impl_; }; |