cc: Reland Move data to LayerTree from LayerTreeHost.

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 57 matching lines @@
       host, [this](Layer* layer) { layer->RunMicroBenchmark(this); });
 }
 
 void InvalidationBenchmark::RunOnLayer(PictureLayer* layer) {
   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()));
+      from_screen, gfx::Rect(layer->GetLayerTree()->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;
     }
@@ skipping 44 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