summaryrefslogtreecommitdiffstats
path: root/cc/quads/render_pass_unittest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 18:16:24 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-07 18:16:24 +0000
commit9bf06c7581a762850bd0d25d9f44c52ab6065056 (patch)
tree5161e42d9d33da4e0b1bae9d131a70bafedc3964 /cc/quads/render_pass_unittest.cc
parent275f3166c46b21eff834e6d63de818a69955a3eb (diff)
downloadchromium_src-9bf06c7581a762850bd0d25d9f44c52ab6065056.zip
chromium_src-9bf06c7581a762850bd0d25d9f44c52ab6065056.tar.gz
chromium_src-9bf06c7581a762850bd0d25d9f44c52ab6065056.tar.bz2
cc: Add visible_rect to Draw*Quad::SetNew().
Currently the visible_rect is implicitly set to the quad's |rect| value then later changed by the occlusion/culling code. Instead we want to compute this value up front and set it on the quad when the quad is created. So add it to the SetNew() method. Currently it should always be set to the same value as the |rect|. R=enne BUG=344962 Review URL: https://codereview.chromium.org/185563008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/quads/render_pass_unittest.cc')
-rw-r--r--cc/quads/render_pass_unittest.cc45
1 files changed, 30 insertions, 15 deletions
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index e70a33dd..fd58523 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -92,7 +92,7 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad =
CheckerboardDrawQuad::Create();
checkerboard_quad->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(), SkColor());
+ pass->shared_quad_state_list.back(), gfx::Rect(), gfx::Rect(), SkColor());
pass->quad_list.push_back(checkerboard_quad.PassAs<DrawQuad>());
RenderPass::Id new_id(63, 4);
@@ -142,14 +142,18 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad1 =
CheckerboardDrawQuad::Create();
- checkerboard_quad1->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(1, 1, 1, 1), SkColor());
+ checkerboard_quad1->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(1, 1, 1, 1),
+ gfx::Rect(1, 1, 1, 1),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad1.PassAs<DrawQuad>());
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad2 =
CheckerboardDrawQuad::Create();
- checkerboard_quad2->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(2, 2, 2, 2), SkColor());
+ checkerboard_quad2->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(2, 2, 2, 2),
+ gfx::Rect(2, 2, 2, 2),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad2.PassAs<DrawQuad>());
// And two quads using another shared state.
@@ -165,14 +169,18 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad3 =
CheckerboardDrawQuad::Create();
- checkerboard_quad3->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(3, 3, 3, 3), SkColor());
+ checkerboard_quad3->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(3, 3, 3, 3),
+ gfx::Rect(3, 3, 3, 3),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad3.PassAs<DrawQuad>());
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad4 =
CheckerboardDrawQuad::Create();
- checkerboard_quad4->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(4, 4, 4, 4), SkColor());
+ checkerboard_quad4->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(4, 4, 4, 4),
+ gfx::Rect(4, 4, 4, 4),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad4.PassAs<DrawQuad>());
// A second render pass with a quad.
@@ -202,14 +210,17 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
scoped_ptr<CheckerboardDrawQuad> contrib_quad =
CheckerboardDrawQuad::Create();
- contrib_quad->SetNew(
- contrib->shared_quad_state_list.back(), gfx::Rect(3, 3, 3, 3), SkColor());
+ contrib_quad->SetNew(contrib->shared_quad_state_list.back(),
+ gfx::Rect(3, 3, 3, 3),
+ gfx::Rect(3, 3, 3, 3),
+ SkColor());
contrib->quad_list.push_back(contrib_quad.PassAs<DrawQuad>());
// And a RenderPassDrawQuad for the contributing pass.
scoped_ptr<RenderPassDrawQuad> pass_quad = RenderPassDrawQuad::Create();
pass_quad->SetNew(pass->shared_quad_state_list.back(),
contrib_output_rect,
+ contrib_output_rect,
contrib_id,
false, // is_replica
0, // mask_resource_id
@@ -259,8 +270,10 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad1 =
CheckerboardDrawQuad::Create();
- checkerboard_quad1->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(1, 1, 1, 1), SkColor());
+ checkerboard_quad1->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(1, 1, 1, 1),
+ gfx::Rect(1, 1, 1, 1),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad1.PassAs<DrawQuad>());
// A shared state with no quads, they were culled.
@@ -298,8 +311,10 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
scoped_ptr<CheckerboardDrawQuad> checkerboard_quad2 =
CheckerboardDrawQuad::Create();
- checkerboard_quad2->SetNew(
- pass->shared_quad_state_list.back(), gfx::Rect(3, 3, 3, 3), SkColor());
+ checkerboard_quad2->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(3, 3, 3, 3),
+ gfx::Rect(3, 3, 3, 3),
+ SkColor());
pass->quad_list.push_back(checkerboard_quad2.PassAs<DrawQuad>());
pass_list.push_back(pass.PassAs<RenderPass>());