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

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

Issue 23578016: Disable flaky test LayerTreeHostTestCompositeAndReadbackDuringForcedDraw (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« 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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 <algorithm> 7 #include <algorithm>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl, 538 virtual void SwapBuffersOnThread(LayerTreeHostImpl* host_impl,
539 bool result) OVERRIDE { 539 bool result) OVERRIDE {
540 // We should only swap for the forced draw. 540 // We should only swap for the forced draw.
541 EXPECT_EQ(host_impl->active_tree()->source_frame_number(), 2); 541 EXPECT_EQ(host_impl->active_tree()->source_frame_number(), 2);
542 EndTest(); 542 EndTest();
543 } 543 }
544 544
545 virtual void AfterTest() OVERRIDE {} 545 virtual void AfterTest() OVERRIDE {}
546 }; 546 };
547 547
548 MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackDuringForcedDraw); 548 // Flaky test. See http://crbug.com/287893.
549 // MULTI_THREAD_TEST_F(LayerTreeHostTestCompositeAndReadbackDuringForcedDraw);
549 550
550 class LayerTreeHostTestCompositeAndReadbackAfterForcedDraw 551 class LayerTreeHostTestCompositeAndReadbackAfterForcedDraw
551 : public LayerTreeHostTest { 552 : public LayerTreeHostTest {
552 protected: 553 protected:
553 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE { 554 virtual void InitializeSettings(LayerTreeSettings* settings) OVERRIDE {
554 // This enables forced draws after a single prepare to draw failure. 555 // This enables forced draws after a single prepare to draw failure.
555 settings->timeout_and_draw_when_animation_checkerboards = true; 556 settings->timeout_and_draw_when_animation_checkerboards = true;
556 settings->maximum_number_of_failed_draws_before_draw_is_forced_ = 1; 557 settings->maximum_number_of_failed_draws_before_draw_is_forced_ = 1;
557 } 558 }
558 559
(...skipping 3999 matching lines...) Expand 10 before | Expand all | Expand 10 after
4558 int num_will_begin_frames_; 4559 int num_will_begin_frames_;
4559 int num_impl_commits_; 4560 int num_impl_commits_;
4560 }; 4561 };
4561 4562
4562 // Commits can only be aborted when using the thread proxy. 4563 // Commits can only be aborted when using the thread proxy.
4563 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortEvictedTextures); 4564 MULTI_THREAD_TEST_F(LayerTreeHostTestAbortEvictedTextures);
4564 4565
4565 } // namespace 4566 } // namespace
4566 4567
4567 } // namespace cc 4568 } // 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