| Index: third_party/WebKit/Source/core/input/TouchActionUtil.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/TouchActionUtil.cpp b/third_party/WebKit/Source/core/input/TouchActionUtil.cpp
|
| index d898300f7e8512ce9817f590d444ba252a599256..988a3d1452778a9fd0d87e63a4ecb0c5d51ad1c1 100644
|
| --- a/third_party/WebKit/Source/core/input/TouchActionUtil.cpp
|
| +++ b/third_party/WebKit/Source/core/input/TouchActionUtil.cpp
|
| @@ -15,9 +15,11 @@ namespace TouchActionUtil {
|
| namespace {
|
|
|
| // touch-action applies to all elements with both width AND height properties.
|
| -// According to the CSS Box Model Spec (http://dev.w3.org/csswg/css-box/#the-width-and-height-properties)
|
| -// width applies to all elements but non-replaced inline elements, table rows, and row groups and
|
| -// height applies to all elements but non-replaced inline elements, table columns, and column groups.
|
| +// According to the CSS Box Model Spec
|
| +// (http://dev.w3.org/csswg/css-box/#the-width-and-height-properties)
|
| +// width applies to all elements but non-replaced inline elements, table rows,
|
| +// and row groups and height applies to all elements but non-replaced inline
|
| +// elements, table columns, and column groups.
|
| bool supportsTouchAction(const LayoutObject& object) {
|
| if (object.isInline() && !object.isAtomicInlineLevel())
|
| return false;
|
| @@ -61,7 +63,8 @@ TouchAction computeEffectiveTouchAction(const Node& node) {
|
| break;
|
| }
|
|
|
| - // If we've reached an ancestor that supports panning, stop allowing panning to be disabled.
|
| + // If we've reached an ancestor that supports panning, stop allowing
|
| + // panning to be disabled.
|
| if ((layoutObject->isBox() &&
|
| toLayoutBox(layoutObject)->scrollsOverflow()) ||
|
| layoutObject->isLayoutView())
|
|
|