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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: cc/layers/delegated_renderer_layer_impl_unittest.cc

Issue 465853004: Moving RenderSurface creation outside of CalcDrawProps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « no previous file | cc/layers/delegated_renderer_layer_unittest.cc » ('j') | cc/layers/layer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_renderer_layer_impl_unittest.cc
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index 94ba6c7de5b889cde896ec033eec7f534b39f097..304281451f942690a07c086a238de88c3d91c285 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -69,18 +69,19 @@ class DelegatedRendererLayerImplTestSimple
host_impl_->SetViewportSize(gfx::Size(100, 100));
root_layer->SetBounds(gfx::Size(100, 100));
+ root_layer->SetHasRenderSurface(true);
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_before->SetHasRenderSurface(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);
+ layer_after->SetHasRenderSurface(true);
delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
@@ -295,61 +296,12 @@ TEST_F(DelegatedRendererLayerImplTestSimple, RenderPassTransformIsModified) {
host_impl_->DidDrawAllLayers(frame);
}
-TEST_F(DelegatedRendererLayerImplTestSimple, DoesNotOwnARenderSurface) {
- LayerTreeHostImpl::FrameData frame;
- EXPECT_EQ(DRAW_SUCCESS, 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, gfx::FrameTime::Now());
- host_impl_->DidDrawAllLayers(frame);
-}
-
-TEST_F(DelegatedRendererLayerImplTestSimple, DoesOwnARenderSurfaceForOpacity) {
- delegated_renderer_layer_->SetOpacity(0.5f);
-
- LayerTreeHostImpl::FrameData frame;
- FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(
- host_impl_->active_tree()->root_layer());
- EXPECT_EQ(DRAW_SUCCESS, 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, gfx::FrameTime::Now());
- host_impl_->DidDrawAllLayers(frame);
-}
-
-TEST_F(DelegatedRendererLayerImplTestSimple,
- DoesOwnARenderSurfaceForTransform) {
- gfx::Transform rotation;
- rotation.RotateAboutZAxis(30.0);
- delegated_renderer_layer_->SetTransform(rotation);
-
- LayerTreeHostImpl::FrameData frame;
- FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(
- host_impl_->active_tree()->root_layer());
- EXPECT_EQ(DRAW_SUCCESS, 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, gfx::FrameTime::Now());
- host_impl_->DidDrawAllLayers(frame);
-}
-
class DelegatedRendererLayerImplTestOwnSurface
: public DelegatedRendererLayerImplTestSimple {
public:
DelegatedRendererLayerImplTestOwnSurface()
: DelegatedRendererLayerImplTestSimple() {
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
}
};
@@ -499,6 +451,7 @@ class DelegatedRendererLayerImplTestTransform
host_impl_->SetViewportSize(gfx::Size(200, 200));
root_layer->SetBounds(gfx::Size(100, 100));
+ root_layer->SetHasRenderSurface(true);
delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
delegated_renderer_layer->SetBounds(gfx::Size(75, 75));
@@ -794,7 +747,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsUnclipped_Surface) {
root_delegated_render_pass_is_clipped_ = false;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -842,7 +795,7 @@ TEST_F(DelegatedRendererLayerImplTestTransform, QuadsClipped_Surface) {
root_delegated_render_pass_is_clipped_ = true;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -939,6 +892,7 @@ class DelegatedRendererLayerImplTestClip
host_impl_->SetViewportSize(gfx::Size(100, 100));
root_layer->SetBounds(gfx::Size(100, 100));
+ root_layer->SetHasRenderSurface(true);
delegated_renderer_layer->SetPosition(gfx::Point(20, 20));
delegated_renderer_layer->SetBounds(gfx::Size(50, 50));
@@ -1206,7 +1160,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -1235,7 +1189,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = false;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -1265,7 +1219,7 @@ TEST_F(DelegatedRendererLayerImplTestClip,
clip_delegated_renderer_layer_ = true;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -1293,7 +1247,7 @@ TEST_F(DelegatedRendererLayerImplTestClip, QuadsClipped_LayerClipped_Surface) {
clip_delegated_renderer_layer_ = true;
SetUpTest();
- delegated_renderer_layer_->SetForceRenderSurface(true);
+ delegated_renderer_layer_->SetHasRenderSurface(true);
LayerTreeHostImpl::FrameData frame;
EXPECT_EQ(DRAW_SUCCESS, host_impl_->PrepareToDraw(&frame));
@@ -1326,6 +1280,7 @@ TEST_F(DelegatedRendererLayerImplTest, InvalidRenderPassDrawQuad) {
FakeDelegatedRendererLayerImpl::Create(host_impl_->active_tree(), 4);
host_impl_->SetViewportSize(gfx::Size(100, 100));
+ root_layer->SetHasRenderSurface(true);
delegated_renderer_layer->SetPosition(gfx::Point(3, 3));
delegated_renderer_layer->SetBounds(gfx::Size(10, 10));
« no previous file with comments | « no previous file | cc/layers/delegated_renderer_layer_unittest.cc » ('j') | cc/layers/layer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698