Revert 245663 "Revert 245645 "Define WebScrollOffsetAnimationCur..."

trunk/src/cc/animation/animation.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/animation/animation.h"
 
 #include <cmath>
 
 #include "base/debug/trace_event.h"
 #include "base/strings/string_util.h"
@@ skipping 14 matching lines @@
 
 COMPILE_ASSERT(static_cast<int>(cc::Animation::RunStateEnumSize) ==
                arraysize(s_runStateNames),
                RunState_names_match_enum);
 
 // This should match the TargetProperty enum.
 static const char* const s_targetPropertyNames[] = {
   "Transform",
   "Opacity",
   "Filter",
-  "BackgroundColor",
-  "ScrollOffset"
+  "ScrollOffset",
+  "BackgroundColor"
 };
 
 COMPILE_ASSERT(static_cast<int>(cc::Animation::TargetPropertyEnumSize) ==
                arraysize(s_targetPropertyNames),
                TargetProperty_names_match_enum);
 
 }  // namespace
 
 namespace cc {
 
@@ skipping 188 matching lines @@
   // the main thread.
   if (run_state_ == Animation::Paused ||
       other->run_state_ == Animation::Paused) {
     other->run_state_ = run_state_;
     other->pause_time_ = pause_time_;
     other->total_paused_time_ = total_paused_time_;
   }
 }
 
 }  // namespace cc