| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/direct_renderer.h" | 5 #include "cc/output/direct_renderer.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 if (output_surface_->IsDisplayedAsOverlayPlane()) { | 225 if (output_surface_->IsDisplayedAsOverlayPlane()) { |
| 226 // Create the overlay candidate for the output surface, and mark it as | 226 // Create the overlay candidate for the output surface, and mark it as |
| 227 // always | 227 // always |
| 228 // handled. | 228 // handled. |
| 229 OverlayCandidate output_surface_plane; | 229 OverlayCandidate output_surface_plane; |
| 230 output_surface_plane.display_rect = | 230 output_surface_plane.display_rect = |
| 231 gfx::RectF(root_render_pass->output_rect); | 231 gfx::RectF(root_render_pass->output_rect); |
| 232 output_surface_plane.quad_rect_in_target_space = | 232 output_surface_plane.quad_rect_in_target_space = |
| 233 root_render_pass->output_rect; | 233 root_render_pass->output_rect; |
| 234 output_surface_plane.use_output_surface_for_resource = true; | 234 output_surface_plane.resource_type = OverlayCandidate::USE_OUTPUT_SURFACE; |
| 235 output_surface_plane.overlay_handled = true; | 235 output_surface_plane.overlay_handled = true; |
| 236 frame.overlay_list.push_back(output_surface_plane); | 236 frame.overlay_list.push_back(output_surface_plane); |
| 237 } | 237 } |
| 238 | 238 |
| 239 // If we have any copy requests, we can't remove any quads for overlays, | 239 // If we have any copy requests, we can't remove any quads for overlays, |
| 240 // otherwise the framebuffer will be missing the overlay contents. | 240 // otherwise the framebuffer will be missing the overlay contents. |
| 241 if (root_render_pass->copy_requests.empty()) { | 241 if (root_render_pass->copy_requests.empty()) { |
| 242 overlay_processor_->ProcessForOverlays( | 242 overlay_processor_->ProcessForOverlays( |
| 243 resource_provider_, render_passes_in_draw_order, &frame.overlay_list); | 243 resource_provider_, render_passes_in_draw_order, &frame.overlay_list); |
| 244 } | 244 } |
| (...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 ScopedResource* texture = render_pass_textures_.get(id); | 535 ScopedResource* texture = render_pass_textures_.get(id); |
| 536 return texture && texture->id(); | 536 return texture && texture->id(); |
| 537 } | 537 } |
| 538 | 538 |
| 539 // static | 539 // static |
| 540 gfx::Size DirectRenderer::RenderPassTextureSize(const RenderPass* render_pass) { | 540 gfx::Size DirectRenderer::RenderPassTextureSize(const RenderPass* render_pass) { |
| 541 return render_pass->output_rect.size(); | 541 return render_pass->output_rect.size(); |
| 542 } | 542 } |
| 543 | 543 |
| 544 } // namespace cc | 544 } // namespace cc |
| OLD | NEW |