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

Unified Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 1566303004: Smooth scroll on Windows should respect OS level animation disabling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase master Created 4 years, 11 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 | « no previous file | content/renderer/input/input_handler_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_view_host_impl.cc
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index 77ce24b38e11688abdd597d15ca21e949614276f..e12be0bdede1b17e8c779e7e3d28a1c267070a4d 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -81,6 +81,7 @@
#include "ui/base/touch/touch_device.h"
#include "ui/base/touch/touch_enabled.h"
#include "ui/base/ui_base_switches.h"
+#include "ui/gfx/animation/animation.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/native_theme/native_theme_switches.h"
@@ -480,8 +481,9 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() {
prefs.slimming_paint_v2_enabled =
command_line.HasSwitch(switches::kEnableSlimmingPaintV2);
- prefs.enable_scroll_animator = !command_line.HasSwitch(
- switches::kDisableSmoothScrolling);
+ prefs.enable_scroll_animator =
+ !command_line.HasSwitch(switches::kDisableSmoothScrolling) &&
+ gfx::Animation::ShouldRenderRichAnimation();
// Certain GPU features might have been blacklisted.
GpuDataManagerImpl::GetInstance()->UpdateRendererWebPrefs(&prefs);
« no previous file with comments | « no previous file | content/renderer/input/input_handler_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698