diff options
| author | wkorman <wkorman@chromium.org> | 2015-06-19 16:11:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 23:12:37 +0000 |
| commit | 3908f356c8af559adb6941adf4df77432b8275c2 (patch) | |
| tree | 72479cdf5d8be717029dd1f87ec77afc18cdcbef /content | |
| parent | 7954e387552e5c166f17083b1071597ba9d69302 (diff) | |
| download | chromium_src-3908f356c8af559adb6941adf4df77432b8275c2.zip chromium_src-3908f356c8af559adb6941adf4df77432b8275c2.tar.gz chromium_src-3908f356c8af559adb6941adf4df77432b8275c2.tar.bz2 | |
[SP] Turn off slimming paint by default.
Partial revert of http://crrev.com/1169193003 while we explore performance
regressions.
Leave the --disable-slimming-paint switch in existence, but restore
prior logic around switches.
BUG=497950,501251
TBR=jochen
Review URL: https://codereview.chromium.org/1186623003
Cr-Commit-Position: refs/heads/master@{#335386}
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_view_host_impl.cc | 3 | ||||
| -rw-r--r-- | content/renderer/gpu/render_widget_compositor.cc | 3 | ||||
| -rw-r--r-- | content/shell/renderer/layout_test/blink_test_runner.cc | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index e0eb5dc..6a8e0f7 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc @@ -468,8 +468,7 @@ WebPreferences RenderViewHostImpl::ComputeWebkitPrefs() { !command_line.HasSwitch(switches::kDisableTouchAdjustment); prefs.slimming_paint_enabled = command_line.HasSwitch( - switches::kEnableSlimmingPaint) || - !command_line.HasSwitch(switches::kDisableSlimmingPaint); + switches::kEnableSlimmingPaint); #if defined(OS_MACOSX) || defined(OS_CHROMEOS) bool default_enable_scroll_animator = true; diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc index d66e9b1..7cdabac 100644 --- a/content/renderer/gpu/render_widget_compositor.cc +++ b/content/renderer/gpu/render_widget_compositor.cc @@ -233,8 +233,7 @@ void RenderWidgetCompositor::Initialize() { !compositor_deps_->IsElasticOverscrollEnabled(); settings.accelerated_animation_enabled = !cmd->HasSwitch(cc::switches::kDisableThreadedAnimation); - settings.use_display_lists = cmd->HasSwitch(switches::kEnableSlimmingPaint) || - !cmd->HasSwitch(switches::kDisableSlimmingPaint); + settings.use_display_lists = cmd->HasSwitch(switches::kEnableSlimmingPaint); if (cmd->HasSwitch(switches::kEnableCompositorAnimationTimelines)) { settings.use_compositor_animation_timelines = true; blink::WebRuntimeFeatures::enableCompositorAnimationTimelines(true); diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc index 11e4899..21df57f 100644 --- a/content/shell/renderer/layout_test/blink_test_runner.cc +++ b/content/shell/renderer/layout_test/blink_test_runner.cc @@ -800,9 +800,7 @@ void BlinkTestRunner::CaptureDump() { } if (base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableSlimmingPaint) || - !base::CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisableSlimmingPaint)) { + switches::kEnableSlimmingPaint)) { // Force a layout/paint by the end of the test to ensure test coverage of // incremental painting in slimming paint mode. proxy()->LayoutAndPaintAsyncThen(base::Bind( |