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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/delegated_renderer_layer_impl_unittest.cc

Issue 12774006: cc: Chromify Layer and LayerImpl classes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: MoreAndroidCompilings 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/frame_rate_controller.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 5c31c75a0591c1f3199a0f01d2eb4e4676a43730..7ab8b5a18a44b62799628873fb77c87a7c3d8d37 100644
--- a/cc/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/delegated_renderer_layer_impl_unittest.cc
@@ -65,27 +65,27 @@ class DelegatedRendererLayerImplTestSimple
FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 4);
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));
- layer_before->setBounds(gfx::Size(14, 14));
- layer_before->setContentBounds(gfx::Size(14, 14));
- layer_before->setDrawsContent(true);
- layer_before->setForceRenderSurface(true);
-
- layer_after->setPosition(gfx::Point(5, 5));
- layer_after->setBounds(gfx::Size(15, 15));
- layer_after->setContentBounds(gfx::Size(15, 15));
- layer_after->setDrawsContent(true);
- layer_after->setForceRenderSurface(true);
-
- delegated_renderer_layer->setPosition(gfx::Point(3, 3));
- delegated_renderer_layer->setBounds(gfx::Size(10, 10));
- delegated_renderer_layer->setContentBounds(gfx::Size(10, 10));
- delegated_renderer_layer->setDrawsContent(true);
+ root_layer->SetBounds(gfx::Size(100, 100));
+
+ layer_before->SetPosition(gfx::Point(20, 20));
+ layer_before->SetBounds(gfx::Size(14, 14));
+ layer_before->SetContentBounds(gfx::Size(14, 14));
+ layer_before->SetDrawsContent(true);
+ layer_before->SetForceRenderSurface(true);
+
+ layer_after->SetPosition(gfx::Point(5, 5));
+ layer_after->SetBounds(gfx::Size(15, 15));
+ layer_after->SetContentBounds(gfx::Size(15, 15));
+ layer_after->SetDrawsContent(true);
+ layer_after->SetForceRenderSurface(true);
+
+ delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
+ delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
+ delegated_renderer_layer->SetContentBounds(gfx::Size(10, 10));
+ delegated_renderer_layer->SetDrawsContent(true);
gfx::Transform transform;
transform.Translate(1.0, 1.0);
- delegated_renderer_layer->setTransform(transform);
+ delegated_renderer_layer->SetTransform(transform);
ScopedPtrVector<RenderPass> delegated_render_passes;
TestRenderPass* pass1 = addRenderPass(
@@ -120,12 +120,12 @@ class DelegatedRendererLayerImplTestSimple
// Force the delegated RenderPasses to come before the RenderPass from
// layer_after.
- layer_after->addChild(delegated_renderer_layer.PassAs<LayerImpl>());
- root_layer->addChild(layer_after.Pass());
+ layer_after->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
+ root_layer->AddChild(layer_after.Pass());
// Get the RenderPass generated by layer_before to come before the delegated
// RenderPasses.
- root_layer->addChild(layer_before.Pass());
+ root_layer->AddChild(layer_before.Pass());
host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
}
@@ -272,14 +272,14 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) {
// 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_->renderSurface());
+ EXPECT_FALSE(delegated_renderer_layer_->render_surface());
host_impl_->drawLayers(frame);
host_impl_->didDrawAllLayers(frame);
}
TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
- delegated_renderer_layer_->setOpacity(0.5f);
+ delegated_renderer_layer_->SetOpacity(0.5f);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -287,7 +287,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
// 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_->renderSurface());
+ EXPECT_TRUE(delegated_renderer_layer_->render_surface());
host_impl_->drawLayers(frame);
host_impl_->didDrawAllLayers(frame);
@@ -297,7 +297,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
DoesOwnARenderSurfaceForTransform) {
gfx::Transform rotation;
rotation.RotateAboutZAxis(30.0);
- delegated_renderer_layer_->setTransform(rotation);
+ delegated_renderer_layer_->SetTransform(rotation);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -305,7 +305,7 @@ TEST_F(DelegatedRendererLayerImplTestSimple,
// 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_->renderSurface());
+ EXPECT_TRUE(delegated_renderer_layer_->render_surface());
host_impl_->drawLayers(frame);
host_impl_->didDrawAllLayers(frame);
@@ -316,7 +316,7 @@ class DelegatedRendererLayerImplTestOwnSurface
public:
DelegatedRendererLayerImplTestOwnSurface()
: DelegatedRendererLayerImplTestSimple() {
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
}
};
@@ -456,22 +456,22 @@ class DelegatedRendererLayerImplTestTransform
: public DelegatedRendererLayerImplTest {
public:
void SetUpTest() {
- scoped_ptr<LayerImpl> root_layer = LayerImpl::create(
+ scoped_ptr<LayerImpl> root_layer = LayerImpl::Create(
host_impl_->activeTree(), 1);
scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 2);
host_impl_->setViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
- root_layer->setBounds(gfx::Size(100, 100));
+ root_layer->SetBounds(gfx::Size(100, 100));
- delegated_renderer_layer->setPosition(gfx::Point(20, 20));
- delegated_renderer_layer->setBounds(gfx::Size(30, 30));
- delegated_renderer_layer->setContentBounds(gfx::Size(30, 30));
- delegated_renderer_layer->setDrawsContent(true);
+ delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
+ delegated_renderer_layer->SetBounds(gfx::Size(30, 30));
+ delegated_renderer_layer->SetContentBounds(gfx::Size(30, 30));
+ delegated_renderer_layer->SetDrawsContent(true);
gfx::Transform transform;
transform.Scale(2.0, 2.0);
transform.Translate(8.0, 8.0);
- delegated_renderer_layer->setTransform(transform);
+ delegated_renderer_layer->SetTransform(transform);
ScopedPtrVector<RenderPass> delegated_render_passes;
@@ -504,11 +504,11 @@ class DelegatedRendererLayerImplTestTransform
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(20, 20, 3, 7), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(23, 20, 4, 7), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
}
gfx::Size root_pass_content_bounds(50, 50);
@@ -548,24 +548,24 @@ class DelegatedRendererLayerImplTestTransform
WebKit::WebFilterOperations(), // filters
skia::RefPtr<SkImageFilter>(), // filter
WebKit::WebFilterOperations()); // background_filters
- quad_sink.append(render_pass_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(render_pass_quad.PassAs<DrawQuad>(), &data);
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(0, 0, 10, 10), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(0, 10, 10, 10), 2u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(10, 0, 10, 10), 3u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(10, 10, 10, 10), 4u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
delegated_renderer_layer->SetFrameDataForRenderPasses(
&delegated_render_passes);
@@ -576,7 +576,7 @@ class DelegatedRendererLayerImplTestTransform
root_layer_ = root_layer.get();
delegated_renderer_layer_ = delegated_renderer_layer.get();
- root_layer->addChild(delegated_renderer_layer.PassAs<LayerImpl>());
+ root_layer->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
}
@@ -744,7 +744,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
root_delegated_render_pass_is_clipped_ = false;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -799,7 +799,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
root_delegated_render_pass_is_clipped_ = true;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -854,21 +854,21 @@ class DelegatedRendererLayerImplTestClip
public:
void SetUpTest() {
scoped_ptr<LayerImpl> root_layer =
- LayerImpl::create(host_impl_->activeTree(), 1);
+ LayerImpl::Create(host_impl_->activeTree(), 1);
scoped_ptr<FakeDelegatedRendererLayerImpl> delegated_renderer_layer =
FakeDelegatedRendererLayerImpl::Create(host_impl_->activeTree(), 2);
scoped_ptr<LayerImpl> clip_layer =
- LayerImpl::create(host_impl_->activeTree(), 3);
+ LayerImpl::Create(host_impl_->activeTree(), 3);
scoped_ptr<LayerImpl> origin_layer =
- LayerImpl::create(host_impl_->activeTree(), 4);
+ LayerImpl::Create(host_impl_->activeTree(), 4);
host_impl_->setViewportSize(gfx::Size(100, 100), gfx::Size(100, 100));
- root_layer->setBounds(gfx::Size(100, 100));
+ root_layer->SetBounds(gfx::Size(100, 100));
- delegated_renderer_layer->setPosition(gfx::Point(20, 20));
- delegated_renderer_layer->setBounds(gfx::Size(50, 50));
- delegated_renderer_layer->setContentBounds(gfx::Size(50, 50));
- delegated_renderer_layer->setDrawsContent(true);
+ delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
+ delegated_renderer_layer->SetBounds(gfx::Size(50, 50));
+ delegated_renderer_layer->SetContentBounds(gfx::Size(50, 50));
+ delegated_renderer_layer->SetDrawsContent(true);
ScopedPtrVector<RenderPass> delegated_render_passes;
@@ -899,11 +899,11 @@ class DelegatedRendererLayerImplTestClip
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(20, 20, 3, 7), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(23, 20, 4, 7), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
}
gfx::Size root_pass_content_bounds(50, 50);
@@ -941,24 +941,24 @@ class DelegatedRendererLayerImplTestClip
WebKit::WebFilterOperations(), // filters
skia::RefPtr<SkImageFilter>(), // filter
WebKit::WebFilterOperations()); // background_filters
- quad_sink.append(render_pass_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(render_pass_quad.PassAs<DrawQuad>(), &data);
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(0, 0, 10, 10), 1u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(0, 10, 10, 10), 2u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(10, 0, 10, 10), 3u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state, gfx::Rect(10, 10, 10, 10), 4u);
- quad_sink.append(color_quad.PassAs<DrawQuad>(), data);
+ quad_sink.append(color_quad.PassAs<DrawQuad>(), &data);
delegated_renderer_layer->SetFrameDataForRenderPasses(
&delegated_render_passes);
@@ -972,19 +972,19 @@ class DelegatedRendererLayerImplTestClip
if (clip_delegated_renderer_layer_) {
gfx::Rect clip_rect(21, 27, 23, 21);
- clip_layer->setPosition(clip_rect.origin());
- clip_layer->setBounds(clip_rect.size());
- clip_layer->setContentBounds(clip_rect.size());
- clip_layer->setMasksToBounds(true);
+ clip_layer->SetPosition(clip_rect.origin());
+ clip_layer->SetBounds(clip_rect.size());
+ clip_layer->SetContentBounds(clip_rect.size());
+ clip_layer->SetMasksToBounds(true);
- origin_layer->setPosition(
+ origin_layer->SetPosition(
gfx::PointAtOffsetFromOrigin(-clip_rect.OffsetFromOrigin()));
- origin_layer->addChild(delegated_renderer_layer.PassAs<LayerImpl>());
- clip_layer->addChild(origin_layer.Pass());
- root_layer->addChild(clip_layer.Pass());
+ origin_layer->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
+ clip_layer->AddChild(origin_layer.Pass());
+ root_layer->AddChild(clip_layer.Pass());
} else {
- root_layer->addChild(delegated_renderer_layer.PassAs<LayerImpl>());
+ root_layer->AddChild(delegated_renderer_layer.PassAs<LayerImpl>());
}
host_impl_->activeTree()->SetRootLayer(root_layer.Pass());
@@ -1128,7 +1128,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -1159,7 +1159,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -1189,7 +1189,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = true;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
@@ -1219,7 +1219,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
clip_delegated_renderer_layer_ = true;
SetUpTest();
- delegated_renderer_layer_->setForceRenderSurface(true);
+ delegated_renderer_layer_->SetForceRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_TRUE(host_impl_->prepareToDraw(frame));
« no previous file with comments | « cc/delegated_renderer_layer_impl.cc ('k') | cc/frame_rate_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698