| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index d99886705eed9c229dbcd3a151deab2f8ffb362f..6d33496e3001c89f1bd688da0928ff7aee4bd160 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -17,6 +17,7 @@
|
| #include "cc/output/copy_output_request.h"
|
| #include "cc/output/copy_output_result.h"
|
| #include "cc/resources/texture_mailbox.h"
|
| +#include "cc/trees/layer_tree_settings.h"
|
| #include "content/browser/accessibility/browser_accessibility_manager.h"
|
| #include "content/browser/accessibility/browser_accessibility_state_impl.h"
|
| #include "content/browser/renderer_host/backing_store_aura.h"
|
| @@ -2995,8 +2996,17 @@ void RenderWidgetHostViewAura::OnUpdateVSyncParameters(
|
| ui::Compositor* compositor,
|
| base::TimeTicks timebase,
|
| base::TimeDelta interval) {
|
| - if (IsShowing() && !last_draw_ended_.is_null())
|
| - host_->UpdateVSyncParameters(last_draw_ended_, interval);
|
| + if (IsShowing()) {
|
| + if (compositor->layer_tree_settings().deadline_scheduling_enabled) {
|
| + // The deadline scheduler has logic to stagger the draws of the
|
| + // Renderer and Browser built-in, so send it an accurate timebase.
|
| + host_->UpdateVSyncParameters(timebase, interval);
|
| + } else if (!last_draw_ended_.is_null()) {
|
| + // For the non-deadline scheduler, we send the Renderer an offset
|
| + // vsync timebase to avoid its draws racing the Browser's draws.
|
| + host_->UpdateVSyncParameters(last_draw_ended_, interval);
|
| + }
|
| + }
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|