| Index: third_party/WebKit/Source/core/style/ComputedStyle.h
|
| diff --git a/third_party/WebKit/Source/core/style/ComputedStyle.h b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| index c2a551b15a44f95a4cdaacdb103c059ad928c7e6..b0785f581b69fde47d4e34d1a42f7bf248e8031d 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -814,6 +814,12 @@ class ComputedStyle : public ComputedStyleBase,
|
| static TouchAction InitialTouchAction() {
|
| return TouchAction::kTouchActionAuto;
|
| }
|
| + TouchAction GetEffectiveTouchAction() const {
|
| + return EffectiveTouchActionInternal();
|
| + }
|
| + void SetEffectiveTouchAction(TouchAction t) {
|
| + return SetEffectiveTouchActionInternal(t);
|
| + }
|
|
|
| // vertical-align
|
| static EVerticalAlign InitialVerticalAlign() {
|
| @@ -1970,6 +1976,36 @@ class ComputedStyle : public ComputedStyleBase,
|
| OverflowY() == EOverflow::kWebkitPagedY;
|
| }
|
|
|
| + bool IsDisplayTableRowOrColumnType() const {
|
| + return Display() == EDisplay::kTableRow ||
|
| + Display() == EDisplay::kTableRowGroup ||
|
| + Display() == EDisplay::kTableColumn ||
|
| + Display() == EDisplay::kTableColumnGroup;
|
| + }
|
| +
|
| + bool HasAutoHorizontalScroll() const {
|
| + return OverflowX() == EOverflow::kAuto ||
|
| + OverflowX() == EOverflow::kOverlay;
|
| + }
|
| +
|
| + bool HasAutoVerticalScroll() const {
|
| + return OverflowY() == EOverflow::kAuto ||
|
| + OverflowY() == EOverflow::kWebkitPagedY ||
|
| + OverflowY() == EOverflow::kOverlay;
|
| + }
|
| +
|
| + bool ScrollsOverflowX() const {
|
| + return OverflowX() == EOverflow::kScroll || HasAutoHorizontalScroll();
|
| + }
|
| +
|
| + bool ScrollsOverflowY() const {
|
| + return OverflowY() == EOverflow::kScroll || HasAutoVerticalScroll();
|
| + }
|
| +
|
| + bool ScrollsOverflow() const {
|
| + return ScrollsOverflowX() || ScrollsOverflowY();
|
| + }
|
| +
|
| // Visibility utility functions.
|
| bool VisibleToHitTesting() const {
|
| return Visibility() == EVisibility::kVisible &&
|
|
|