Chromium Code Reviews| Index: cc/test/surface_hittest_test_helpers.cc |
| diff --git a/cc/test/surface_hittest_test_helpers.cc b/cc/test/surface_hittest_test_helpers.cc |
| index a64533982d2f925e14b0cd3d80bf90c6e75ceda1..8207eae1dde351c9f2e9ce01f5f518c938f34e3d 100644 |
| --- a/cc/test/surface_hittest_test_helpers.cc |
| +++ b/cc/test/surface_hittest_test_helpers.cc |
| @@ -5,7 +5,6 @@ |
| #include "cc/test/surface_hittest_test_helpers.h" |
| #include "cc/output/compositor_frame.h" |
| -#include "cc/output/delegated_frame_data.h" |
| #include "cc/quads/render_pass_draw_quad.h" |
| #include "cc/quads/shared_quad_state.h" |
| #include "cc/quads/solid_color_draw_quad.h" |
| @@ -70,11 +69,8 @@ void CreateRenderPass(const RenderPassId& render_pass_id, |
| CompositorFrame CreateCompositorFrameWithRenderPassList( |
|
danakj
2016/10/27 23:06:57
I think you can drop this method and just move the
Saman Sami
2016/10/28 16:47:36
Done.
|
| RenderPassList* render_pass_list) { |
| - std::unique_ptr<DelegatedFrameData> root_delegated_frame_data( |
| - new DelegatedFrameData); |
| - root_delegated_frame_data->render_pass_list.swap(*render_pass_list); |
| CompositorFrame root_frame; |
| - root_frame.delegated_frame_data = std::move(root_delegated_frame_data); |
| + root_frame.render_pass_list.swap(*render_pass_list); |
| return root_frame; |
| } |
| @@ -87,7 +83,7 @@ CompositorFrame CreateCompositorFrame(const gfx::Rect& root_rect, |
| CompositorFrame root_frame = |
| CreateCompositorFrameWithRenderPassList(&render_pass_list); |
| - *render_pass = root_frame.delegated_frame_data->render_pass_list.back().get(); |
| + *render_pass = root_frame.render_pass_list.back().get(); |
| return root_frame; |
| } |