Revert of cc: Make heavy layer tree test more realistic

cc/trees/layer_tree_host_perftest.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/trees/layer_tree_host.h"
 
 #include <sstream>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 20 matching lines @@
 static const int kWarmupRuns = 5;
 static const int kTimeCheckInterval = 10;
 
 class LayerTreeHostPerfTest : public LayerTreeTest {
  public:
   LayerTreeHostPerfTest()
       : draw_timer_(kWarmupRuns,
                     base::TimeDelta::FromMilliseconds(kTimeLimitMillis),
                     kTimeCheckInterval),
         commit_timer_(0, base::TimeDelta(), 1),
-        animation_frame_(0),
         full_damage_each_frame_(false),
         animation_driven_drawing_(false),
         measure_commit_cost_(false) {
     fake_content_layer_client_.set_paint_all_opaque(true);
   }
 
   virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
     settings->throttle_frame_production = false;
   }
 
   virtual void BeginTest() OVERRIDE {
     BuildTree();
     PostSetNeedsCommitToMainThread();
   }
 
   virtual void Animate(base::TimeTicks monotonic_time) OVERRIDE {
     if (animation_driven_drawing_ && !TestEnded()) {
       layer_tree_host()->SetNeedsAnimate();
-      // Simulate a transform animation on the root layer.
-      Layer* layer = layer_tree_host()->root_layer();
-      layer->SetPosition(gfx::PointF(0, animation_frame_++ % 2));
+      layer_tree_host()->SetNextCommitForcesRedraw();
     }
   }
 
   virtual void BeginCommitOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     if (measure_commit_cost_)
       commit_timer_.Start();
   }
 
   virtual void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) OVERRIDE {
     if (measure_commit_cost_ && draw_timer_.IsWarmedUp()) {
@@ skipping 27 matching lines @@
                            1000 * draw_timer_.MsPerLap(), "us", true);
     if (measure_commit_cost_) {
       perf_test::PrintResult("layer_tree_host_commit_time", "", test_name_,
                              1000 * commit_timer_.MsPerLap(), "us", true);
     }
   }
 
  protected:
   LapTimer draw_timer_;
   LapTimer commit_timer_;
-  int animation_frame_;
 
   std::string test_name_;
   FakeContentLayerClient fake_content_layer_client_;
   bool full_damage_each_frame_;
   bool animation_driven_drawing_;
 
   bool measure_commit_cost_;
 };
 
 
@@ skipping 209 matching lines @@
 TEST_F(LayerTreeHostPerfTestJsonReader, HeavyPageThreadedImplSide) {
   animation_driven_drawing_ = true;
   measure_commit_cost_ = true;
   SetTestName("heavy_page");
   ReadTestFile("heavy_layer_tree");
   RunTestWithImplSidePainting();
 }
 
 }  // namespace
 }  // namespace cc