OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/output/overlay_strategy_fullscreen.h" | 5 #include "cc/output/overlay_strategy_fullscreen.h" |
6 | 6 |
7 #include "cc/base/math_util.h" | 7 #include "cc/base/math_util.h" |
8 #include "cc/output/overlay_candidate_validator.h" | 8 #include "cc/output/overlay_candidate_validator.h" |
9 #include "cc/quads/draw_quad.h" | 9 #include "cc/quads/draw_quad.h" |
10 #include "cc/quads/solid_color_draw_quad.h" | 10 #include "cc/quads/solid_color_draw_quad.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 return false; | 41 return false; |
42 } | 42 } |
43 | 43 |
44 if (!candidate.display_rect.origin().IsOrigin() || | 44 if (!candidate.display_rect.origin().IsOrigin() || |
45 gfx::ToRoundedSize(candidate.display_rect.size()) != | 45 gfx::ToRoundedSize(candidate.display_rect.size()) != |
46 render_pass->output_rect.size() || | 46 render_pass->output_rect.size() || |
47 render_pass->output_rect.size() != candidate.resource_size_in_pixels) { | 47 render_pass->output_rect.size() != candidate.resource_size_in_pixels) { |
48 return false; | 48 return false; |
49 } | 49 } |
50 | 50 |
51 candidate.plane_z_order = 1; | 51 candidate.plane_z_order = 0; |
52 candidate.overlay_handled = true; | 52 candidate.overlay_handled = true; |
53 candidate_list->push_back(candidate); | 53 OverlayCandidateList new_candidate_list; |
54 quad_list->EraseAndInvalidateAllPointers(front); | 54 new_candidate_list.push_back(candidate); |
| 55 candidate_list->swap(new_candidate_list); |
| 56 render_pass->quad_list = QuadList(); // Remove all the quads |
55 return true; | 57 return true; |
56 } | 58 } |
57 | 59 |
58 } // namespace cc | 60 } // namespace cc |
OLD | NEW |