summaryrefslogtreecommitdiffstats
path: root/cc/animation/layer_animation_controller.cc
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 21:15:06 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-26 21:15:06 +0000
commitbf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d (patch)
treedba84d59df6abc81803ce0191ccb78c42d4ca55b /cc/animation/layer_animation_controller.cc
parent01fc514f488305c0c57038c3d5c7b28eb09df4cd (diff)
downloadchromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.zip
chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.gz
chromium_src-bf691c24ca3cf0ebbe8c82e871b4b05bd4256f6d.tar.bz2
Fix cpplint errors in cc/(animation|input|layers|trees|test)/
This fixes lint errors in everything except for the few stragglers (occlusion unit test, etc) that haven't been chromified. BUG=144577 Review URL: https://chromiumcodereview.appspot.com/12965007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/animation/layer_animation_controller.cc')
-rw-r--r--cc/animation/layer_animation_controller.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/cc/animation/layer_animation_controller.cc b/cc/animation/layer_animation_controller.cc
index 5f7ad26..6ab3528 100644
--- a/cc/animation/layer_animation_controller.cc
+++ b/cc/animation/layer_animation_controller.cc
@@ -43,7 +43,7 @@ void LayerAnimationController::PauseAnimation(int animation_id,
}
struct HasAnimationId {
- HasAnimationId(int id) : id_(id) {}
+ explicit HasAnimationId(int id) : id_(id) {}
bool operator()(Animation* animation) const {
return animation->id() == id_;
}
@@ -160,8 +160,7 @@ void LayerAnimationController::AccumulatePropertyUpdates(
monotonic_time);
events->push_back(event);
- }
- else if (animation->target_property() == Animation::Transform) {
+ } else if (animation->target_property() == Animation::Transform) {
AnimationEvent event(AnimationEvent::PropertyUpdate,
id_,
animation->group(),
@@ -305,7 +304,7 @@ void LayerAnimationController::PushNewAnimationsToImplThread(
}
struct IsCompleted {
- IsCompleted(const LayerAnimationController& main_thread_controller)
+ explicit IsCompleted(const LayerAnimationController& main_thread_controller)
: main_thread_controller_(main_thread_controller) {}
bool operator()(Animation* animation) const {
if (animation->is_impl_only())
@@ -564,7 +563,6 @@ void LayerAnimationController::TickAnimations(double monotonic_time) {
trimmed = 0;
switch (active_animations_[i]->target_property()) {
-
case Animation::Transform: {
const TransformAnimationCurve* transform_animation_curve =
active_animations_[i]->curve()->ToTransformAnimationCurve();