Commit 314550c5 authored by abarth@chromium.org's avatar abarth@chromium.org

Delete scrollingCoordinatorEnabled setting

The scrollingCoordinatorEnabled setting is redundant with acceleratedCompositingEnabled.

Review URL: https://codereview.chromium.org/329863002

git-svn-id: svn://svn.chromium.org/blink/trunk@175999 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent bec6d36e
...@@ -123,7 +123,6 @@ allowConnectingInsecureWebSocket initial=false ...@@ -123,7 +123,6 @@ allowConnectingInsecureWebSocket initial=false
mediaControlsOverlayPlayButtonEnabled initial=false mediaControlsOverlayPlayButtonEnabled initial=false
mediaPlaybackRequiresUserGesture initial=false mediaPlaybackRequiresUserGesture initial=false
scrollingCoordinatorEnabled initial=false
scrollAnimatorEnabled initial=true scrollAnimatorEnabled initial=true
shouldRespectImageOrientation initial=false shouldRespectImageOrientation initial=false
......
...@@ -166,7 +166,7 @@ ViewportDescription Page::viewportDescription() const ...@@ -166,7 +166,7 @@ ViewportDescription Page::viewportDescription() const
ScrollingCoordinator* Page::scrollingCoordinator() ScrollingCoordinator* Page::scrollingCoordinator()
{ {
if (!m_scrollingCoordinator && m_settings->scrollingCoordinatorEnabled()) if (!m_scrollingCoordinator && m_settings->acceleratedCompositingEnabled())
m_scrollingCoordinator = ScrollingCoordinator::create(this); m_scrollingCoordinator = ScrollingCoordinator::create(this);
return m_scrollingCoordinator.get(); return m_scrollingCoordinator.get();
......
...@@ -428,7 +428,6 @@ void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior) ...@@ -428,7 +428,6 @@ void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior)
void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled) void WebSettingsImpl::setAcceleratedCompositingEnabled(bool enabled)
{ {
m_settings->setAcceleratedCompositingEnabled(enabled); m_settings->setAcceleratedCompositingEnabled(enabled);
m_settings->setScrollingCoordinatorEnabled(enabled);
} }
void WebSettingsImpl::setMockScrollbarsEnabled(bool enabled) void WebSettingsImpl::setMockScrollbarsEnabled(bool enabled)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment