| 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 96c93d962f4010419c6de4481c7696afcc3673ff..59a58bfefc978a674d80ee13c31fca2ee48b6134 100644
|
| --- a/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| +++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
|
| @@ -1127,9 +1127,16 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
|
| TouchAction GetTouchAction() const {
|
| return static_cast<TouchAction>(rare_non_inherited_data_->touch_action_);
|
| }
|
| + TouchAction GetEffectiveTouchAction() const {
|
| + return static_cast<TouchAction>(
|
| + rare_inherited_data_->effective_touch_action_);
|
| + }
|
| void SetTouchAction(TouchAction t) {
|
| SET_VAR(rare_non_inherited_data_, touch_action_, t);
|
| }
|
| + void SetEffectiveTouchAction(TouchAction t) {
|
| + SET_VAR(rare_inherited_data_, effective_touch_action_, t);
|
| + }
|
|
|
| // vertical-align
|
| static EVerticalAlign InitialVerticalAlign() {
|
| @@ -2394,6 +2401,36 @@ class CORE_EXPORT 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 &&
|
|
|