cc: Remove usage of ComputeVisibleRects 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>
@@ skipping 51 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();
+  gfx::Rect visible_layer_rect = gfx::Rect(layer->bounds());
+  gfx::Transform from_screen;
+  bool invertible = layer->screen_space_transform().GetInverse(&from_screen);
+  if (!invertible)
+    from_screen = gfx::Transform();
+  gfx::Rect viewport_rect = MathUtil::ProjectEnclosingClippedRect(
+      from_screen, gfx::Rect(layer->layer_tree_host()->device_viewport_size()));
+  visible_layer_rect.Intersect(viewport_rect);
   switch (mode_) {
     case FIXED_SIZE: {
       // Invalidation with a random position and fixed size.
       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: {
@@ skipping 10 matching lines @@
       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);
       break;
     }
     case VIEWPORT: {
       // Invalidate entire viewport.
-      layer->SetNeedsDisplayRect(layer->visible_layer_rect_for_testing());
+      layer->SetNeedsDisplayRect(visible_layer_rect);
       break;
     }
   }
 }
 
 bool InvalidationBenchmark::ProcessMessage(std::unique_ptr<base::Value> value) {
   base::DictionaryValue* message = nullptr;
   value->GetAsDictionary(&message);
   if (!message)
     return false;
@@ skipping 12 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