| OLD | NEW |
| 1 // Copyright 2010 The Chromium Authors. All rights reserved. | 1 // Copyright 2010 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/gl_renderer.h" | 5 #include "cc/output/gl_renderer.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 2394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2405 DCHECK(current_sync_query_); | 2405 DCHECK(current_sync_query_); |
| 2406 current_sync_query_->End(); | 2406 current_sync_query_->End(); |
| 2407 pending_sync_queries_.push_back(current_sync_query_.Pass()); | 2407 pending_sync_queries_.push_back(current_sync_query_.Pass()); |
| 2408 } | 2408 } |
| 2409 | 2409 |
| 2410 current_framebuffer_lock_ = nullptr; | 2410 current_framebuffer_lock_ = nullptr; |
| 2411 swap_buffer_rect_.Union(gfx::ToEnclosingRect(frame->root_damage_rect)); | 2411 swap_buffer_rect_.Union(gfx::ToEnclosingRect(frame->root_damage_rect)); |
| 2412 | 2412 |
| 2413 GLC(gl_, gl_->Disable(GL_BLEND)); | 2413 GLC(gl_, gl_->Disable(GL_BLEND)); |
| 2414 blend_shadow_ = false; | 2414 blend_shadow_ = false; |
| 2415 | |
| 2416 ScheduleOverlays(frame); | |
| 2417 } | 2415 } |
| 2418 | 2416 |
| 2419 void GLRenderer::FinishDrawingQuadList() { | 2417 void GLRenderer::FinishDrawingQuadList() { |
| 2420 FlushTextureQuadCache(SHARED_BINDING); | 2418 FlushTextureQuadCache(SHARED_BINDING); |
| 2421 } | 2419 } |
| 2422 | 2420 |
| 2423 bool GLRenderer::FlippedFramebuffer(const DrawingFrame* frame) const { | 2421 bool GLRenderer::FlippedFramebuffer(const DrawingFrame* frame) const { |
| 2424 if (frame->current_render_pass != frame->root_render_pass) | 2422 if (frame->current_render_pass != frame->root_render_pass) |
| 2425 return true; | 2423 return true; |
| 2426 return FlippedRootFramebuffer(); | 2424 return FlippedRootFramebuffer(); |
| (...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3522 context_support_->ScheduleOverlayPlane( | 3520 context_support_->ScheduleOverlayPlane( |
| 3523 overlay.plane_z_order, | 3521 overlay.plane_z_order, |
| 3524 overlay.transform, | 3522 overlay.transform, |
| 3525 pending_overlay_resources_.back()->texture_id(), | 3523 pending_overlay_resources_.back()->texture_id(), |
| 3526 overlay.display_rect, | 3524 overlay.display_rect, |
| 3527 overlay.uv_rect); | 3525 overlay.uv_rect); |
| 3528 } | 3526 } |
| 3529 } | 3527 } |
| 3530 | 3528 |
| 3531 } // namespace cc | 3529 } // namespace cc |
| OLD | NEW |