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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/delegated_renderer_layer_impl_unittest.cc

Issue 12648005: cc: Chromify the LayerTreeHostImpl class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compl Created 7 years, 9 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
« no previous file with comments | « cc/delegated_renderer_layer_impl.cc ('k') | cc/delegating_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/delegated_renderer_layer_impl_unittest.cc b/cc/delegated_renderer_layer_impl_unittest.cc
index 7ab8b5a18a44b62799628873fb77c87a7c3d8d37..def29c1550520c388a889014e76ea13f7f83d8da 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -37,9 +37,9 @@ class DelegatedRendererLayerImplTest : public testing::Test {
LayerTreeSettings settings;
settings.minimumOcclusionTrackingSize = gfx::Size();
- host_impl_ = LayerTreeHostImpl::create(settings, &client_, &proxy_);
- host_impl_->initializeRenderer(createFakeOutputSurface());
- host_impl_->setViewportSize(gfx::Size(10, 10), gfx::Size(10, 10));
+ host_impl_ = LayerTreeHostImpl::Create(settings, &client_, &proxy_);
+ host_impl_->InitializeRenderer(createFakeOutputSurface());
+ host_impl_->SetViewportSize(gfx::Size(10, 10), gfx::Size(10, 10));
}
protected:
@@ -56,15 +56,15 @@ class DelegatedRendererLayerImplTestSimple
DelegatedRendererLayerImplTestSimple()
: DelegatedRendererLayerImplTest() {
scoped_ptr<LayerImpl> root_layer = SolidColorLayerImpl::Create(
- host_impl_->activeTree(), 1).PassAs<LayerImpl>();
+ host_impl_->active_tree(), 1).PassAs<LayerImpl>();
scoped_ptr<LayerImpl> layer_before = SolidColorLayerImpl::Create(
- host_impl_->activeTree(), 2).PassAs<LayerImpl>();
+ host_impl_->active_tree(), 2).PassAs<LayerImpl>();
scoped_ptr<LayerImpl> layer_after = SolidColorLayerImpl::Create(
- host_impl_->activeTree(), 3).PassAs<LayerImpl>();
+ host_impl_->active_tree(), 3).PassAs<LayerImpl>();
scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
- FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 4);
+ FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 4);
- host_impl_->setViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
+ host_impl_->SetViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
root_layer->SetBounds(gfx::Size(100, 100));
layer_before->SetPosition(gfx::Point(20, 20));
@@ -126,7 +126,7 @@ class DelegatedRendererLayerImplTestSimple
// Get the RenderPass generated by layer_before to come before the delegated
// RenderPasses.
root_layer->AddChild(layer_before.Pass());
- host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
+ host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
}
protected:
@@ -138,108 +138,108 @@ class DelegatedRendererLayerImplTestSimple
TEST_F(DelegatedRendererLayerImplTestSimple, AddsContributingRenderPasses) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes.
- ASSERT_EQ(5u, frame.renderPasses.size());
+ ASSERT_EQ(5u, frame.render_passes.size());
// The DelegatedRendererLayer should have added its contributing RenderPasses
// to the frame.
- EXPECT_EQ(4, frame.renderPasses[1]->id.layer_id);
- EXPECT_EQ(1, frame.renderPasses[1]->id.index);
- EXPECT_EQ(4, frame.renderPasses[2]->id.layer_id);
- EXPECT_EQ(2, frame.renderPasses[2]->id.index);
+ EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
+ EXPECT_EQ(1, frame.render_passes[1]->id.index);
+ EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
+ EXPECT_EQ(2, frame.render_passes[2]->id.index);
// And all other RenderPasses should be non-delegated.
- EXPECT_NE(4, frame.renderPasses[0]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[0]->id.index);
- EXPECT_NE(4, frame.renderPasses[3]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[3]->id.index);
- EXPECT_NE(4, frame.renderPasses[4]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[4]->id.index);
+ EXPECT_NE(4, frame.render_passes[0]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[0]->id.index);
+ EXPECT_NE(4, frame.render_passes[3]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[3]->id.index);
+ EXPECT_NE(4, frame.render_passes[4]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[4]->id.index);
// The DelegatedRendererLayer should have added its RenderPasses to the frame
// in order.
EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.renderPasses[1]->output_rect.ToString());
+ frame.render_passes[1]->output_rect.ToString());
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.renderPasses[2]->output_rect.ToString());
+ frame.render_passes[2]->output_rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple,
AddsQuadsToContributingRenderPasses) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes.
- ASSERT_EQ(5u, frame.renderPasses.size());
+ ASSERT_EQ(5u, frame.render_passes.size());
// The DelegatedRendererLayer should have added its contributing RenderPasses
// to the frame.
- EXPECT_EQ(4, frame.renderPasses[1]->id.layer_id);
- EXPECT_EQ(1, frame.renderPasses[1]->id.index);
- EXPECT_EQ(4, frame.renderPasses[2]->id.layer_id);
- EXPECT_EQ(2, frame.renderPasses[2]->id.index);
+ EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
+ EXPECT_EQ(1, frame.render_passes[1]->id.index);
+ EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
+ EXPECT_EQ(2, frame.render_passes[2]->id.index);
// The DelegatedRendererLayer should have added copies of its quads to
// contributing RenderPasses.
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.renderPasses[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list[0]->rect.ToString());
// Verify it added the right quads.
- ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size());
+ ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(),
- frame.renderPasses[2]->quad_list[0]->rect.ToString());
+ frame.render_passes[2]->quad_list[0]->rect.ToString());
EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.renderPasses[2]->quad_list[1]->rect.ToString());
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ frame.render_passes[2]->quad_list[1]->rect.ToString());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.renderPasses[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list[0]->rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple, AddsQuadsToTargetRenderPass) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes.
- ASSERT_EQ(5u, frame.renderPasses.size());
+ ASSERT_EQ(5u, frame.render_passes.size());
// The layer's target is the RenderPass from m_layer_after.
- EXPECT_EQ(RenderPass::Id(3, 0), frame.renderPasses[3]->id);
+ EXPECT_EQ(RenderPass::Id(3, 0), frame.render_passes[3]->id);
// The DelegatedRendererLayer should have added copies of quads in its root
// RenderPass to its target RenderPass. The m_layer_after also adds one quad.
- ASSERT_EQ(2u, frame.renderPasses[3]->quad_list.size());
+ ASSERT_EQ(2u, frame.render_passes[3]->quad_list.size());
// Verify it added the right quads.
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.renderPasses[3]->quad_list[0]->rect.ToString());
+ frame.render_passes[3]->quad_list[0]->rect.ToString());
// Its target layer should have a quad as well.
EXPECT_EQ(gfx::Rect(0, 0, 15, 15).ToString(),
- frame.renderPasses[3]->quad_list[1]->rect.ToString());
+ frame.render_passes[3]->quad_list[1]->rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple,
QuadsFromRootRenderPassAreModifiedForTheTarget) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes.
- ASSERT_EQ(5u, frame.renderPasses.size());
+ ASSERT_EQ(5u, frame.render_passes.size());
// The DelegatedRendererLayer is at position 3,3 compared to its target, and
// has a translation transform of 1,1. So its root RenderPass' quads should
@@ -250,47 +250,47 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
transform.Translate(4.0, 4.0);
transform.Scale(10.0 / 8.0, 10.0 / 8.0);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- transform, frame.renderPasses[3]->quad_list[0]->quadTransform());
+ transform, frame.render_passes[3]->quad_list[0]->quadTransform());
// Quads from non-root RenderPasses should not be shifted though.
- ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size());
+ ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform());
+ gfx::Transform(), frame.render_passes[2]->quad_list[0]->quadTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform());
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ gfx::Transform(), frame.render_passes[2]->quad_list[1]->quadTransform());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform());
+ gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// If the DelegatedRendererLayer is axis aligned and has opacity 1, then it
// has no need to be a renderSurface for the quads it carries.
EXPECT_FALSE(delegated_renderer_layer_->render_surface());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
delegated_renderer_layer_->SetOpacity(0.5f);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// This test case has quads from multiple layers in the delegated renderer, so
// if the DelegatedRendererLayer has opacity < 1, it should end up with a
// render surface.
EXPECT_TRUE(delegated_renderer_layer_->render_surface());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple,
@@ -300,15 +300,15 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
delegated_renderer_layer_->SetTransform(rotation);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// This test case has quads from multiple layers in the delegated renderer, so
// if the DelegatedRendererLayer has opacity < 1, it should end up with a
// render surface.
EXPECT_TRUE(delegated_renderer_layer_->render_surface());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
class DelegatedRendererLayerImplTestOwnSurface
@@ -322,113 +322,113 @@ class DelegatedRendererLayerImplTestOwnSurface
TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsRenderPasses) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes and its owned surface
// added one pass.
- ASSERT_EQ(6u, frame.renderPasses.size());
+ ASSERT_EQ(6u, frame.render_passes.size());
// The DelegatedRendererLayer should have added its contributing RenderPasses
// to the frame.
- EXPECT_EQ(4, frame.renderPasses[1]->id.layer_id);
- EXPECT_EQ(1, frame.renderPasses[1]->id.index);
- EXPECT_EQ(4, frame.renderPasses[2]->id.layer_id);
- EXPECT_EQ(2, frame.renderPasses[2]->id.index);
+ EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
+ EXPECT_EQ(1, frame.render_passes[1]->id.index);
+ EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
+ EXPECT_EQ(2, frame.render_passes[2]->id.index);
// The DelegatedRendererLayer should have added a RenderPass for its surface
// to the frame.
- EXPECT_EQ(4, frame.renderPasses[1]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[3]->id.index);
+ EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[3]->id.index);
// And all other RenderPasses should be non-delegated.
- EXPECT_NE(4, frame.renderPasses[0]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[0]->id.index);
- EXPECT_NE(4, frame.renderPasses[4]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[4]->id.index);
- EXPECT_NE(4, frame.renderPasses[5]->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses[5]->id.index);
+ EXPECT_NE(4, frame.render_passes[0]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[0]->id.index);
+ EXPECT_NE(4, frame.render_passes[4]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[4]->id.index);
+ EXPECT_NE(4, frame.render_passes[5]->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes[5]->id.index);
// The DelegatedRendererLayer should have added its RenderPasses to the frame
// in order.
EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.renderPasses[1]->output_rect.ToString());
+ frame.render_passes[1]->output_rect.ToString());
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.renderPasses[2]->output_rect.ToString());
+ frame.render_passes[2]->output_rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestOwnSurface,
AddsQuadsToContributingRenderPasses) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes and its owned surface
// added one pass.
- ASSERT_EQ(6u, frame.renderPasses.size());
+ ASSERT_EQ(6u, frame.render_passes.size());
// The DelegatedRendererLayer should have added its contributing RenderPasses
// to the frame.
- EXPECT_EQ(4, frame.renderPasses[1]->id.layer_id);
- EXPECT_EQ(1, frame.renderPasses[1]->id.index);
- EXPECT_EQ(4, frame.renderPasses[2]->id.layer_id);
- EXPECT_EQ(2, frame.renderPasses[2]->id.index);
+ EXPECT_EQ(4, frame.render_passes[1]->id.layer_id);
+ EXPECT_EQ(1, frame.render_passes[1]->id.index);
+ EXPECT_EQ(4, frame.render_passes[2]->id.layer_id);
+ EXPECT_EQ(2, frame.render_passes[2]->id.index);
// The DelegatedRendererLayer should have added copies of its quads to
// contributing RenderPasses.
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.renderPasses[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list[0]->rect.ToString());
// Verify it added the right quads.
- ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size());
+ ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 7, 7).ToString(),
- frame.renderPasses[2]->quad_list[0]->rect.ToString());
+ frame.render_passes[2]->quad_list[0]->rect.ToString());
EXPECT_EQ(gfx::Rect(6, 6, 6, 6).ToString(),
- frame.renderPasses[2]->quad_list[1]->rect.ToString());
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ frame.render_passes[2]->quad_list[1]->rect.ToString());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_EQ(gfx::Rect(0, 0, 6, 6).ToString(),
- frame.renderPasses[1]->quad_list[0]->rect.ToString());
+ frame.render_passes[1]->quad_list[0]->rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestOwnSurface, AddsQuadsToTargetRenderPass) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes and its owned surface
// added one pass.
- ASSERT_EQ(6u, frame.renderPasses.size());
+ ASSERT_EQ(6u, frame.render_passes.size());
// The layer's target is the RenderPass owned by itself.
- EXPECT_EQ(RenderPass::Id(4, 0), frame.renderPasses[3]->id);
+ EXPECT_EQ(RenderPass::Id(4, 0), frame.render_passes[3]->id);
// The DelegatedRendererLayer should have added copies of quads in its root
// RenderPass to its target RenderPass.
// The m_layer_after also adds one quad.
- ASSERT_EQ(1u, frame.renderPasses[3]->quad_list.size());
+ ASSERT_EQ(1u, frame.render_passes[3]->quad_list.size());
// Verify it added the right quads.
EXPECT_EQ(gfx::Rect(7, 7, 7, 7).ToString(),
- frame.renderPasses[3]->quad_list[0]->rect.ToString());
+ frame.render_passes[3]->quad_list[0]->rect.ToString());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestOwnSurface,
QuadsFromRootRenderPassAreNotModifiedForTheTarget) {
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
// Each non-DelegatedRendererLayer added one RenderPass. The
// DelegatedRendererLayer added two contributing passes and its owned surface
// added one pass.
- ASSERT_EQ(6u, frame.renderPasses.size());
+ ASSERT_EQ(6u, frame.render_passes.size());
// Because the DelegatedRendererLayer owns a RenderSurfaceImpl, its root
// RenderPass' quads do not need to be translated at all. However, they are
@@ -436,20 +436,20 @@ TEST_F(DelegatedRendererLayerImplTestOwnSurface,
gfx::Transform transform;
transform.Scale(10.0 / 8.0, 10.0 / 8.0);
EXPECT_TRANSFORMATION_MATRIX_EQ(
- transform, frame.renderPasses[3]->quad_list[0]->quadTransform());
+ transform, frame.render_passes[3]->quad_list[0]->quadTransform());
// Quads from non-root RenderPasses should not be shifted either.
- ASSERT_EQ(2u, frame.renderPasses[2]->quad_list.size());
+ ASSERT_EQ(2u, frame.render_passes[2]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[2]->quad_list[0]->quadTransform());
+ gfx::Transform(), frame.render_passes[2]->quad_list[0]->quadTransform());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[2]->quad_list[1]->quadTransform());
- ASSERT_EQ(1u, frame.renderPasses[1]->quad_list.size());
+ gfx::Transform(), frame.render_passes[2]->quad_list[1]->quadTransform());
+ ASSERT_EQ(1u, frame.render_passes[1]->quad_list.size());
EXPECT_TRANSFORMATION_MATRIX_EQ(
- gfx::Transform(), frame.renderPasses[1]->quad_list[0]->quadTransform());
+ gfx::Transform(), frame.render_passes[1]->quad_list[0]->quadTransform());
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
class DelegatedRendererLayerImplTestTransform
@@ -457,11 +457,11 @@ class DelegatedRendererLayerImplTestTransform
public:
void SetUpTest() {
scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(
- host_impl_->activeTree(), 1);
+ host_impl_->active_tree(), 1);
scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
- FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 2);
+ FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 2);
- host_impl_->setViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
+ host_impl_->SetViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
root_layer->SetBounds(gfx::Size(100, 100));
delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
@@ -526,7 +526,8 @@ class DelegatedRendererLayerImplTestTransform
gfx::Transform());
MockQuadCuller quad_sink(pass->quad_list, pass->shared_quad_state_list);
AppendQuadsData data(pass->id);
- SharedQuadState* shared_quad_state = quad_sink.useSharedQuadState(SharedQuadState::Create());
+ SharedQuadState* shared_quad_state =
+ quad_sink.useSharedQuadState(SharedQuadState::Create());
shared_quad_state->SetAll(
root_pass_transform,
root_pass_content_bounds,
@@ -577,7 +578,7 @@ class DelegatedRendererLayerImplTestTransform
delegated_renderer_layer_ = delegated_renderer_layer.get();
root_layer->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
- host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
+ host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
}
void VerifyRenderPasses(
@@ -585,19 +586,20 @@ class DelegatedRendererLayerImplTestTransform
size_t num_render_passes,
const SharedQuadState** root_delegated_shared_quad_state,
const SharedQuadState** contrib_delegated_shared_quad_state) {
- ASSERT_EQ(num_render_passes, frame.renderPasses.size());
+ ASSERT_EQ(num_render_passes, frame.render_passes.size());
// The contributing render pass in the DelegatedRendererLayer.
- EXPECT_EQ(2, frame.renderPasses[0]->id.layer_id);
- EXPECT_EQ(1, frame.renderPasses[0]->id.index);
+ EXPECT_EQ(2, frame.render_passes[0]->id.layer_id);
+ EXPECT_EQ(1, frame.render_passes[0]->id.index);
// The root render pass.
- EXPECT_EQ(1, frame.renderPasses.back()->id.layer_id);
- EXPECT_EQ(0, frame.renderPasses.back()->id.index);
+ EXPECT_EQ(1, frame.render_passes.back()->id.layer_id);
+ EXPECT_EQ(0, frame.render_passes.back()->id.index);
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list =
+ frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
// All quads in a render pass should share the same state.
@@ -632,7 +634,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = NULL;
const SharedQuadState* contrib_delegated_shared_quad_state = NULL;
@@ -677,8 +679,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_NoSurface) {
expected,
contrib_delegated_shared_quad_state->content_to_target_transform);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
@@ -686,7 +688,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = NULL;
const SharedQuadState* contrib_delegated_shared_quad_state = NULL;
@@ -736,8 +738,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_NoSurface) {
expected,
contrib_delegated_shared_quad_state->content_to_target_transform);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
@@ -747,7 +749,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = NULL;
const SharedQuadState* contrib_delegated_shared_quad_state = NULL;
@@ -791,8 +793,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
expected,
contrib_delegated_shared_quad_state->content_to_target_transform);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
@@ -802,7 +804,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
const SharedQuadState* root_delegated_shared_quad_state = NULL;
const SharedQuadState* contrib_delegated_shared_quad_state = NULL;
@@ -845,8 +847,8 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
expected,
contrib_delegated_shared_quad_state->content_to_target_transform);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
class DelegatedRendererLayerImplTestClip
@@ -854,15 +856,15 @@ class DelegatedRendererLayerImplTestClip
public:
void SetUpTest() {
scoped_ptr<LayerImpl> root_layer =
- LayerImpl::Create(host_impl_->activeTree(), 1);
+ LayerImpl::Create(host_impl_->active_tree(), 1);
scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
- FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 2);
+ FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 2);
scoped_ptr<LayerImpl> clip_layer =
- LayerImpl::Create(host_impl_->activeTree(), 3);
+ LayerImpl::Create(host_impl_->active_tree(), 3);
scoped_ptr<LayerImpl> origin_layer =
- LayerImpl::Create(host_impl_->activeTree(), 4);
+ LayerImpl::Create(host_impl_->active_tree(), 4);
- host_impl_->setViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
+ host_impl_->SetViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
root_layer->SetBounds(gfx::Size(100, 100));
delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
@@ -987,7 +989,7 @@ class DelegatedRendererLayerImplTestClip
root_layer->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
}
- host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
+ host_impl_->active_tree()->SetRootLayer(root_layer.Pass());
}
protected:
@@ -1004,13 +1006,13 @@ TEST_F(DelegatedRendererLayerImplTestClip,
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(2u, frame.renderPasses.size());
+ ASSERT_EQ(2u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1024,8 +1026,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// Quads are clipped to the delegated renderer layer.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1035,14 +1037,14 @@ TEST_F(DelegatedRendererLayerImplTestClip,
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(2u, frame.renderPasses.size());
+ ASSERT_EQ(2u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
const QuadList& root_delegated_quad_list =
- frame.renderPasses[1]->quad_list;
+ frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1055,8 +1057,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// Quads came with a clip rect.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1066,13 +1068,13 @@ TEST_F(DelegatedRendererLayerImplTestClip,
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(2u, frame.renderPasses.size());
+ ASSERT_EQ(2u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1087,8 +1089,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// Quads are clipped to the delegated renderer layer.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1098,13 +1100,13 @@ TEST_F(DelegatedRendererLayerImplTestClip,
SetUpTest();
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(2u, frame.renderPasses.size());
+ ASSERT_EQ(2u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1118,8 +1120,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// Quads came with a clip rect.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1131,13 +1133,13 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(3u, frame.renderPasses.size());
+ ASSERT_EQ(3u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1149,8 +1151,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// clip rect is ignored, and they are not set as clipped.
EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1162,14 +1164,16 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(3u, frame.renderPasses.size());
- const QuadList& contrib_delegated_quad_list = frame.renderPasses[0]->quad_list;
+ ASSERT_EQ(3u, frame.render_passes.size());
+ const QuadList& contrib_delegated_quad_list =
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
- const SharedQuadState* root_delegated_shared_quad_state = root_delegated_quad_list[0]->shared_quad_state;
+ const SharedQuadState* root_delegated_shared_quad_state =
+ root_delegated_quad_list[0]->shared_quad_state;
const SharedQuadState* contrib_delegated_shared_quad_state =
contrib_delegated_quad_list[0]->shared_quad_state;
@@ -1179,8 +1183,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// Quads came with a clip rect.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip,
@@ -1192,13 +1196,13 @@ TEST_F(DelegatedRendererLayerImplTestClip,
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(3u, frame.renderPasses.size());
+ ASSERT_EQ(3u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1210,8 +1214,8 @@ TEST_F(DelegatedRendererLayerImplTestClip,
// clip rect is ignored, and they are not set as clipped.
EXPECT_FALSE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
@@ -1222,13 +1226,13 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
- EXPECT_TRUE(host_impl_->prepareToDraw(frame));
+ EXPECT_TRUE(host_impl_->PrepareToDraw(&frame));
- ASSERT_EQ(3u, frame.renderPasses.size());
+ ASSERT_EQ(3u, frame.render_passes.size());
const QuadList& contrib_delegated_quad_list =
- frame.renderPasses[0]->quad_list;
+ frame.render_passes[0]->quad_list;
ASSERT_EQ(2u, contrib_delegated_quad_list.size());
- const QuadList& root_delegated_quad_list = frame.renderPasses[1]->quad_list;
+ const QuadList& root_delegated_quad_list = frame.render_passes[1]->quad_list;
ASSERT_EQ(5u, root_delegated_quad_list.size());
const SharedQuadState* root_delegated_shared_quad_state =
root_delegated_quad_list[0]->shared_quad_state;
@@ -1243,8 +1247,8 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
// Quads came with a clip rect.
EXPECT_TRUE(root_delegated_shared_quad_state->is_clipped);
- host_impl_->drawLayers(frame);
- host_impl_->didDrawAllLayers(frame);
+ host_impl_->DrawLayers(&frame);
+ host_impl_->DidDrawAllLayers(frame);
}
} // namespace
« no previous file with comments | « cc/delegated_renderer_layer_impl.cc ('k') | cc/delegating_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698