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

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

Issue 2916563003: Compute effective touch action in StyleAdjuster. (Closed)
Patch Set: Do not traverse across frames 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 b830c36b80c508d85e58da4970b0bf360c9f6c7c..51e56e953bc9dd3928cf2c06637da516f5a4c595 100644
--- a/third_party/WebKit/Source/core/style/ComputedStyle.h
+++ b/third_party/WebKit/Source/core/style/ComputedStyle.h
@@ -890,6 +890,12 @@ class 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() {
@@ -2061,6 +2067,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 &&

Powered by Google App Engine
This is Rietveld 408576698