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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layer_tree_host_impl_unittest.cc

Issue 11618026: Move filters to RenderPassDrawQuad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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
« no previous file with comments | « cc/layer_tree_host_impl.cc ('k') | cc/render_pass.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layer_tree_host_impl_unittest.cc
diff --git a/cc/layer_tree_host_impl_unittest.cc b/cc/layer_tree_host_impl_unittest.cc
index 992ae71934324e222fc38b56bb8a99bd15f7c17a..c85bca83a469a12b04a76b1fbd52bd944fe987ec 100644
--- a/cc/layer_tree_host_impl_unittest.cc
+++ b/cc/layer_tree_host_impl_unittest.cc
@@ -3776,7 +3776,8 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
+ ASSERT_TRUE(targetPass);
EXPECT_FALSE(targetPass->damage_rect.IsEmpty());
myHostImpl->drawLayers(frame);
@@ -3794,8 +3795,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(1U, frame.renderPasses[0]->quad_list.size());
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -3813,8 +3813,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(1U, frame.renderPasses[0]->quad_list.size());
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -3834,7 +3833,8 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
+ ASSERT_TRUE(targetPass);
EXPECT_FALSE(targetPass->damage_rect.IsEmpty());
myHostImpl->drawLayers(frame);
@@ -3861,7 +3861,8 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
+ ASSERT_TRUE(targetPass);
EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
// Was our surface evicted?
@@ -3882,8 +3883,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(1U, frame.renderPasses[0]->quad_list.size());
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -3903,8 +3903,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCaching)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -3935,7 +3934,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
EXPECT_FALSE(targetPass->damage_rect.IsEmpty());
EXPECT_FALSE(frame.renderPasses[0]->damage_rect.IsEmpty());
@@ -3977,8 +3976,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
EXPECT_EQ(1U, frame.renderPasses[0]->quad_list.size());
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -3998,7 +3996,8 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
+ ASSERT_TRUE(targetPass);
EXPECT_FALSE(targetPass->damage_rect.IsEmpty());
myHostImpl->drawLayers(frame);
@@ -4025,7 +4024,8 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[1]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[1]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
+ RenderPass* targetPass = frame.renderPassesById[quad->render_pass_id];
+ ASSERT_TRUE(targetPass);
EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
// Was our surface evicted?
@@ -4064,8 +4064,7 @@ TEST_P(LayerTreeHostImplTest, surfaceTextureCachingNoPartialSwap)
EXPECT_EQ(DrawQuad::RENDER_PASS, frame.renderPasses[0]->quad_list[0]->material);
const RenderPassDrawQuad* quad = RenderPassDrawQuad::MaterialCast(frame.renderPasses[0]->quad_list[0]);
- RenderPass* targetPass = frame.renderPassesById.get(quad->render_pass_id);
- EXPECT_TRUE(targetPass->damage_rect.IsEmpty());
+ EXPECT_TRUE(frame.renderPassesById.find(quad->render_pass_id) == frame.renderPassesById.end());
myHostImpl->drawLayers(frame);
myHostImpl->didDrawAllLayers(frame);
@@ -4223,12 +4222,12 @@ static void configureRenderPassTestData(const char* testScript, RenderPassRemova
gfx::Rect quadRect = gfx::Rect(0, 0, 1, 1);
gfx::Rect contentsChangedRect = contentsChanged ? quadRect : gfx::Rect();
scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create();
- quad->SetNew(testData.sharedQuadState.get(), quadRect, newRenderPassId, isReplica, 1, contentsChangedRect, gfx::RectF(0, 0, 1, 1));
+ quad->SetNew(testData.sharedQuadState.get(), quadRect, newRenderPassId, isReplica, 1, contentsChangedRect, gfx::RectF(0, 0, 1, 1), WebKit::WebFilterOperations(), skia::RefPtr<SkImageFilter>(), WebKit::WebFilterOperations());
renderPass->AppendQuad(quad.PassAs<DrawQuad>());
}
}
- testData.renderPasses.insert(testData.renderPasses.begin(), renderPass.get());
- testData.renderPassesById.add(renderPassId, renderPass.PassAs<RenderPass>());
+ testData.renderPassesById[renderPassId] = renderPass.get();
+ testData.renderPasses.insert(0, renderPass.PassAs<RenderPass>());
if (*currentChar)
currentChar++;
}
@@ -4820,7 +4819,7 @@ protected:
ASSERT_EQ(1u, frame.renderPasses.size());
// Verify the damage rect for the root render pass.
- const RenderPass* rootRenderPass = frame.renderPasses.back();
+ const RenderPass* rootRenderPass = frame.renderPasses.last();
EXPECT_RECT_EQ(expectedDamage, rootRenderPass->damage_rect);
// Verify the root layer's quad is generated and not being culled.
« no previous file with comments | « cc/layer_tree_host_impl.cc ('k') | cc/render_pass.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698