cc : Stop calculating visible rects on main thread

cc/debug/invalidation_benchmark.cc

 // Copyright 2014 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/debug/invalidation_benchmark.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <limits>
 
 #include "base/rand_util.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
+#include "cc/trees/draw_property_utils.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 namespace {
 
 const char* kDefaultInvalidationMode = "viewport";
 
@@ skipping 35 matching lines @@
 
 InvalidationBenchmark::~InvalidationBenchmark() {
 }
 
 void InvalidationBenchmark::DidUpdateLayers(LayerTreeHost* host) {
   LayerTreeHostCommon::CallFunctionForEveryLayer(
       host, [this](Layer* layer) { layer->RunMicroBenchmark(this); });
 }
 
 void InvalidationBenchmark::RunOnLayer(PictureLayer* layer) {
+  PropertyTrees* property_trees = layer->layer_tree_host()->property_trees();
+  LayerList update_list;
+  update_list.push_back(layer);
+  draw_property_utils::ComputeVisibleRectsForTesting(
+      property_trees, property_trees->non_root_surfaces_enabled, &update_list);
+  gfx::Rect visible_layer_rect = layer->visible_layer_rect_for_testing();
   switch (mode_) {
     case FIXED_SIZE: {
       // Invalidation with a random position and fixed size.
-      gfx::Rect visible_layer_rect = layer->visible_layer_rect_for_testing();
       int x = LCGRandom() * (visible_layer_rect.width() - width_);
       int y = LCGRandom() * (visible_layer_rect.height() - height_);
       gfx::Rect invalidation_rect(x, y, width_, height_);
       layer->SetNeedsDisplayRect(invalidation_rect);
       break;
     }
     case LAYER: {
       // Invalidate entire layer.
       layer->SetNeedsDisplay();
       break;
     }
     case RANDOM: {
       // Random invalidation inside the viewport.
-      gfx::Rect visible_layer_rect = layer->visible_layer_rect_for_testing();
       int x_min = LCGRandom() * visible_layer_rect.width();
       int x_max = LCGRandom() * visible_layer_rect.width();
       int y_min = LCGRandom() * visible_layer_rect.height();
       int y_max = LCGRandom() * visible_layer_rect.height();
       if (x_min > x_max)
         std::swap(x_min, x_max);
       if (y_min > y_max)
         std::swap(y_min, y_max);
       gfx::Rect invalidation_rect(x_min, y_min, x_max - x_min, y_max - y_min);
       layer->SetNeedsDisplayRect(invalidation_rect);
@@ skipping 27 matching lines @@
 // high quality, but they need to be identical in each run. Therefore, we use a
 // LCG and keep the state locally in the benchmark.
 float InvalidationBenchmark::LCGRandom() {
   const uint32_t a = 1664525;
   const uint32_t c = 1013904223;
   seed_ = a * seed_ + c;
   return static_cast<float>(seed_) / std::numeric_limits<uint32_t>::max();
 }
 
 }  // namespace cc