summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-30 09:53:52 +0000
committerskyostil@chromium.org <skyostil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-30 09:53:52 +0000
commit15d5a509b984d04a92dd9204fad6962fabf4f8d3 (patch)
tree15b88354b5bf93db70573843c142eafca71c3810
parent0d81968e24c5f46854c7f31542c4a946bb1f73db (diff)
downloadchromium_src-15d5a509b984d04a92dd9204fad6962fabf4f8d3.zip
chromium_src-15d5a509b984d04a92dd9204fad6962fabf4f8d3.tar.gz
chromium_src-15d5a509b984d04a92dd9204fad6962fabf4f8d3.tar.bz2
Revert of cc: Make heavy layer tree test more realistic (https://codereview.chromium.org/305903003/)
Reason for revert: Actually what we had was working fine. Original issue's description: > cc: Make heavy layer tree test more realistic > > The heavy layer tree test is supposed to simulate a complex layer tree > with transform animation. Currently it does so by forcing repaint of all > layers, but we should only really animate layer transforms to better > match reality. > > BUG=348100 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273646 TBR=enne@chromium.org NOTREECHECKS=true NOTRY=true BUG=348100 Review URL: https://codereview.chromium.org/306023006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273776 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cc/trees/layer_tree_host_perftest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/cc/trees/layer_tree_host_perftest.cc b/cc/trees/layer_tree_host_perftest.cc
index 5a938af..70b2a64 100644
--- a/cc/trees/layer_tree_host_perftest.cc
+++ b/cc/trees/layer_tree_host_perftest.cc
@@ -38,7 +38,6 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
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) {
@@ -57,9 +56,7 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
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();
}
}
@@ -107,7 +104,6 @@ class LayerTreeHostPerfTest : public LayerTreeTest {
protected:
LapTimer draw_timer_;
LapTimer commit_timer_;
- int animation_frame_;
std::string test_name_;
FakeContentLayerClient fake_content_layer_client_;