| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index deef359ae6bca44809d0dc62c61413f50425e9ca..6c7db485665139e1336b9c6717aedb5ab488dd32 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -149,13 +149,6 @@ Compositor::Compositor(CompositorDelegate* delegate,
|
| settings.refreshRate =
|
| test_compositor_enabled ? kTestRefreshRate : kDefaultRefreshRate;
|
|
|
| -#if !defined(WEBCOMPOSITOR_OWNS_SETTINGS)
|
| - settings.partialSwapEnabled =
|
| - command_line->HasSwitch(switches::kUIEnablePartialSwap);
|
| - settings.perTilePainting =
|
| - command_line->HasSwitch(switches::kUIEnablePerTilePainting);
|
| -#endif
|
| -
|
| host_.initialize(this, root_web_layer_, settings);
|
| host_.setSurfaceReady();
|
| root_web_layer_.setAnchorPoint(WebKit::WebFloatPoint(0.f, 0.f));
|
| @@ -180,14 +173,12 @@ Compositor::~Compositor() {
|
| }
|
|
|
| void Compositor::Initialize(bool use_thread) {
|
| -#if defined(WEBCOMPOSITOR_OWNS_SETTINGS)
|
| CommandLine* command_line = CommandLine::ForCurrentProcess();
|
| // These settings must be applied before we initialize the compositor.
|
| WebKit::WebCompositor::setPartialSwapEnabled(
|
| command_line->HasSwitch(switches::kUIEnablePartialSwap));
|
| WebKit::WebCompositor::setPerTilePaintingEnabled(
|
| command_line->HasSwitch(switches::kUIEnablePerTilePainting));
|
| -#endif
|
| if (use_thread)
|
| g_compositor_thread = new webkit_glue::WebThreadImpl("Browser Compositor");
|
| WebKit::WebCompositor::initialize(g_compositor_thread);
|
|
|