Remove unused include and always-true compile-time check

BUG=


Review URL: https://chromiumcodereview.appspot.com/10827267

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150986 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 21 deletions

diff --git a/webkit/glue/webpreferences.cc b/webkit/glue/webpreferences.cc
index 34e9b4d..6335023 100644
--- a/webkit/glue/webpreferences.cc
+++ b/webkit/glue/webpreferences.cc
@@ -106,11 +106,6 @@ WebPreferences::WebPreferences()
       css_variables_enabled(false),
       device_supports_touch(false),
       device_supports_mouse(true),
-#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
-      threaded_animation_enabled(false),
-      per_tile_painting_enabled(false),
-      partial_swap_enabled(false),
-#endif
       default_tile_width(256),
       default_tile_height(256),
       max_untiled_layer_width(512),
@@ -397,16 +392,6 @@ void WebPreferences::Apply(WebView* web_view) const {
   settings->setDeviceSupportsTouch(device_supports_touch);
   settings->setDeviceSupportsMouse(device_supports_mouse);
 
-#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
-  settings->setThreadedAnimationEnabled(threaded_animation_enabled);
-
-  // Enable per-tile painting if requested on the command line.
-  settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
-
-  // Enable partial swaps if specified form the command line.
-  settings->setPartialSwapEnabled(partial_swap_enabled);
-#endif
-
   settings->setDefaultTileSize(
       WebSize(default_tile_width, default_tile_height));
   settings->setMaxUntiledLayerSize(
diff --git a/webkit/glue/webpreferences.h b/webkit/glue/webpreferences.h
index 15c49e7..06699b3 100644
--- a/webkit/glue/webpreferences.h
+++ b/webkit/glue/webpreferences.h
@@ -18,7 +18,6 @@
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webkit_glue_export.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
 
 namespace WebKit {
 class WebView;
@@ -124,11 +123,6 @@ struct WEBKIT_GLUE_EXPORT WebPreferences {
   bool css_variables_enabled;
   bool device_supports_touch;
   bool device_supports_mouse;
-#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
-  bool threaded_animation_enabled;
-  bool per_tile_painting_enabled;
-  bool partial_swap_enabled;
-#endif
   int default_tile_width;
   int default_tile_height;
   int max_untiled_layer_width;