Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: cc/output/direct_renderer.cc

Issue 1383293002: Revert of Overlays: Remove special casing of primary overlay plane (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | cc/output/gl_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 215
216 EnsureBackbuffer(); 216 EnsureBackbuffer();
217 217
218 // Only reshape when we know we are going to draw. Otherwise, the reshape 218 // Only reshape when we know we are going to draw. Otherwise, the reshape
219 // can leave the window at the wrong size if we never draw and the proper 219 // can leave the window at the wrong size if we never draw and the proper
220 // viewport size is never set. 220 // viewport size is never set.
221 output_surface_->Reshape(device_viewport_rect.size(), device_scale_factor); 221 output_surface_->Reshape(device_viewport_rect.size(), device_scale_factor);
222 222
223 BeginDrawingFrame(&frame); 223 BeginDrawingFrame(&frame);
224 224
225 if (output_surface_->IsDisplayedAsOverlayPlane()) {
226 // Create the overlay candidate for the output surface, and mark it as
227 // always
228 // handled.
229 OverlayCandidate output_surface_plane;
230 output_surface_plane.display_rect =
231 gfx::RectF(root_render_pass->output_rect);
232 output_surface_plane.quad_rect_in_target_space =
233 root_render_pass->output_rect;
234 output_surface_plane.use_output_surface_for_resource = true;
235 output_surface_plane.overlay_handled = true;
236 frame.overlay_list.push_back(output_surface_plane);
237 }
238
239 // If we have any copy requests, we can't remove any quads for overlays, 225 // If we have any copy requests, we can't remove any quads for overlays,
240 // otherwise the framebuffer will be missing the overlay contents. 226 // otherwise the framebuffer will be missing the overlay contents.
241 if (root_render_pass->copy_requests.empty()) { 227 if (root_render_pass->copy_requests.empty()) {
242 overlay_processor_->ProcessForOverlays(render_passes_in_draw_order, 228 overlay_processor_->ProcessForOverlays(render_passes_in_draw_order,
243 &frame.overlay_list); 229 &frame.overlay_list);
244 } 230 }
245 231
246 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) { 232 for (size_t i = 0; i < render_passes_in_draw_order->size(); ++i) {
247 RenderPass* pass = render_passes_in_draw_order->at(i); 233 RenderPass* pass = render_passes_in_draw_order->at(i);
248 DrawRenderPass(&frame, pass); 234 DrawRenderPass(&frame, pass);
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 ScopedResource* texture = render_pass_textures_.get(id); 521 ScopedResource* texture = render_pass_textures_.get(id);
536 return texture && texture->id(); 522 return texture && texture->id();
537 } 523 }
538 524
539 // static 525 // static
540 gfx::Size DirectRenderer::RenderPassTextureSize(const RenderPass* render_pass) { 526 gfx::Size DirectRenderer::RenderPassTextureSize(const RenderPass* render_pass) {
541 return render_pass->output_rect.size(); 527 return render_pass->output_rect.size();
542 } 528 }
543 529
544 } // namespace cc 530 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | cc/output/gl_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698