Chromium Code Reviews| Index: cc/surfaces/surface_hittest.cc |
| diff --git a/cc/surfaces/surface_hittest.cc b/cc/surfaces/surface_hittest.cc |
| index e4605bdf8eeba6677d39512d2239965c8e879313..5e67fadc50271a992a91039cf3066409af44d9c1 100644 |
| --- a/cc/surfaces/surface_hittest.cc |
| +++ b/cc/surfaces/surface_hittest.cc |
| @@ -5,7 +5,6 @@ |
| #include "cc/surfaces/surface_hittest.h" |
| #include "cc/output/compositor_frame.h" |
| -#include "cc/output/delegated_frame_data.h" |
| #include "cc/quads/draw_quad.h" |
| #include "cc/quads/render_pass_draw_quad.h" |
| #include "cc/quads/surface_draw_quad.h" |
| @@ -260,19 +259,17 @@ const RenderPass* SurfaceHittest::GetRenderPassForSurfaceById( |
| if (!surface) |
| return nullptr; |
|
danakj
2016/10/27 23:06:57
nit: remove whitespace
Saman Sami
2016/10/28 16:47:36
Done.
|
| - const CompositorFrame& surface_frame = surface->GetEligibleFrame(); |
| - if (!surface_frame.delegated_frame_data) |
| + if (!surface->HasFrame()) |
| return nullptr; |
| + const CompositorFrame& surface_frame = surface->GetEligibleFrame(); |
| - const DelegatedFrameData* frame_data = |
| - surface_frame.delegated_frame_data.get(); |
| - if (frame_data->render_pass_list.empty()) |
| + if (surface_frame.render_pass_list.empty()) |
| return nullptr; |
| if (!render_pass_id.IsValid()) |
| - return frame_data->render_pass_list.back().get(); |
| + return surface_frame.render_pass_list.back().get(); |
| - for (const auto& render_pass : frame_data->render_pass_list) { |
| + for (const auto& render_pass : surface_frame.render_pass_list) { |
| if (render_pass->id == render_pass_id) |
| return render_pass.get(); |
| } |