Compute effective touch action in StyleAdjuster.

third_party/WebKit/Source/core/style/ComputedStyle.h

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 a131cf65976f71d6311d2582a3cc08b5ed400b48..bb7a38c7910bd9a35a1fc4a55f61b8725afb3159 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -1462,9 +1462,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() {
@@ -2950,6 +2957,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 &&