| Index: ui/compositor/compositor.cc
|
| diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc
|
| index 89c669726f64b6f3d9476573aff92b8a6973f769..263d3f59a158c9c184975bb5343fdd1715c8b296 100644
|
| --- a/ui/compositor/compositor.cc
|
| +++ b/ui/compositor/compositor.cc
|
| @@ -39,6 +39,7 @@
|
| #include "ui/compositor/dip_util.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/layer_animator_collection.h"
|
| +#include "ui/compositor/overscroll/ui_scroll_input_manager.h"
|
| #include "ui/gl/gl_switches.h"
|
|
|
| namespace {
|
| @@ -96,6 +97,10 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
|
|
|
| cc::LayerTreeSettings settings;
|
|
|
| +#if defined(OS_MACOSX)
|
| + settings.enable_elastic_overscroll = true;
|
| +#endif
|
| +
|
| // This will ensure PictureLayers always can have LCD text, to match the
|
| // previous behaviour with ContentLayers, where LCD-not-allowed notifications
|
| // were ignored.
|
| @@ -195,6 +200,14 @@ Compositor::Compositor(ui::ContextFactory* context_factory,
|
| params.main_task_runner = task_runner_;
|
| params.animation_host = cc::AnimationHost::CreateMainInstance();
|
| host_ = cc::LayerTreeHostInProcess::CreateSingleThreaded(this, ¶ms);
|
| +
|
| + // Tie composited scrolling with whether the platform wants elastic scrolling.
|
| + // TODO(tapted): Use composited scrolling on all platforms.
|
| + if (settings.enable_elastic_overscroll) {
|
| + scroll_input_manager_.reset(
|
| + new UIScrollInputManager(host_->GetInputHandler()));
|
| + }
|
| +
|
| UMA_HISTOGRAM_TIMES("GPU.CreateBrowserCompositor",
|
| base::TimeTicks::Now() - before_create);
|
|
|
|
|