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

Side by Side Diff: cc/layers/texture_layer_unittest.cc

Issue 462803002: Fix failing (flaky) LayerTreeHostTestLCDNotification test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
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/layers/texture_layer.h" 5 #include "cc/layers/texture_layer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 1134 matching lines...) Expand 10 before | Expand all | Expand 10 after
1145 LayerTreeTest::SetupTree(); 1145 LayerTreeTest::SetupTree();
1146 } 1146 }
1147 1147
1148 virtual void BeginTest() OVERRIDE { 1148 virtual void BeginTest() OVERRIDE {
1149 PostSetNeedsCommitToMainThread(); 1149 PostSetNeedsCommitToMainThread();
1150 } 1150 }
1151 1151
1152 virtual void DidCommitAndDrawFrame() OVERRIDE { 1152 virtual void DidCommitAndDrawFrame() OVERRIDE {
1153 switch (layer_tree_host()->source_frame_number()) { 1153 switch (layer_tree_host()->source_frame_number()) {
1154 case 1: 1154 case 1:
1155 EXPECT_FALSE(proxy()->CommitPendingForTesting()); 1155 EXPECT_FALSE(proxy()->MainFrameWillHappenForTesting());
1156 // Invalidate the texture layer to clear the mailbox before 1156 // Invalidate the texture layer to clear the mailbox before
1157 // ending the test. 1157 // ending the test.
1158 texture_layer_->SetNeedsDisplay(); 1158 texture_layer_->SetNeedsDisplay();
1159 break; 1159 break;
1160 case 2: 1160 case 2:
1161 break; 1161 break;
1162 default: 1162 default:
1163 NOTREACHED(); 1163 NOTREACHED();
1164 break; 1164 break;
1165 } 1165 }
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 int callback_count_; 1552 int callback_count_;
1553 scoped_refptr<Layer> root_; 1553 scoped_refptr<Layer> root_;
1554 scoped_refptr<TextureLayer> layer_; 1554 scoped_refptr<TextureLayer> layer_;
1555 }; 1555 };
1556 1556
1557 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F( 1557 SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
1558 TextureLayerWithMailboxImplThreadDeleted); 1558 TextureLayerWithMailboxImplThreadDeleted);
1559 1559
1560 } // namespace 1560 } // namespace
1561 } // namespace cc 1561 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/picture_layer.cc ('k') | cc/scheduler/scheduler.h » ('j') | cc/scheduler/scheduler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698