Changeset 240472 in webkit

Timestamp:

Jan 25, 2019 3:36:57 AM (5 years ago)

Author:

graouts@webkit.org

Message:

Use ENABLE_POINTER_EVENTS for the touch-action property
​https://bugs.webkit.org/show_bug.cgi?id=193819

Reviewed by Antti Koivisto.

Since we've added an ENABLE_POINTER_EVENTS we should be using it for anything related to the implementation of the
Pointer Events specification of which the touch-action property is a part.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::valueForPropertyinStyle):

• css/CSSPrimitiveValueMappings.h:
• css/CSSProperties.json:
• css/CSSValueKeywords.in:
• css/StyleBuilderConverter.h:
• css/parser/CSSPropertyParser.cpp:

(WebCore::CSSPropertyParser::parseSingleValue):

• dom/Element.cpp:

(WebCore::Element::allowsDoubleTapGesture const):

• platform/TouchAction.h:
• rendering/style/RenderStyle.h:
• rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator== const):

• rendering/style/StyleRareNonInheritedData.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSComputedStyleDeclaration.cpp (modified) (2 diffs)
• css/CSSPrimitiveValueMappings.h (modified) (1 diff)
• css/CSSProperties.json (modified) (1 diff)
• css/CSSValueKeywords.in (modified) (1 diff)
• css/StyleBuilderConverter.h (modified) (2 diffs)
• css/parser/CSSPropertyParser.cpp (modified) (2 diffs)
• dom/Element.cpp (modified) (1 diff)
• platform/TouchAction.h (modified) (2 diffs)
• rendering/style/RenderStyle.h (modified) (3 diffs)
• rendering/style/StyleRareNonInheritedData.cpp (modified) (3 diffs)
• rendering/style/StyleRareNonInheritedData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-25  Antoine Quint  <graouts@apple.com>
+
+        Use ENABLE_POINTER_EVENTS for the touch-action property
+        https://bugs.webkit.org/show_bug.cgi?id=193819
+
+        Reviewed by Antti Koivisto.
+
+        Since we've added an ENABLE_POINTER_EVENTS we should be using it for anything related to the implementation of the
+        Pointer Events specification of which the touch-action property is a part.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
+        * css/CSSPrimitiveValueMappings.h:
+        * css/CSSProperties.json:
+        * css/CSSValueKeywords.in:
+        * css/StyleBuilderConverter.h:
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::CSSPropertyParser::parseSingleValue):
+        * dom/Element.cpp:
+        (WebCore::Element::allowsDoubleTapGesture const):
+        * platform/TouchAction.h:
+        * rendering/style/RenderStyle.h:
+        * rendering/style/StyleRareNonInheritedData.cpp:
+        (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+        (WebCore::StyleRareNonInheritedData::operator== const):
+        * rendering/style/StyleRareNonInheritedData.h:
+
 2019-01-24  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -1748 +1748 @@
 }
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
 static Ref<CSSValue> touchActionFlagsToCSSValue(OptionSet<TouchAction> touchActions)
 {
@@ -3763 +3763 @@
         case CSSPropertyWebkitTapHighlightColor:
             return currentColorOrValidColor(&style, style.tapHighlightColor());
+#endif
+#if ENABLE(POINTER_EVENTS)
         case CSSPropertyTouchAction:
             return touchActionFlagsToCSSValue(style.touchActions());

trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h

@@ -5237 +5237 @@
 }
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchAction touchAction)
     : CSSValue(PrimitiveClass)

trunk/Source/WebCore/css/CSSProperties.json

@@ -6935 +6935 @@
             "codegen-properties": {
                 "name-for-methods": "TouchActions",
-                "enable-if": "ENABLE_TOUCH_EVENTS",
+                "enable-if": "ENABLE_POINTER_EVENTS",
                 "converter": "TouchAction"
             },

trunk/Source/WebCore/css/CSSValueKeywords.in

@@ -1353 +1353 @@
 //contents
 
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
+#if defined(ENABLE_POINTER_EVENTS) && ENABLE_POINTER_EVENTS
 // touch-action
 // auto

trunk/Source/WebCore/css/StyleBuilderConverter.h

@@ -118 +118 @@
 #if ENABLE(TOUCH_EVENTS)
     static Color convertTapHighlightColor(StyleResolver&, const CSSValue&);
+#endif
+#if ENABLE(POINTER_EVENTS)
     static OptionSet<TouchAction> convertTouchAction(StyleResolver&, const CSSValue&);
 #endif
@@ -1348 +1350 @@
     return styleResolver.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value));
 }
-
+#endif
+
+#if ENABLE(POINTER_EVENTS)
 inline OptionSet<TouchAction> StyleBuilderConverter::convertTouchAction(StyleResolver&, const CSSValue& value)
 {

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -1348 +1348 @@
 }
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
 static RefPtr<CSSValue> consumeTouchAction(CSSParserTokenRange& range)
 {
@@ -4039 +4039 @@
     case CSSPropertyClip:
         return consumeClip(m_range, m_context.mode);
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     case CSSPropertyTouchAction:
         return consumeTouchAction(m_range);

trunk/Source/WebCore/dom/Element.cpp

@@ -1666 +1666 @@
 bool Element::allowsDoubleTapGesture() const
 {
+#if ENABLE(POINTER_EVENTS)
     if (renderStyle() && renderStyle()->touchActions() != TouchAction::Auto)
         return false;
+#endif
 
     Element* parent = parentElement();

trunk/Source/WebCore/platform/TouchAction.h

@@ -26 +26 @@
 #pragma once
 
+#if ENABLE(POINTER_EVENTS)
+
 namespace WebCore {
 
@@ -38 +40 @@
 
 }
+
+#endif // ENABLE(POINTER_EVENTS)

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -705 +705 @@
     int initialLetterHeight() const { return initialLetter().height(); }
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     OptionSet<TouchAction> touchActions() const { return OptionSet<TouchAction>::fromRaw(m_rareNonInheritedData->touchActions); }
 #endif
@@ -1224 +1224 @@
     void setInitialLetter(const IntSize& size) { SET_VAR(m_rareNonInheritedData, initialLetter, size); }
     
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     void setTouchActions(OptionSet<TouchAction> touchActions) { SET_VAR(m_rareNonInheritedData, touchActions, touchActions.toRaw()); }
 #endif
@@ -1620 +1620 @@
     static WillChangeData* initialWillChange() { return nullptr; }
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     static TouchAction initialTouchActions() { return TouchAction::Auto; }
 #endif

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

@@ -77 +77 @@
     , justifySelf(RenderStyle::initialSelfAlignment())
     , customProperties(StyleCustomPropertyData::create())
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     , touchActions(static_cast<unsigned>(RenderStyle::initialTouchActions()))
 #endif
@@ -171 +171 @@
     , customProperties(o.customProperties)
     , customPaintWatchedProperties(o.customPaintWatchedProperties ? std::make_unique<HashSet<String>>(*o.customPaintWatchedProperties) : nullptr)
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     , touchActions(o.touchActions)
 #endif
@@ -286 +286 @@
         && textCombine == o.textCombine
         && textDecorationStyle == o.textDecorationStyle
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
         && touchActions == o.touchActions
 #endif

trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.h

@@ -175 +175 @@
     std::unique_ptr<HashSet<String>> customPaintWatchedProperties;
 
-#if ENABLE(TOUCH_EVENTS)
+#if ENABLE(POINTER_EVENTS)
     unsigned touchActions : 5; // TouchAction
 #endif