Merge AcceleratedCompositingForOverflowScroll into PreferCompositingToLCDText.

Source/web/WebSettingsImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 424 matching lines @@
 void WebSettingsImpl::setMockScrollbarsEnabled(bool enabled)
 {
     m_settings->setMockScrollbarsEnabled(enabled);
 }
 
 void WebSettingsImpl::setMockGestureTapHighlightsEnabled(bool enabled)
 {
     m_settings->setMockGestureTapHighlightsEnabled(enabled);
 }
 
+// TODO(danakj): Remove this method.
 void WebSettingsImpl::setAcceleratedCompositingForOverflowScrollEnabled(bool enabled)
 {
-    m_settings->setAcceleratedCompositingForOverflowScrollEnabled(enabled);
 }
 
 void WebSettingsImpl::setCompositorDrivenAcceleratedScrollingEnabled(bool enabled)
 {
     m_settings->setCompositorDrivenAcceleratedScrollingEnabled(enabled);
 }
 
 // TODO(danakj): Remove this method.
 void WebSettingsImpl::setAcceleratedCompositingForFixedRootBackgroundEnabled(bool)
 {
@@ skipping 235 matching lines @@
 {
     m_settings->setDisallowFullscreenForNonMediaElements(enabled);
 }
 
 void WebSettingsImpl::setV8CacheOptions(V8CacheOptions options)
 {
     m_settings->setV8CacheOptions(static_cast<blink::V8CacheOptions>(options));
 }
 
 } // namespace blink