cc: Chromify the Animation and LayerAnimationController classes

cc/layer_tree_host.cc

 // Copyright 2011 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/layer_tree_host.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
@@ skipping 858 matching lines @@
 {
     if (!m_settings.acceleratedAnimationEnabled || m_animationRegistrar->active_animation_controllers().empty())
         return;
 
     TRACE_EVENT0("cc", "LayerTreeHostImpl::animateLayers");
 
     double monotonicTime = (time - base::TimeTicks()).InSecondsF();
 
     AnimationRegistrar::AnimationControllerMap copy = m_animationRegistrar->active_animation_controllers();
     for (AnimationRegistrar::AnimationControllerMap::iterator iter = copy.begin(); iter != copy.end(); ++iter) {
-        (*iter).second->animate(monotonicTime);
-        (*iter).second->updateState(0);
+        (*iter).second->Animate(monotonicTime);
+        (*iter).second->UpdateState(NULL);
     }
 }
 
 void LayerTreeHost::setAnimationEventsRecursive(const AnimationEventsVector& events, Layer* layer, base::Time wallClockTime)
 {
     if (!layer)
         return;
 
     for (size_t eventIndex = 0; eventIndex < events.size(); ++eventIndex) {
-        if (layer->id() == events[eventIndex].layerId) {
+        if (layer->id() == events[eventIndex].layer_id) {
             switch (events[eventIndex].type) {
             case AnimationEvent::Started:
                 layer->notifyAnimationStarted(events[eventIndex], wallClockTime.ToDoubleT());
                 break;
 
             case AnimationEvent::Finished:
                 layer->notifyAnimationFinished(wallClockTime.ToDoubleT());
                 break;
 
             case AnimationEvent::PropertyUpdate:
                 layer->notifyAnimationPropertyUpdate(events[eventIndex]);
                 break;
 
             default:
                 NOTREACHED();
             }
         }
     }
 
     for (size_t childIndex = 0; childIndex < layer->children().size(); ++childIndex)
         setAnimationEventsRecursive(events, layer->children()[childIndex].get(), wallClockTime);
 }
 
 skia::RefPtr<SkPicture> LayerTreeHost::capturePicture()
 {
     return m_proxy->CapturePicture();
 }
 
 }  // namespace cc