Track transform animation content readiness on TransformNode.

cc/trees/layer_tree_host_impl_unittest.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/trees/layer_tree_host_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 1708 matching lines @@
 
   void AppendQuads(RenderPass* render_pass,
                    AppendQuadsData* append_quads_data) override {
     append_quads_data->num_missing_tiles += has_missing_tiles_;
   }
 
  private:
   bool has_missing_tiles_;
 };
 
-TEST_F(LayerTreeHostImplTest, AnimationMarksLayerNotReady) {
+static bool ReadySinceAnimation(LayerTreeHostImpl* host_impl,
+                                LayerImpl* layer) {
+  return layer->transform_tree_index() == TransformTree::kInvalidNodeId
+             ? true
+             : host_impl->active_tree()
+                   ->property_trees()
+                   ->transform_tree.Node(layer->transform_tree_index())
+                   ->ready_since_animation;
+}
+
+TEST_F(LayerTreeHostImplTest, AnimationMarksTransformNodeNotReady) {
   host_impl_->SetViewportSize(gfx::Size(50, 50));
 
   host_impl_->active_tree()->SetRootLayerForTesting(
       LayerImpl::Create(host_impl_->active_tree(), 1));
   LayerImpl* root = *host_impl_->active_tree()->begin();
   root->SetBounds(gfx::Size(50, 50));
 
   root->test_properties()->AddChild(std::unique_ptr<MissingTilesLayer>(
       new MissingTilesLayer(host_impl_->active_tree(), 2)));
   MissingTilesLayer* child =
       static_cast<MissingTilesLayer*>(root->test_properties()->children[0]);
   child->SetBounds(gfx::Size(10, 10));
   child->draw_properties().visible_layer_rect = gfx::Rect(10, 10);
   child->SetDrawsContent(true);
 
   host_impl_->active_tree()->SetElementIdsForTesting();
 
-  EXPECT_TRUE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_TRUE(ReadySinceAnimation(host_impl_.get(), child));
 
   // Add a translate from 6,7 to 8,9.
   TransformOperations start;
   start.AppendTranslate(6.f, 7.f, 0.f);
   TransformOperations end;
   end.AppendTranslate(8.f, 9.f, 0.f);
   int animation_id = AddAnimatedTransformToElementWithPlayer(
       child->element_id(), timeline(), 4.0, start, end);
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
 
   base::TimeTicks now = base::TimeTicks::Now();
   host_impl_->WillBeginImplFrame(
       CreateBeginFrameArgsForTesting(BEGINFRAME_FROM_HERE, 0, 2, now));
 
   host_impl_->ActivateAnimations();
   host_impl_->Animate();
 
-  EXPECT_FALSE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_FALSE(ReadySinceAnimation(host_impl_.get(), child));
 
   host_impl_->ResetRequiresHighResToDraw();
 
   // Child layer has an animating transform but missing tiles.
   TestFrameData frame;
   DrawResult result = host_impl_->PrepareToDraw(&frame);
   EXPECT_EQ(DRAW_ABORTED_CHECKERBOARD_ANIMATIONS, result);
   host_impl_->DidDrawAllLayers(frame);
 
   child->set_has_missing_tiles(false);
 
   // Child layer has an animating and no missing tiles.
   result = host_impl_->PrepareToDraw(&frame);
   EXPECT_EQ(DRAW_SUCCESS, result);
-  EXPECT_TRUE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_TRUE(ReadySinceAnimation(host_impl_.get(), child));
   host_impl_->DidDrawAllLayers(frame);
 
   // Remove the animation.
   child->set_has_missing_tiles(true);
   RemoveAnimationFromElementWithExistingPlayer(child->element_id(), timeline(),
                                                animation_id);
   child->draw_properties().screen_space_transform_is_animating = false;
 
   // Child layer doesn't have an animation, but was never ready since the last
   // time it animated (and has missing tiles).
   result = host_impl_->PrepareToDraw(&frame);
   EXPECT_EQ(DRAW_ABORTED_CHECKERBOARD_ANIMATIONS, result);
-  EXPECT_FALSE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_FALSE(ReadySinceAnimation(host_impl_.get(), child));
   host_impl_->DidDrawAllLayers(frame);
 
   child->set_has_missing_tiles(false);
 
   // Child layer doesn't have an animation and all tiles are ready.
   result = host_impl_->PrepareToDraw(&frame);
   EXPECT_EQ(DRAW_SUCCESS, result);
-  EXPECT_TRUE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_TRUE(ReadySinceAnimation(host_impl_.get(), child));
   host_impl_->DidDrawAllLayers(frame);
 
   child->set_has_missing_tiles(true);
 
   // Child layer doesn't have an animation, and was ready at least once since
   // the last time it animated.
   result = host_impl_->PrepareToDraw(&frame);
   EXPECT_EQ(DRAW_SUCCESS, result);
-  EXPECT_TRUE(child->was_ever_ready_since_last_transform_animation());
+  EXPECT_TRUE(ReadySinceAnimation(host_impl_.get(), child));
   host_impl_->DidDrawAllLayers(frame);
 }
 
 TEST_F(LayerTreeHostImplTest, ImplPinchZoom) {
   LayerImpl* scroll_layer = SetupScrollAndContentsLayers(gfx::Size(100, 100));
   host_impl_->active_tree()->BuildPropertyTreesForTesting();
 
   host_impl_->SetViewportSize(gfx::Size(50, 50));
   DrawFrame();
 
@@ skipping 10642 matching lines @@
     else
       EXPECT_FALSE(tile->HasRasterTask());
   }
   Region expected_invalidation(
       raster_source->GetRectForImage(checkerable_image.stable_id()));
   EXPECT_EQ(expected_invalidation, *(root->GetPendingInvalidation()));
 }
 
 }  // namespace
 }  // namespace cc