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

Unified Diff: cc/trees/layer_tree_host_unittest_damage.cc

Issue 14925009: Run all LayerTreeHost tests with a delegating renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_unittest_damage.cc
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index beed63cb32b4820401aa08a174d5266bbf5351c2..6b17c7f32cec3df47833d9297e4c1f9600321a09 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -31,7 +31,7 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
// Most of the layer isn't visible.
content_ = FakeContentLayer::Create(&client_);
- content_->SetBounds(gfx::Size(100, 100));
+ content_->SetBounds(gfx::Size(2000, 100));
root->AddChild(content_);
layer_tree_host()->SetRootLayer(root);
@@ -86,7 +86,7 @@ class LayerTreeHostDamageTestNoDamageDoesNotSwap
break;
case 3:
// Cause non-visible damage.
- content_->SetNeedsDisplayRect(gfx::Rect(90, 90, 10, 10));
+ content_->SetNeedsDisplayRect(gfx::Rect(1990, 1990, 10, 10));
break;
}
}
@@ -172,7 +172,9 @@ class LayerTreeHostDamageTestNoDamageReadbackDoesDraw
scoped_refptr<FakeContentLayer> content_;
};
-SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDamageTestNoDamageReadbackDoesDraw);
+// No readbacks with a delegating renderer.
+SINGLE_AND_MULTI_THREAD_DIRECT_RENDERER_TEST_F(
+ LayerTreeHostDamageTestNoDamageReadbackDoesDraw);
class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
virtual void BeginTest() OVERRIDE {
@@ -229,9 +231,17 @@ class LayerTreeHostDamageTestForcedFullDamage : public LayerTreeHostDamageTest {
child_damage_rect_ = gfx::RectF(10, 11, 12, 13);
break;
case 3:
- // The update rect in the child should be damaged.
- EXPECT_EQ(gfx::RectF(100+10, 100+11, 12, 13).ToString(),
- root_damage.ToString());
+ if (!delegating_renderer()) {
+ // The update rect in the child should be damaged.
+ EXPECT_EQ(gfx::RectF(100+10, 100+11, 12, 13).ToString(),
+ root_damage.ToString());
+ } else {
+ // When using a delegating renderer, the entire child is considered
+ // damaged as we need to replace its resources with newly created
+ // ones.
+ EXPECT_EQ(gfx::RectF(child_->position(), child_->bounds()).ToString(),
+ root_damage.ToString());
+ }
EXPECT_FALSE(frame_data->has_no_damage);
// If we damage part of the frame, but also damage the full

Powered by Google App Engine
This is Rietveld 408576698