summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 22:45:45 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-19 22:45:45 +0000
commitd304e4ba4dddfee825a5081db48277f8aa98a3c3 (patch)
tree5cbf8bb2285e2b93551a262c7352688a963df4b9
parent4365a96730b41a3dc07f1cfe212eaa7ee565e1b1 (diff)
downloadchromium_src-d304e4ba4dddfee825a5081db48277f8aa98a3c3.zip
chromium_src-d304e4ba4dddfee825a5081db48277f8aa98a3c3.tar.gz
chromium_src-d304e4ba4dddfee825a5081db48277f8aa98a3c3.tar.bz2
cc: Use QuadSink::Append instead of MaybeAppend in DRLImpl tests.
The DelegatedRendererLayerImpl unittests don't use occlusion, so just swap them back to using Append() directly. R=enne BUG=344962 Review URL: https://codereview.chromium.org/199483003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258134 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--cc/layers/delegated_renderer_layer_impl_unittest.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/cc/layers/delegated_renderer_layer_impl_unittest.cc b/cc/layers/delegated_renderer_layer_impl_unittest.cc
index e45128b..84a862f 100644
--- a/cc/layers/delegated_renderer_layer_impl_unittest.cc
+++ b/cc/layers/delegated_renderer_layer_impl_unittest.cc
@@ -555,7 +555,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(20, 20, 3, 7),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -563,7 +563,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(23, 20, 4, 7),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
}
gfx::Size root_pass_content_bounds(100, 100);
@@ -603,7 +603,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::RectF(), // mask_uv_rect
FilterOperations(), // filters
FilterOperations()); // background_filters
- quad_sink.MaybeAppend(render_pass_quad.PassAs<DrawQuad>());
+ quad_sink.Append(render_pass_quad.PassAs<DrawQuad>());
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
@@ -612,7 +612,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(0, 0, 10, 10),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -620,7 +620,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(0, 10, 10, 10),
2u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -628,7 +628,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(10, 0, 10, 10),
3u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -636,7 +636,7 @@ class DelegatedRendererLayerImplTestTransform
gfx::Rect(10, 10, 10, 10),
4u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
delegated_renderer_layer->SetFrameDataForRenderPasses(
&delegated_render_passes);
@@ -986,7 +986,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(20, 20, 3, 7),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -994,7 +994,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(23, 20, 4, 7),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
}
gfx::Size root_pass_content_bounds(50, 50);
@@ -1032,7 +1032,7 @@ class DelegatedRendererLayerImplTestClip
gfx::RectF(), // mask_uv_rect
FilterOperations(), // filters
FilterOperations()); // background_filters
- quad_sink.MaybeAppend(render_pass_quad.PassAs<DrawQuad>());
+ quad_sink.Append(render_pass_quad.PassAs<DrawQuad>());
scoped_ptr<SolidColorDrawQuad> color_quad;
color_quad = SolidColorDrawQuad::Create();
@@ -1041,7 +1041,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(0, 0, 10, 10),
1u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -1049,7 +1049,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(0, 10, 10, 10),
2u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -1057,7 +1057,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(10, 0, 10, 10),
3u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
color_quad = SolidColorDrawQuad::Create();
color_quad->SetNew(shared_quad_state,
@@ -1065,7 +1065,7 @@ class DelegatedRendererLayerImplTestClip
gfx::Rect(10, 10, 10, 10),
4u,
false);
- quad_sink.MaybeAppend(color_quad.PassAs<DrawQuad>());
+ quad_sink.Append(color_quad.PassAs<DrawQuad>());
delegated_renderer_layer->SetFrameDataForRenderPasses(
&delegated_render_passes);