NOT FOR REVIEW - convert to cc animation

chrome/browser/android/vr_shell/ui_scene.cc

 // Copyright 2016 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 "chrome/browser/android/vr_shell/ui_scene.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "chrome/browser/android/vr_shell/animation.h"
-#include "chrome/browser/android/vr_shell/easing.h"
+#include "cc/animation/animation_player.h"
 #include "chrome/browser/android/vr_shell/ui_elements/ui_element.h"
 
 namespace vr_shell {
 
 namespace {
 
 void ApplyAnchoring(const UiElement& parent,
                     XAnchoring x_anchoring,
                     YAnchoring y_anchoring,
                     gfx::Transform* transform) {
@@ skipping 47 matching lines @@
       if ((*it)->fill() == Fill::CONTENT) {
         content_element_ = nullptr;
       }
       ui_elements_.erase(it);
       return;
     }
   }
 }
 
 void UiScene::AddAnimation(int element_id,
-                           std::unique_ptr<Animation> animation) {
+                           std::unique_ptr<cc::Animation> animation) {
   UiElement* element = GetUiElementById(element_id);
-  CHECK_NE(element, nullptr);
-  for (const std::unique_ptr<Animation>& existing : element->animations()) {
-    CHECK_NE(existing->id, animation->id);
-  }
-  element->animations().emplace_back(std::move(animation));
+  element->animation_player().AddAnimation(std::move(animation));
 }
 
 void UiScene::RemoveAnimation(int element_id, int animation_id) {
   UiElement* element = GetUiElementById(element_id);
-  CHECK_NE(element, nullptr);
-  auto& animations = element->animations();
-  for (auto it = animations.begin(); it != animations.end(); ++it) {
-    const Animation& existing_animation = **it;
-    if (existing_animation.id == animation_id) {
-      animations.erase(it);
-      return;
-    }
-  }
+  element->animation_player().RemoveAnimation(animation_id);
 }
 
 void UiScene::OnBeginFrame(const base::TimeTicks& current_time) {
   for (const auto& element : ui_elements_) {
     // Process all animations before calculating object transforms.
     // TODO: eventually, we'd like to stop assuming that animations are
     // element-level concepts. A single animation may simultaneously update
     // properties on multiple elements, say.
     element->Animate(current_time);
 
@@ skipping 128 matching lines @@
   }
 
   gfx::Transform transform;
   transform.Scale3d(element->size().x(), element->size().y(),
                     element->size().z());
   element->set_computed_opacity(element->opacity());
   element->set_computed_lock_to_fov(element->lock_to_fov());
 
   // Compute an inheritable transformation that can be applied to this element,
   // and it's children, if applicable.
-  gfx::Transform inheritable;
-  inheritable.matrix().postScale(element->scale().x(), element->scale().y(),
-                                 element->scale().z());
-  inheritable.ConcatTransform(gfx::Transform(element->rotation()));
-  inheritable.matrix().postTranslate(element->translation().x(),
-                                     element->translation().y(),
-                                     element->translation().z());
+  gfx::Transform inheritable = element->transform_operations().Apply();
+
   if (parent) {
     ApplyAnchoring(*parent, element->x_anchoring(), element->y_anchoring(),
                    &inheritable);
     ApplyRecursiveTransforms(parent);
     inheritable.ConcatTransform(parent->inheritable_transform());
 
     element->set_computed_opacity(element->computed_opacity() *
                                   parent->opacity());
     element->set_computed_lock_to_fov(parent->lock_to_fov());
   }
 
-  transform.ConcatTransform(inheritable);
-
-  element->set_transform(transform);
+  // transform.ConcatTransform(inheritable);
+  element->set_screen_space_transform(transform * inheritable);
   element->set_inheritable_transform(inheritable);
   element->set_dirty(false);
 }
 
 // TODO(mthiesse): Move this to UiSceneManager.
 void UiScene::OnGLInitialized() {
   gl_initialized_ = true;
   for (auto& element : ui_elements_) {
     element->Initialize();
   }
 }
 
 }  // namespace vr_shell