Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: cc/trees/layer_tree_host_unittest_animation.cc

Issue 1308273009: Revert of Disable RunMultiThread_DirectRenderer on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "cc/animation/animation_curve.h" 7 #include "cc/animation/animation_curve.h"
8 #include "cc/animation/layer_animation_controller.h" 8 #include "cc/animation/layer_animation_controller.h"
9 #include "cc/animation/scroll_offset_animation_curve.h" 9 #include "cc/animation/scroll_offset_animation_curve.h"
10 #include "cc/animation/timing_function.h" 10 #include "cc/animation/timing_function.h"
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 controller_impl->AbortAnimations(Animation::TRANSFORM); 924 controller_impl->AbortAnimations(Animation::TRANSFORM);
925 EndTest(); 925 EndTest();
926 } 926 }
927 927
928 void AfterTest() override {} 928 void AfterTest() override {}
929 929
930 FakeContentLayerClient client_; 930 FakeContentLayerClient client_;
931 scoped_refptr<Layer> layer_; 931 scoped_refptr<Layer> layer_;
932 }; 932 };
933 933
934 // Flaky: http://crbug.com/527087 934 SINGLE_AND_MULTI_THREAD_TEST_F(
935 // SINGLE_AND_MULTI_THREAD_TEST_F( 935 LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit);
936 // LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit);
937 936
938 // When a layer with an animation is removed from the tree and later re-added, 937 // When a layer with an animation is removed from the tree and later re-added,
939 // the animation should resume. 938 // the animation should resume.
940 class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded 939 class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
941 : public LayerTreeHostAnimationTest { 940 : public LayerTreeHostAnimationTest {
942 public: 941 public:
943 void SetupTree() override { 942 void SetupTree() override {
944 LayerTreeHostAnimationTest::SetupTree(); 943 LayerTreeHostAnimationTest::SetupTree();
945 layer_ = Layer::Create(layer_settings()); 944 layer_ = Layer::Create(layer_settings());
946 layer_->SetBounds(gfx::Size(4, 4)); 945 layer_->SetBounds(gfx::Size(4, 4));
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
1303 bool called_animation_finished_; 1302 bool called_animation_finished_;
1304 FakeContentLayerClient client_; 1303 FakeContentLayerClient client_;
1305 scoped_refptr<FakePictureLayer> picture_; 1304 scoped_refptr<FakePictureLayer> picture_;
1306 }; 1305 };
1307 1306
1308 SINGLE_AND_MULTI_THREAD_TEST_F( 1307 SINGLE_AND_MULTI_THREAD_TEST_F(
1309 LayerTreeHostAnimationTestNotifyAnimationFinished); 1308 LayerTreeHostAnimationTestNotifyAnimationFinished);
1310 1309
1311 } // namespace 1310 } // namespace
1312 } // namespace cc 1311 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698