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

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

Issue 19106007: cc: Allow the main thread to cancel commits (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add more comments Created 7 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/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include "cc/test/fake_content_layer.h" 7 #include "cc/test/fake_content_layer.h"
8 #include "cc/test/fake_content_layer_client.h" 8 #include "cc/test/fake_content_layer_client.h"
9 #include "cc/test/layer_tree_test.h" 9 #include "cc/test/layer_tree_test.h"
10 #include "cc/trees/damage_tracker.h" 10 #include "cc/trees/damage_tracker.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 layer_tree_host()->SetNeedsCommit(); 80 layer_tree_host()->SetNeedsCommit();
81 break; 81 break;
82 case 2: 82 case 2:
83 // Cause visible damage. 83 // Cause visible damage.
84 content_->SetNeedsDisplayRect( 84 content_->SetNeedsDisplayRect(
85 gfx::Rect(layer_tree_host()->device_viewport_size())); 85 gfx::Rect(layer_tree_host()->device_viewport_size()));
86 break; 86 break;
87 case 3: 87 case 3:
88 // Cause non-visible damage. 88 // Cause non-visible damage.
89 content_->SetNeedsDisplayRect(gfx::Rect(1990, 1990, 10, 10)); 89 content_->SetNeedsDisplayRect(gfx::Rect(1990, 1990, 10, 10));
90 layer_tree_host()->SetNeedsCommit();
90 break; 91 break;
91 } 92 }
92 } 93 }
93 94
94 virtual void AfterTest() OVERRIDE { 95 virtual void AfterTest() OVERRIDE {
95 EXPECT_EQ(4, did_swaps_); 96 EXPECT_EQ(4, did_swaps_);
96 EXPECT_EQ(2, expect_swap_and_succeed_); 97 EXPECT_EQ(2, expect_swap_and_succeed_);
97 EXPECT_EQ(expect_swap_and_succeed_, did_swap_and_succeed_); 98 EXPECT_EQ(expect_swap_and_succeed_, did_swap_and_succeed_);
98 } 99 }
99 100
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 FakeContentLayerClient client_; 280 FakeContentLayerClient client_;
280 scoped_refptr<FakeContentLayer> root_; 281 scoped_refptr<FakeContentLayer> root_;
281 scoped_refptr<FakeContentLayer> child_; 282 scoped_refptr<FakeContentLayer> child_;
282 gfx::RectF child_damage_rect_; 283 gfx::RectF child_damage_rect_;
283 }; 284 };
284 285
285 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestForcedFullDamage); 286 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestForcedFullDamage);
286 287
287 } // namespace 288 } // namespace
288 } // namespace cc 289 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_context.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698