| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "cc/test/surface_hittest_test_helpers.h" | 5 #include "cc/test/surface_hittest_test_helpers.h" |
| 6 | 6 |
| 7 #include "cc/output/compositor_frame.h" | 7 #include "cc/output/compositor_frame.h" |
| 8 #include "cc/output/delegated_frame_data.h" | 8 #include "cc/output/delegated_frame_data.h" |
| 9 #include "cc/quads/render_pass_draw_quad.h" | 9 #include "cc/quads/render_pass_draw_quad.h" |
| 10 #include "cc/quads/shared_quad_state.h" | 10 #include "cc/quads/shared_quad_state.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 SurfaceDrawQuad* surface_quad = | 56 SurfaceDrawQuad* surface_quad = |
| 57 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); | 57 pass->CreateAndAppendDrawQuad<SurfaceDrawQuad>(); |
| 58 surface_quad->SetNew(pass->shared_quad_state_list.back(), quad_rect, | 58 surface_quad->SetNew(pass->shared_quad_state_list.back(), quad_rect, |
| 59 quad_rect, surface_id); | 59 quad_rect, surface_id); |
| 60 } | 60 } |
| 61 | 61 |
| 62 void CreateRenderPass(const RenderPassId& render_pass_id, | 62 void CreateRenderPass(const RenderPassId& render_pass_id, |
| 63 const gfx::Rect& rect, | 63 const gfx::Rect& rect, |
| 64 const gfx::Transform& transform_to_root_target, | 64 const gfx::Transform& transform_to_root_target, |
| 65 RenderPassList* render_pass_list) { | 65 RenderPassList* render_pass_list) { |
| 66 scoped_ptr<RenderPass> render_pass = RenderPass::Create(); | 66 std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); |
| 67 render_pass->SetNew(render_pass_id, rect, rect, transform_to_root_target); | 67 render_pass->SetNew(render_pass_id, rect, rect, transform_to_root_target); |
| 68 render_pass_list->push_back(std::move(render_pass)); | 68 render_pass_list->push_back(std::move(render_pass)); |
| 69 } | 69 } |
| 70 | 70 |
| 71 scoped_ptr<CompositorFrame> CreateCompositorFrameWithRenderPassList( | 71 std::unique_ptr<CompositorFrame> CreateCompositorFrameWithRenderPassList( |
| 72 RenderPassList* render_pass_list) { | 72 RenderPassList* render_pass_list) { |
| 73 scoped_ptr<DelegatedFrameData> root_delegated_frame_data( | 73 std::unique_ptr<DelegatedFrameData> root_delegated_frame_data( |
| 74 new DelegatedFrameData); | 74 new DelegatedFrameData); |
| 75 root_delegated_frame_data->render_pass_list.swap(*render_pass_list); | 75 root_delegated_frame_data->render_pass_list.swap(*render_pass_list); |
| 76 scoped_ptr<CompositorFrame> root_frame(new CompositorFrame); | 76 std::unique_ptr<CompositorFrame> root_frame(new CompositorFrame); |
| 77 root_frame->delegated_frame_data = std::move(root_delegated_frame_data); | 77 root_frame->delegated_frame_data = std::move(root_delegated_frame_data); |
| 78 return root_frame; | 78 return root_frame; |
| 79 } | 79 } |
| 80 | 80 |
| 81 scoped_ptr<CompositorFrame> CreateCompositorFrame(const gfx::Rect& root_rect, | 81 std::unique_ptr<CompositorFrame> CreateCompositorFrame( |
| 82 RenderPass** render_pass) { | 82 const gfx::Rect& root_rect, |
| 83 RenderPass** render_pass) { |
| 83 RenderPassList render_pass_list; | 84 RenderPassList render_pass_list; |
| 84 RenderPassId root_id(1, 1); | 85 RenderPassId root_id(1, 1); |
| 85 CreateRenderPass(root_id, root_rect, gfx::Transform(), &render_pass_list); | 86 CreateRenderPass(root_id, root_rect, gfx::Transform(), &render_pass_list); |
| 86 | 87 |
| 87 scoped_ptr<CompositorFrame> root_frame = | 88 std::unique_ptr<CompositorFrame> root_frame = |
| 88 CreateCompositorFrameWithRenderPassList(&render_pass_list); | 89 CreateCompositorFrameWithRenderPassList(&render_pass_list); |
| 89 | 90 |
| 90 *render_pass = | 91 *render_pass = |
| 91 root_frame->delegated_frame_data->render_pass_list.back().get(); | 92 root_frame->delegated_frame_data->render_pass_list.back().get(); |
| 92 return root_frame; | 93 return root_frame; |
| 93 } | 94 } |
| 94 | 95 |
| 95 TestSurfaceHittestDelegate::TestSurfaceHittestDelegate() | 96 TestSurfaceHittestDelegate::TestSurfaceHittestDelegate() |
| 96 : reject_target_overrides_(0), accept_target_overrides_(0) {} | 97 : reject_target_overrides_(0), accept_target_overrides_(0) {} |
| 97 | 98 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 // If the point provided falls outside the inset, then we accept this surface. | 136 // If the point provided falls outside the inset, then we accept this surface. |
| 136 if (!bounds.Contains(point_in_quad_space)) { | 137 if (!bounds.Contains(point_in_quad_space)) { |
| 137 ++accept_target_overrides_; | 138 ++accept_target_overrides_; |
| 138 return true; | 139 return true; |
| 139 } | 140 } |
| 140 return false; | 141 return false; |
| 141 } | 142 } |
| 142 | 143 |
| 143 } // namespace test | 144 } // namespace test |
| 144 } // namespace cc | 145 } // namespace cc |
| OLD | NEW |