| Index: content/browser/web_contents/web_contents_impl.cc
|
| diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
|
| index 776e47ab7a6d12f68602814433a7d2b323a2e636..f0b652948673e12cc38edd30be2f1eb5f9efb1da 100644
|
| --- a/content/browser/web_contents/web_contents_impl.cc
|
| +++ b/content/browser/web_contents/web_contents_impl.cc
|
| @@ -67,7 +67,6 @@
|
| #include "net/base/net_util.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| -#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositor.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
|
| #include "ui/base/layout.h"
|
| #include "ui/base/ui_base_switches.h"
|
| @@ -598,15 +597,6 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
|
| prefs.accelerated_2d_canvas_enabled = false;
|
| }
|
|
|
| -#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
|
| - prefs.threaded_animation_enabled =
|
| - !command_line.HasSwitch(switches::kDisableThreadedAnimation);
|
| - prefs.per_tile_painting_enabled =
|
| - command_line.HasSwitch(switches::kEnablePerTilePainting);
|
| - prefs.partial_swap_enabled =
|
| - command_line.HasSwitch(switches::kEnablePartialSwap);
|
| -#endif
|
| -
|
| if (command_line.HasSwitch(switches::kDefaultTileWidth))
|
| prefs.default_tile_width =
|
| GetSwitchValueAsInt(command_line, switches::kDefaultTileWidth, 1);
|
|
|