Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
288273003:
Do not use MockQuadCuller when only testing with RenderPass (Closed)
DescriptionDo not use MockQuadCuller when only testing with RenderPass
For unittest that only testing functionatility of Append DrawQuads and
SharedQuadState, only creates RenderPass for it.
This CL is first part of clean up QuadSink. Next step would be to use
test occlusion tracker for MockQuadSink.
BUG=
TEST=cc_unittests
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271011
Patch Set 1 #
Messages
Total messages: 19 (0 generated)
Nice! LGTM
The CQ bit was checked by danakj@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/weiliangc@chromium.org/288273003/1
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are real, and report flakes to chrome-troopers@google.com. The failing builders are: android_dbg_triggered_tests on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...) ios_rel_device on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...) linux_chromium_chromeos_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...) linux_chromium_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_rel/bu...)
The CQ bit was unchecked by commit-bot@chromium.org
Try jobs failed on following builders: android_dbg_triggered_tests on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/android_dbg_triggered...)
The CQ bit was checked by danakj@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/weiliangc@chromium.org/288273003/1
FYI, CQ is re-trying this CL (attempt #1). Please consider checking whether the failures are real, and report flakes to chrome-troopers@google.com. The failing builders are: linux_chromium_chromeos_rel on tryserver.chromium (http://build.chromium.org/p/tryserver.chromium/builders/linux_chromium_chrome...)
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for @master/cc/layers/delegated_renderer_layer_impl_unittest.cc: While running svn add @master --force --config-dir /b/infra_internal/commit_queue/subversion_config --non-interactive; svn: '@master' is just a peg revision. Maybe try '@master@' instead? Patch: @master/cc/layers/delegated_renderer_layer_impl_unittest.cc Index: cc/layers/delegated_renderer_layer_impl_unittest.cc diff --git @master/cc/layers/delegated_renderer_layer_impl_unittest.cc @master/cc/layers/delegated_renderer_layer_impl_unittest.cc index d418bb348cce376027816cf6dfc66243346308c8..5a3d0a23c12e53f90e5fabccb05d7d519d961e5c 100644 --- a/@master/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/@master/cc/layers/delegated_renderer_layer_impl_unittest.cc @@ -17,7 +17,6 @@ #include "cc/test/fake_rendering_stats_instrumentation.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_test_common.h" -#include "cc/test/mock_quad_culler.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/render_pass_test_utils.h" #include "cc/test/test_shared_bitmap_manager.h" @@ -529,8 +528,8 @@ class DelegatedRendererLayerImplTestTransform RenderPass::Id(10, 7), child_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = + pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(child_pass_transform, child_pass_content_bounds, child_pass_rect, @@ -546,7 +545,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(20, 20, 3, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -554,7 +553,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(23, 20, 4, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); } gfx::Size root_pass_content_bounds(100, 100); @@ -570,8 +569,7 @@ class DelegatedRendererLayerImplTestTransform RenderPass::Id(9, 6), root_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(root_pass_transform, root_pass_content_bounds, root_pass_rect, @@ -593,7 +591,7 @@ class DelegatedRendererLayerImplTestTransform gfx::RectF(), // mask_uv_rect FilterOperations(), // filters FilterOperations()); // background_filters - quad_sink.Append(render_pass_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(render_pass_quad.PassAs<DrawQuad>()); scoped_ptr<SolidColorDrawQuad> color_quad; color_quad = SolidColorDrawQuad::Create(); @@ -602,7 +600,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(0, 0, 10, 10), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -610,7 +608,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(0, 10, 10, 10), 2u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -618,7 +616,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(10, 0, 10, 10), 3u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -626,7 +624,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(10, 10, 10, 10), 4u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); delegated_renderer_layer->SetFrameDataForRenderPasses( &delegated_render_passes); @@ -954,8 +952,8 @@ class DelegatedRendererLayerImplTestClip RenderPass::Id(10, 7), child_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = + pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(child_pass_transform, child_pass_content_bounds, child_pass_rect, @@ -971,7 +969,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(20, 20, 3, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -979,7 +977,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(23, 20, 4, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); } gfx::Size root_pass_content_bounds(50, 50); @@ -993,8 +991,7 @@ class DelegatedRendererLayerImplTestClip RenderPass::Id(9, 6), root_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(root_pass_transform, root_pass_content_bounds, root_pass_rect, @@ -1016,7 +1013,7 @@ class DelegatedRendererLayerImplTestClip gfx::RectF(), // mask_uv_rect FilterOperations(), // filters FilterOperations()); // background_filters - quad_sink.Append(render_pass_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(render_pass_quad.PassAs<DrawQuad>()); scoped_ptr<SolidColorDrawQuad> color_quad; color_quad = SolidColorDrawQuad::Create(); @@ -1025,7 +1022,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(0, 0, 10, 10), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1033,7 +1030,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(0, 10, 10, 10), 2u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1041,7 +1038,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(10, 0, 10, 10), 3u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1049,7 +1046,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(10, 10, 10, 10), 4u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); delegated_renderer_layer->SetFrameDataForRenderPasses( &delegated_render_passes);
The CQ bit was checked by weiliangc@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/weiliangc@chromium.org/288273003/1
The CQ bit was unchecked by commit-bot@chromium.org
Failed to apply patch for @master/cc/layers/delegated_renderer_layer_impl_unittest.cc: While running svn add @master --force --config-dir /b/infra_internal/commit_queue/subversion_config --non-interactive; svn: '@master' is just a peg revision. Maybe try '@master@' instead? Patch: @master/cc/layers/delegated_renderer_layer_impl_unittest.cc Index: cc/layers/delegated_renderer_layer_impl_unittest.cc diff --git @master/cc/layers/delegated_renderer_layer_impl_unittest.cc @master/cc/layers/delegated_renderer_layer_impl_unittest.cc index d418bb348cce376027816cf6dfc66243346308c8..5a3d0a23c12e53f90e5fabccb05d7d519d961e5c 100644 --- a/@master/cc/layers/delegated_renderer_layer_impl_unittest.cc +++ b/@master/cc/layers/delegated_renderer_layer_impl_unittest.cc @@ -17,7 +17,6 @@ #include "cc/test/fake_rendering_stats_instrumentation.h" #include "cc/test/geometry_test_utils.h" #include "cc/test/layer_test_common.h" -#include "cc/test/mock_quad_culler.h" #include "cc/test/render_pass_test_common.h" #include "cc/test/render_pass_test_utils.h" #include "cc/test/test_shared_bitmap_manager.h" @@ -529,8 +528,8 @@ class DelegatedRendererLayerImplTestTransform RenderPass::Id(10, 7), child_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = + pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(child_pass_transform, child_pass_content_bounds, child_pass_rect, @@ -546,7 +545,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(20, 20, 3, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -554,7 +553,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(23, 20, 4, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); } gfx::Size root_pass_content_bounds(100, 100); @@ -570,8 +569,7 @@ class DelegatedRendererLayerImplTestTransform RenderPass::Id(9, 6), root_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(root_pass_transform, root_pass_content_bounds, root_pass_rect, @@ -593,7 +591,7 @@ class DelegatedRendererLayerImplTestTransform gfx::RectF(), // mask_uv_rect FilterOperations(), // filters FilterOperations()); // background_filters - quad_sink.Append(render_pass_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(render_pass_quad.PassAs<DrawQuad>()); scoped_ptr<SolidColorDrawQuad> color_quad; color_quad = SolidColorDrawQuad::Create(); @@ -602,7 +600,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(0, 0, 10, 10), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -610,7 +608,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(0, 10, 10, 10), 2u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -618,7 +616,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(10, 0, 10, 10), 3u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -626,7 +624,7 @@ class DelegatedRendererLayerImplTestTransform gfx::Rect(10, 10, 10, 10), 4u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); delegated_renderer_layer->SetFrameDataForRenderPasses( &delegated_render_passes); @@ -954,8 +952,8 @@ class DelegatedRendererLayerImplTestClip RenderPass::Id(10, 7), child_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = + pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(child_pass_transform, child_pass_content_bounds, child_pass_rect, @@ -971,7 +969,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(20, 20, 3, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -979,7 +977,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(23, 20, 4, 7), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); } gfx::Size root_pass_content_bounds(50, 50); @@ -993,8 +991,7 @@ class DelegatedRendererLayerImplTestClip RenderPass::Id(9, 6), root_pass_rect, gfx::Transform()); - MockQuadCuller quad_sink(pass); - SharedQuadState* shared_quad_state = quad_sink.CreateSharedQuadState(); + SharedQuadState* shared_quad_state = pass->CreateAndAppendSharedQuadState(); shared_quad_state->SetAll(root_pass_transform, root_pass_content_bounds, root_pass_rect, @@ -1016,7 +1013,7 @@ class DelegatedRendererLayerImplTestClip gfx::RectF(), // mask_uv_rect FilterOperations(), // filters FilterOperations()); // background_filters - quad_sink.Append(render_pass_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(render_pass_quad.PassAs<DrawQuad>()); scoped_ptr<SolidColorDrawQuad> color_quad; color_quad = SolidColorDrawQuad::Create(); @@ -1025,7 +1022,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(0, 0, 10, 10), 1u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1033,7 +1030,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(0, 10, 10, 10), 2u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1041,7 +1038,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(10, 0, 10, 10), 3u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); color_quad = SolidColorDrawQuad::Create(); color_quad->SetNew(shared_quad_state, @@ -1049,7 +1046,7 @@ class DelegatedRendererLayerImplTestClip gfx::Rect(10, 10, 10, 10), 4u, false); - quad_sink.Append(color_quad.PassAs<DrawQuad>()); + pass->AppendDrawQuad(color_quad.PassAs<DrawQuad>()); delegated_renderer_layer->SetFrameDataForRenderPasses( &delegated_render_passes);
The CQ bit was checked by weiliangc@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/weiliangc@chromium.org/288273003/1
Message was sent while issue was closed.
Change committed as 271011 |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
