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

cc/picture_layer_impl.cc

 // Copyright 2012 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/picture_layer_impl.h"
 
 #include "base/time.h"
 #include "cc/append_quads_data.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 480 matching lines @@
   const gfx::Rect& rect = visibleContentRect();
 
   float raster_contents_scale =
       raster_page_scale_ *
       raster_device_scale_ *
       raster_source_scale_;
 
   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_ *
         twin->raster_device_scale_ *
         twin->raster_source_scale_;
 
     min_acceptable_scale = std::min(
         min_acceptable_scale,
         std::min(twin->ideal_contents_scale_, twin_raster_contents_scale));
   }
 
   Region missing_region = rect;
   for (size_t i = 0; i < tilings_->num_tilings(); ++i) {
     PictureLayerTiling* tiling = tilings_->tiling_at(i);
 
     if (tiling->contents_scale() < min_acceptable_scale)
       continue;
 
     for (PictureLayerTiling::Iterator iter(tiling,
                                            contentsScaleX(),
                                            rect,
                                            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());
     }
   }
 
   return missing_region.IsEmpty();
 }
 
 PictureLayerTiling* PictureLayerImpl::AddTiling(float contents_scale) {
@@ skipping 259 matching lines @@
 scoped_ptr<base::Value> PictureLayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   LayerImpl::AsValueInto(state.get());
 
   state->SetDouble("ideal_contents_scale", ideal_contents_scale_);
   state->Set("tilings", tilings_->AsValue().release());
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc