Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2916563003: Compute effective touch action in StyleAdjuster. (Closed)
Patch Set: add test case Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 61032b4213ae99b253f052c79c62feeec56e9128..d35608323945602c1dbcb4bdcd80611040759320 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -895,6 +895,12 @@ class CORE_EXPORT ComputedStyle : public ComputedStyleBase,
}
TouchAction GetTouchAction() const { return TouchActionInternal(); }
void SetTouchAction(TouchAction t) { return SetTouchActionInternal(t); }
+ TouchAction GetEffectiveTouchAction() const {
+ return EffectiveTouchActionInternal();
+ }
+ void SetEffectiveTouchAction(TouchAction t) {
+ return SetEffectiveTouchActionInternal(t);
+ }
// vertical-align
static EVerticalAlign InitialVerticalAlign() {
@@ -2047,6 +2053,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 &&

Powered by Google App Engine
This is Rietveld 408576698