| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index edddc05eb77d450260ff0c6cbe1c481ec0db139c..a0ce1bea7fee145f2edb33090e38422e888a64c1 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -1543,7 +1543,7 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
|
| blink::WebView* web_view,
|
| CompositorDependencies* compositor_deps) {
|
| ApplyWebPreferences(prefs, web_view);
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| +#if defined(OS_MACOSX)
|
| DCHECK(compositor_deps);
|
| bool is_elastic_overscroll_enabled =
|
| compositor_deps->IsElasticOverscrollEnabled();
|
| @@ -2123,7 +2123,7 @@ void RenderViewImpl::initializeLayerTreeView() {
|
| return;
|
|
|
| bool use_threaded_event_handling = true;
|
| -#if defined(OS_MACOSX) && !defined(OS_IOS)
|
| +#if defined(OS_MACOSX)
|
| // Disable threaded event handling if content is not handling the elastic
|
| // overscroll effect. This includes the cases where the elastic overscroll
|
| // effect is being handled by Blink (because of command line flags) and older
|
|
|