cc: Complete pending tile uploads if they are needed for tree activation

cc/picture_layer_impl.cc

Index: cc/picture_layer_impl.cc
diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc
index 66f9ff36af4ddcfa1b7a9b2efe4f709a0e3b5554..be5874002f456f6f6b6015d46869f63d4e9ff447 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/picture_layer_impl.cc
@@ -507,6 +507,13 @@ bool PictureLayerImpl::AreVisibleResourcesReady() const {
   float min_acceptable_scale =
       std::min(raster_contents_scale, ideal_contents_scale_);
 
+  TreePriority tree_priority =
+      layer_tree_impl()->tile_manager()->GlobalState().tree_priority;
+  bool should_force_uploads =
+      tree_priority != SMOOTHNESS_TAKES_PRIORITY &&
+      layer_tree_impl()->animationRegistrar()->
+          active_animation_controllers().empty();
+
   if (PictureLayerImpl* twin = ActiveTwin()) {
     float twin_raster_contents_scale =
         twin->raster_page_scale_ *
@@ -531,6 +538,8 @@ bool PictureLayerImpl::AreVisibleResourcesReady() const {
                                            PictureLayerTiling::LayerDeviceAlignmentUnknown);
          iter;
          ++iter) {
+      if (should_force_uploads && iter)
+        layer_tree_impl()->tile_manager()->ForceTileUploadToComplete(*iter);
       // A null tile (i.e. no recording) is considered "ready".
       if (!*iter || iter->drawing_info().IsReadyToDraw())
         missing_region.Subtract(iter.geometry_rect());