| Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| index 66a8520b628caa6759b05d530c2942dbe6f93334..9a11c12539444ff9e77ed2f7389253e964c8bef3 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
|
| @@ -1468,6 +1468,10 @@
|
|
|
| bool PaintLayerScrollableArea::usesCompositedScrolling() const
|
| {
|
| + // Scroll form controls on the main thread so they exhibit correct touch scroll event bubbling
|
| + if (box().isIntrinsicallyScrollable(VerticalScrollbar) || box().isIntrinsicallyScrollable(HorizontalScrollbar))
|
| + return false;
|
| +
|
| // See https://codereview.chromium.org/176633003/ for the tests that fail without this disabler.
|
| DisableCompositingQueryAsserts disabler;
|
| return layer()->hasCompositedLayerMapping() && layer()->compositedLayerMapping()->scrollingLayer();
|
|
|