Chromium Code Reviews| Index: cc/output/direct_renderer.cc |
| diff --git a/cc/output/direct_renderer.cc b/cc/output/direct_renderer.cc |
| index d74f11dc574b62ccd6977e5b142fe1133393d816..fbae8bfd35347e3c017f897cec160cb4f43f636d 100644 |
| --- a/cc/output/direct_renderer.cc |
| +++ b/cc/output/direct_renderer.cc |
| @@ -84,9 +84,12 @@ void DirectRenderer::Initialize() { |
| use_partial_swap_ = settings_->partial_swap_enabled && CanPartialSwap(); |
| allow_empty_swap_ = use_partial_swap_; |
| - if (context_provider && |
| - context_provider->ContextCapabilities().commit_overlay_planes) |
| - allow_empty_swap_ = true; |
| + if (context_provider) { |
| + if (context_provider->ContextCapabilities().commit_overlay_planes) |
| + allow_empty_swap_ = true; |
| + if (context_provider->ContextCapabilities().set_draw_rectangle) |
| + use_set_draw_rectangle_ = true; |
| + } |
| initialized_ = true; |
| } |
| @@ -510,10 +513,16 @@ void DirectRenderer::DrawRenderPass(const RenderPass* render_pass) { |
| current_frame()->ComputeScissorRectForRenderPass()); |
| } |
| - bool render_pass_is_clipped = |
| - !render_pass_scissor_in_draw_space.Contains(surface_rect_in_draw_space); |
| bool is_root_render_pass = |
| current_frame()->current_render_pass == current_frame()->root_render_pass; |
| + |
| + // The SetDrawRectangleCHROMIUM spec requires that the scissor bit is always |
| + // set on the root framebuffer or else the rendering may modify something |
| + // outside the damage rectangle, even if the damage rectangle is the size of |
| + // the full backbuffer. |
| + bool render_pass_is_clipped = |
| + (use_set_draw_rectangle_ && is_root_render_pass) || |
| + !render_pass_scissor_in_draw_space.Contains(surface_rect_in_draw_space); |
| bool has_external_stencil_test = |
| is_root_render_pass && output_surface_->HasExternalStencilTest(); |
| bool should_clear_surface = |
| @@ -582,9 +591,12 @@ void DirectRenderer::DrawRenderPass(const RenderPass* render_pass) { |
| bool DirectRenderer::UseRenderPass(const RenderPass* render_pass) { |
| current_frame()->current_render_pass = render_pass; |
| - current_frame()->current_texture = NULL; |
| + current_frame()->current_texture = nullptr; |
| if (render_pass == current_frame()->root_render_pass) { |
| BindFramebufferToOutputSurface(); |
| + |
| + if (use_set_draw_rectangle_) |
| + output_surface_->SetDrawRectangle(current_frame()->root_damage_rect); |
|
danakj
2017/02/22 15:04:08
Is this guaranteed to be the full surface if the s
|
| InitializeViewport(current_frame(), render_pass->output_rect, |
| gfx::Rect(current_frame()->device_viewport_size), |
| current_frame()->device_viewport_size); |