Compute effective touch action in StyleAdjuster.

third_party/WebKit/Source/core/layout/LayoutBox.h

Index: third_party/WebKit/Source/core/layout/LayoutBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
index c44a646e11f309c65e5f02e06d4348738e4dc849..9dcfffbc34f54f56b7e071827617f73489bcf9c5 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -1036,17 +1036,13 @@ class CORE_EXPORT LayoutBox : public LayoutBoxModelObject {
   virtual void StopAutoscroll() {}
 
   DISABLE_CFI_PERF bool HasAutoVerticalScrollbar() const {
-    return HasOverflowClip() &&
-           (Style()->OverflowY() == EOverflow::kAuto ||
-            Style()->OverflowY() == EOverflow::kWebkitPagedY ||
-            Style()->OverflowY() == EOverflow::kOverlay);
+    return HasOverflowClip() && Style()->HasAutoVerticalScrollbar();
   }
   DISABLE_CFI_PERF bool HasAutoHorizontalScrollbar() const {
-    return HasOverflowClip() && (Style()->OverflowX() == EOverflow::kAuto ||
-                                 Style()->OverflowX() == EOverflow::kOverlay);
+    return HasOverflowClip() && Style()->HasAutoHorizontalScrollbar();
   }
   DISABLE_CFI_PERF bool ScrollsOverflow() const {
-    return ScrollsOverflowX() || ScrollsOverflowY();
+    return HasOverflowClip() && Style()->ScrollsOverflow();
   }
   virtual bool ShouldPlaceBlockDirectionScrollbarOnLogicalLeft() const {
     return Style()->ShouldPlaceBlockDirectionScrollbarOnLogicalLeft();
@@ -1061,12 +1057,10 @@ class CORE_EXPORT LayoutBox : public LayoutBoxModelObject {
            PixelSnappedScrollHeight() != PixelSnappedClientHeight();
   }
   virtual bool ScrollsOverflowX() const {
-    return HasOverflowClip() && (Style()->OverflowX() == EOverflow::kScroll ||
-                                 HasAutoHorizontalScrollbar());
+    return HasOverflowClip() && Style()->ScrollsOverflowX();
   }
   virtual bool ScrollsOverflowY() const {
-    return HasOverflowClip() && (Style()->OverflowY() == EOverflow::kScroll ||
-                                 HasAutoVerticalScrollbar());
+    return HasOverflowClip() && Style()->ScrollsOverflowY();
   }
 
   // Elements such as the <input> field override this to specify that they are