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

Unified Diff: cc/output/gl_renderer.cc

Issue 2772883002: [Chromecast] Fix assert failure + add test in SwapWithBounds path (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/gl_renderer.cc
diff --git a/cc/output/gl_renderer.cc b/cc/output/gl_renderer.cc
index 809bbdd130ed1b838241fe0de5511f3029772587..d6df7a97a75cf9feba462404d5ba76c098b1b315 100644
--- a/cc/output/gl_renderer.cc
+++ b/cc/output/gl_renderer.cc
@@ -2450,6 +2450,9 @@ void GLRenderer::FinishDrawingFrame() {
if (overdraw_feedback_)
FlushOverdrawFeedback(swap_buffer_rect_);
+ if (use_swap_with_bounds_)
+ swap_content_bounds_ = current_frame()->root_content_bounds;
+
current_framebuffer_lock_ = nullptr;
gl_->Disable(GL_BLEND);
@@ -2614,7 +2617,7 @@ void GLRenderer::SwapBuffers(std::vector<ui::LatencyInfo> latency_info) {
output_frame.latency_info = std::move(latency_info);
output_frame.size = surface_size;
if (use_swap_with_bounds_) {
- output_frame.content_bounds = current_frame()->root_content_bounds;
+ output_frame.content_bounds = std::move(swap_content_bounds_);
} else if (use_partial_swap_) {
// If supported, we can save significant bandwidth by only swapping the
// damaged/scissored region (clamped to the viewport).
« no previous file with comments | « cc/output/gl_renderer.h ('k') | cc/output/gl_renderer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698