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 0765c9d26357017d291af329da8ecf3041e7b815..2580d4197e4cec2fc2e47a179da0493684b8780a 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/picture_layer_impl.cc
@@ -498,6 +498,13 @@ bool PictureLayerImpl::areVisibleResourcesReady() const {
   float min_acceptable_scale =
       std::min(raster_contents_scale, ideal_contents_scale_);
 
+  TreePriority tree_priority =
+      layerTreeImpl()->tile_manager()->GlobalState().tree_priority;
+  bool should_flush_uploads =
+      tree_priority != SMOOTHNESS_TAKES_PRIORITY &&
+      layerTreeImpl()->animationRegistrar()->
+          active_animation_controllers().empty();
+
   if (PictureLayerImpl* twin = ActiveTwin()) {
     float twin_raster_contents_scale =
         twin->raster_page_scale_ *
@@ -522,6 +529,8 @@ bool PictureLayerImpl::areVisibleResourcesReady() const {
                                            PictureLayerTiling::LayerDeviceAlignmentUnknown);
          iter;
          ++iter) {
+      if (should_flush_uploads && iter)
+        layerTreeImpl()->tile_manager()->FlushPendingTileUploadIfNeeded(*iter);
       // A null tile (i.e. no recording) is considered "ready".
       if (!*iter || iter->IsReadyToDraw())
         missing_region.Subtract(iter.geometry_rect());