Attachment 358788 Details for Bug 193314 – Patch

[patch] Patch

bug-193314-20190110150202.patch (text/plain), 20.04 KB, created by Antoine Quint on 2019-01-10 06:02:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Antoine Quint

Created: 2019-01-10 06:02:04 PST

Size: 20.04 KB

patch

obsolete

>Subversion Revision: 239820
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 6f78a73a1417ee23b88385c1221ba5bb1d9a8c69..ba59fcf066b087664ae42b26d4f597afaf0935ca 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,37 @@
>+2019-01-10  Antoine Quint  <graouts@apple.com>
>+
>+        Support parsing of additional values for the touch-action property
>+        https://bugs.webkit.org/show_bug.cgi?id=193314
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We add parsing support for the "none", "pan-x", "pan-y" and "pinch-zoom" values of the CSS "touch-action" property.
>+
>+        * WebCore.xcodeproj/project.pbxproj:
>+        * css/CSSComputedStyleDeclaration.cpp:
>+        (WebCore::touchActionFlagsToCSSValue):
>+        (WebCore::ComputedStyleExtractor::valueForPropertyinStyle):
>+        * css/CSSPrimitiveValueMappings.h:
>+        (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
>+        (WebCore::CSSPrimitiveValue::operator OptionSet<TouchAction> const):
>+        (WebCore::CSSPrimitiveValue::operator TouchAction const): Deleted.
>+        * css/CSSProperties.json:
>+        * css/CSSValueKeywords.in:
>+        * css/StyleBuilderConverter.h:
>+        (WebCore::StyleBuilderConverter::convertTouchAction):
>+        * css/parser/CSSParserFastPaths.cpp:
>+        (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
>+        (WebCore::CSSParserFastPaths::isKeywordPropertyID):
>+        * css/parser/CSSPropertyParser.cpp:
>+        (WebCore::consumeTouchAction):
>+        * dom/Element.cpp:
>+        * platform/TouchAction.h: Added.
>+        * rendering/style/RenderStyle.h:
>+        (WebCore::RenderStyle::touchAction const):
>+        (WebCore::RenderStyle::setTouchAction):
>+        * rendering/style/RenderStyleConstants.h:
>+        * rendering/style/StyleRareNonInheritedData.h:
>+
> 2019-01-09  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] Audit Web Animations classes for memory reduction
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index ca59a635fe870fb7119a39096ac77b1f7ef3e488..2dce65576f7d12257a6fe69da7fff107836b4a5e 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -2104,6 +2104,7 @@
> 		71A1B6081DEE5AD70073BCFB /* modern-media-controls-localized-strings.js in Resources */ = {isa = PBXBuildFile; fileRef = 71A1B6061DEE5A820073BCFB /* modern-media-controls-localized-strings.js */; };
> 		71A57DF2154BE25C0009D120 /* SVGPathUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */; };
> 		71B28427203CEC4C0036AA5D /* JSCSSAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 71B28426203CEC0D0036AA5D /* JSCSSAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
>+		71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */ = {isa = PBXBuildFile; fileRef = 71AEE4EB21B5A49C00DDB036 /* TouchAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		71C29E32203CE781008F36D2 /* CSSAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 71C29E30203CE76B008F36D2 /* CSSAnimation.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		71C916081D1483A300ACA47D /* UserInterfaceLayoutDirection.h in Headers */ = {isa = PBXBuildFile; fileRef = 71C916071D1483A300ACA47D /* UserInterfaceLayoutDirection.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		71DCB7021568197600862271 /* JSSVGZoomAndPan.h in Headers */ = {isa = PBXBuildFile; fileRef = 71DCB7001568197600862271 /* JSSVGZoomAndPan.h */; };
>@@ -9337,6 +9338,7 @@
> 		71A1B6071DEE5A820073BCFB /* en */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; name = en; path = "en.lproj/modern-media-controls-localized-strings.js"; sourceTree = SOURCE_ROOT; };
> 		71A57DEF154BE25C0009D120 /* SVGPathUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGPathUtilities.cpp; sourceTree = "<group>"; };
> 		71A57DF0154BE25C0009D120 /* SVGPathUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathUtilities.h; sourceTree = "<group>"; };
>+		71AEE4EB21B5A49C00DDB036 /* TouchAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TouchAction.h; sourceTree = "<group>"; };
> 		71B0460A1DD3C2EE00EE19CF /* status-support.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = "status-support.js"; sourceTree = "<group>"; };
> 		71B28424203CEC0B0036AA5D /* JSCSSAnimation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCSSAnimation.cpp; sourceTree = "<group>"; };
> 		71B28426203CEC0D0036AA5D /* JSCSSAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCSSAnimation.h; sourceTree = "<group>"; };
>@@ -25243,6 +25245,7 @@
> 				185BCF270F3279CE000EA262 /* ThreadTimers.h */,
> 				93309EA1099EB78C0056E581 /* Timer.cpp */,
> 				9305B24C098F1B6B00C28855 /* Timer.h */,
>+				71AEE4EB21B5A49C00DDB036 /* TouchAction.h */,
> 				868160D1187669C40021E79D /* UserActivity.cpp */,
> 				868160D2187669C40021E79D /* UserActivity.h */,
> 				A3AF9D8220325324006CAD06 /* UserAgent.h */,
>@@ -31622,6 +31625,7 @@
> 				2D7ED0AB1BAE99170043B3E5 /* TimerEventBasedMock.h in Headers */,
> 				49E912AE0EFAC906009D0CAF /* TimingFunction.h in Headers */,
> 				0F54DD081881D5F5003EEDBB /* Touch.h in Headers */,
>+				71B7EE0D21B5C6870031C1EF /* TouchAction.h in Headers */,
> 				0F54DD091881D5F5003EEDBB /* TouchEvent.h in Headers */,
> 				0F54DD0A1881D5F5003EEDBB /* TouchList.h in Headers */,
> 				070334D71459FFD5008D8D45 /* TrackBase.h in Headers */,
>diff --git a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>index 9ebc3abbee63acb9ac5476ee915a9695b849bce7..806c854481e643521f106a1e9f543780530da979 100644
>--- a/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>+++ b/Source/WebCore/css/CSSComputedStyleDeclaration.cpp
>@@ -73,6 +73,7 @@
> #include "StyleResolver.h"
> #include "StyleScope.h"
> #include "StyleScrollSnapPoints.h"
>+#include "TouchAction.h"
> #include "WebKitFontFamilyNames.h"
> #include "WillChangeData.h"
> #include <wtf/NeverDestroyed.h>
>@@ -1746,6 +1747,32 @@ static Ref<CSSPrimitiveValue> valueForFamily(const AtomicString& family)
>     return CSSValuePool::singleton().createFontFamilyValue(family);
> }
> 
>+#if ENABLE(TOUCH_EVENTS)
>+static Ref<CSSValue> touchActionFlagsToCSSValue(OptionSet<TouchAction> touchAction)
>+{
>+    auto& cssValuePool = CSSValuePool::singleton();
>+
>+    if (touchAction & TouchAction::Auto)
>+        return cssValuePool.createIdentifierValue(CSSValueAuto);
>+    if (touchAction & TouchAction::None)
>+        return cssValuePool.createIdentifierValue(CSSValueNone);
>+    if (touchAction & TouchAction::Manipulation)
>+        return cssValuePool.createIdentifierValue(CSSValueManipulation);
>+
>+    auto list = CSSValueList::createSpaceSeparated();
>+    if (touchAction & TouchAction::PanX)
>+        list->append(cssValuePool.createIdentifierValue(CSSValuePanX));
>+    if (touchAction & TouchAction::PanY)
>+        list->append(cssValuePool.createIdentifierValue(CSSValuePanY));
>+    if (touchAction & TouchAction::PinchZoom)
>+        list->append(cssValuePool.createIdentifierValue(CSSValuePinchZoom));
>+
>+    if (!list->length())
>+        return cssValuePool.createIdentifierValue(CSSValueAuto);
>+    return WTFMove(list);
>+}
>+#endif
>+
> static Ref<CSSValue> renderTextDecorationFlagsToCSSValue(OptionSet<TextDecoration> textDecoration)
> {
>     auto& cssValuePool = CSSValuePool::singleton();
>@@ -3732,7 +3759,7 @@ RefPtr<CSSValue> ComputedStyleExtractor::valueForPropertyinStyle(const RenderSty
>         case CSSPropertyWebkitTapHighlightColor:
>             return currentColorOrValidColor(&style, style.tapHighlightColor());
>         case CSSPropertyTouchAction:
>-            return cssValuePool.createValue(style.touchAction());
>+            return touchActionFlagsToCSSValue(style.touchAction());
> #endif
> #if PLATFORM(IOS_FAMILY)
>         case CSSPropertyWebkitTouchCallout:
>diff --git a/Source/WebCore/css/CSSPrimitiveValueMappings.h b/Source/WebCore/css/CSSPrimitiveValueMappings.h
>index c95ff65a835ba7643edb8d2bb25d16f16bc62117..efd8423db44d25710d8491f58ebd5c1fad5dac3b 100644
>--- a/Source/WebCore/css/CSSPrimitiveValueMappings.h
>+++ b/Source/WebCore/css/CSSPrimitiveValueMappings.h
>@@ -42,6 +42,7 @@
> #include "SVGRenderStyleDefs.h"
> #include "TextFlags.h"
> #include "ThemeTypes.h"
>+#include "TouchAction.h"
> #include "UnicodeBidi.h"
> #include "WritingMode.h"
> #include <wtf/MathExtras.h>
>@@ -5247,10 +5248,22 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TouchAction touchAction)
>     case TouchAction::Manipulation:
>         m_value.valueID = CSSValueManipulation;
>         break;
>+    case TouchAction::None:
>+        m_value.valueID = CSSValueNone;
>+        break;
>+    case TouchAction::PanX:
>+        m_value.valueID = CSSValuePanX;
>+        break;
>+    case TouchAction::PanY:
>+        m_value.valueID = CSSValuePanY;
>+        break;
>+    case TouchAction::PinchZoom:
>+        m_value.valueID = CSSValuePinchZoom;
>+        break;
>     }
> }
> 
>-template<> inline CSSPrimitiveValue::operator TouchAction() const
>+template<> inline CSSPrimitiveValue::operator OptionSet<TouchAction>() const
> {
>     ASSERT(isValueID());
>     switch (m_value.valueID) {
>@@ -5258,6 +5271,14 @@ template<> inline CSSPrimitiveValue::operator TouchAction() const
>         return TouchAction::Auto;
>     case CSSValueManipulation:
>         return TouchAction::Manipulation;
>+    case CSSValueNone:
>+        return TouchAction::None;
>+    case CSSValuePanX:
>+        return TouchAction::PanX;
>+    case CSSValuePanY:
>+        return TouchAction::PanY;
>+    case CSSValuePinchZoom:
>+        return TouchAction::PinchZoom;
>     default:
>         break;
>     }
>diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json
>index fe012ba4b229e656cc1d89bb26f258dc1ecaea3c..d252f056fe48a9d5d18802a067f2df919cff99b8 100644
>--- a/Source/WebCore/css/CSSProperties.json
>+++ b/Source/WebCore/css/CSSProperties.json
>@@ -6677,10 +6677,15 @@
>         "touch-action": {
>             "values": [
>                 "auto",
>-                "manipulation"
>+                "none",
>+                "manipulation",
>+                "pan-x",
>+                "pan-y",
>+                "pinch-zoom"
>             ],
>             "codegen-properties": {
>-                "enable-if": "ENABLE_TOUCH_EVENTS"
>+                "enable-if": "ENABLE_TOUCH_EVENTS",
>+                "converter": "TouchAction"
>             },
>             "specification": {
>                 "url": "https://www.w3.org/TR/pointerevents/#the-touch-action-css-property"
>diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
>index 86b5e5914f40e73afb149521843a4ec97c861018..09321901bf599b3c4d064c84b9f420474b7da6cb 100644
>--- a/Source/WebCore/css/CSSValueKeywords.in
>+++ b/Source/WebCore/css/CSSValueKeywords.in
>@@ -1354,7 +1354,12 @@ scroll-position
> 
> #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
> // touch-action
>+// auto
>+// none
> manipulation
>+pan-x
>+pan-y
>+pinch-zoom
> #endif
> 
> // hanging-punctuation
>diff --git a/Source/WebCore/css/StyleBuilderConverter.h b/Source/WebCore/css/StyleBuilderConverter.h
>index da000d3af01b55bb7db83fad82150251ebcde829..8f4ff6ab4bf2d6f64a852c82eb41bd3b7d83f5c0 100644
>--- a/Source/WebCore/css/StyleBuilderConverter.h
>+++ b/Source/WebCore/css/StyleBuilderConverter.h
>@@ -52,6 +52,7 @@
> #include "Settings.h"
> #include "StyleResolver.h"
> #include "StyleScrollSnapPoints.h"
>+#include "TouchAction.h"
> #include "TransformFunctions.h"
> #include <wtf/Optional.h>
> 
>@@ -116,6 +117,7 @@ public:
> #endif
> #if ENABLE(TOUCH_EVENTS)
>     static Color convertTapHighlightColor(StyleResolver&, const CSSValue&);
>+    static OptionSet<TouchAction> convertTouchAction(StyleResolver&, const CSSValue&);
> #endif
> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
>     static bool convertOverflowScrolling(StyleResolver&, const CSSValue&);
>@@ -1345,6 +1347,26 @@ inline Color StyleBuilderConverter::convertTapHighlightColor(StyleResolver& styl
> {
>     return styleResolver.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value));
> }
>+
>+inline OptionSet<TouchAction> StyleBuilderConverter::convertTouchAction(StyleResolver&, const CSSValue& value)
>+{
>+    if (is<CSSPrimitiveValue>(value))
>+        return downcast<CSSPrimitiveValue>(value);
>+
>+    if (is<CSSValueList>(value)) {
>+        OptionSet<TouchAction> touchAction;
>+        for (auto& currentValue : downcast<CSSValueList>(value)) {
>+            auto& primitiveValue = downcast<CSSPrimitiveValue>(currentValue.get());
>+            auto primitiveValueID = primitiveValue.valueID();
>+            if (primitiveValueID != CSSValuePanX && primitiveValueID != CSSValuePanY && primitiveValueID != CSSValuePinchZoom)
>+                return RenderStyle::initialTouchAction();
>+            touchAction.add(primitiveValue);
>+        }
>+        return touchAction;
>+    }
>+
>+    return RenderStyle::initialTouchAction();
>+}
> #endif
> 
> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
>diff --git a/Source/WebCore/css/parser/CSSParserFastPaths.cpp b/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>index 3835f239b08c400c347f85213697d8eed1d02413..36609b4fe6f91a5ee9671c7570341a01cd7f458d 100644
>--- a/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>+++ b/Source/WebCore/css/parser/CSSParserFastPaths.cpp
>@@ -758,10 +758,6 @@ bool CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyID propertyId
>         return valueID == CSSValueNormal || valueID == CSSValueBreakAll || valueID == CSSValueKeepAll || valueID == CSSValueBreakWord;
>     case CSSPropertyWebkitBorderFit:
>         return valueID == CSSValueBorder || valueID == CSSValueLines;
>-#if ENABLE(TOUCH_EVENTS)
>-    case CSSPropertyTouchAction: // auto | manipulation
>-        return valueID == CSSValueAuto || valueID == CSSValueManipulation;
>-#endif
> #if ENABLE(CSS_TRAILING_WORD)
>     case CSSPropertyAppleTrailingWord: // auto | -apple-partially-balanced
>         return valueID == CSSValueAuto || valueID == CSSValueWebkitPartiallyBalanced;
>@@ -941,9 +937,6 @@ bool CSSParserFastPaths::isKeywordPropertyID(CSSPropertyID propertyId)
>     case CSSPropertyIsolation:
>     case CSSPropertyMixBlendMode:
> #endif
>-#if ENABLE(TOUCH_EVENTS)
>-    case CSSPropertyTouchAction:
>-#endif
> #if ENABLE(CSS_BOX_DECORATION_BREAK)
>     case CSSPropertyWebkitBoxDecorationBreak:
> #endif
>diff --git a/Source/WebCore/css/parser/CSSPropertyParser.cpp b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>index 98df41895a30c7a0bed6535afaf5690bcfb6f637..43b287776fa2a2c15074e8ae2482c49785527f82 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParser.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParser.cpp
>@@ -1342,14 +1342,23 @@ static RefPtr<CSSValue> consumeClip(CSSParserTokenRange& range, CSSParserMode cs
> #if ENABLE(TOUCH_EVENTS)
> static RefPtr<CSSValue> consumeTouchAction(CSSParserTokenRange& range)
> {
>-    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
>     CSSValueID id = range.peek().id();
>-    if (id == CSSValueAuto || id == CSSValueNone || id == CSSValueManipulation) {
>-        list->append(consumeIdent(range).releaseNonNull());
>-        return list;
>+    if (id == CSSValueNone || id == CSSValueAuto || id == CSSValueManipulation)
>+        return consumeIdent(range);
>+
>+    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
>+    while (true) {
>+        RefPtr<CSSPrimitiveValue> ident = consumeIdent<CSSValuePanX, CSSValuePanY, CSSValuePinchZoom>(range);
>+        if (!ident)
>+            break;
>+        if (list->hasValue(ident.get()))
>+            return nullptr;
>+        list->append(ident.releaseNonNull());
>     }
>-    // FIXME-NEWPARSER: Support pan.
>-    return nullptr;
>+
>+    if (!list->length())
>+        return nullptr;
>+    return list;
> }
> #endif
> 
>diff --git a/Source/WebCore/dom/Element.cpp b/Source/WebCore/dom/Element.cpp
>index 5ff302fbe65265586d620e26e23fe476b4652eb7..14432fbba8f452d1b8107efa5b15efe8c0e1fed0 100644
>--- a/Source/WebCore/dom/Element.cpp
>+++ b/Source/WebCore/dom/Element.cpp
>@@ -103,6 +103,7 @@
> #include "StyleScope.h"
> #include "StyleTreeResolver.h"
> #include "TextIterator.h"
>+#include "TouchAction.h"
> #include "VoidCallback.h"
> #include "WebAnimation.h"
> #include "WheelEvent.h"
>diff --git a/Source/WebCore/platform/TouchAction.h b/Source/WebCore/platform/TouchAction.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..044d45112713ea677c8caa16beeffa1cb6239e6b
>--- /dev/null
>+++ b/Source/WebCore/platform/TouchAction.h
>@@ -0,0 +1,34 @@
>+/*
>+ * Copyright (C) 2018 Apple Inc. All rights reserved.
>+ *
>+ * This library is free software; you can redistribute it and/or
>+ * modify it under the terms of the GNU Library General Public
>+ * License as published by the Free Software Foundation; either
>+ * version 2 of the License, or (at your option) any later version.
>+ *
>+ * This library is distributed in the hope that it will be useful,
>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+ * Library General Public License for more details.
>+ *
>+ * You should have received a copy of the GNU Library General Public License
>+ * along with this library; see the file COPYING.LIB.  If not, write to
>+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+ * Boston, MA 02110-1301, USA.
>+ *
>+ */
>+
>+#pragma once
>+
>+namespace WebCore {
>+
>+enum class TouchAction : uint8_t {
>+    Auto         = 0,
>+    None         = 1 << 0,
>+    Manipulation = 1 << 1,
>+    PanX         = 1 << 2,
>+    PanY         = 1 << 3,
>+    PinchZoom    = 1 << 4,
>+};
>+
>+}
>diff --git a/Source/WebCore/rendering/style/RenderStyle.h b/Source/WebCore/rendering/style/RenderStyle.h
>index 54cbfaa4887c1248b4f859fb9eb3cc6e7b7eedfd..00ada1c467f9cca0006d47e8bdab2e6f6b47f3ef 100644
>--- a/Source/WebCore/rendering/style/RenderStyle.h
>+++ b/Source/WebCore/rendering/style/RenderStyle.h
>@@ -64,6 +64,7 @@
> #include "StyleVisualData.h"
> #include "TextFlags.h"
> #include "ThemeTypes.h"
>+#include "TouchAction.h"
> #include "TransformOperations.h"
> #include "UnicodeBidi.h"
> #include <memory>
>@@ -704,7 +705,7 @@ public:
>     int initialLetterHeight() const { return initialLetter().height(); }
> 
> #if ENABLE(TOUCH_EVENTS)
>-    TouchAction touchAction() const { return static_cast<TouchAction>(m_rareNonInheritedData->touchAction); }
>+    OptionSet<TouchAction> touchAction() const { return OptionSet<TouchAction>::fromRaw(m_rareNonInheritedData->touchAction); }
> #endif
> 
> #if ENABLE(CSS_SCROLL_SNAP)
>@@ -1223,7 +1224,7 @@ public:
>     void setInitialLetter(const IntSize& size) { SET_VAR(m_rareNonInheritedData, initialLetter, size); }
>     
> #if ENABLE(TOUCH_EVENTS)
>-    void setTouchAction(TouchAction touchAction) { SET_VAR(m_rareNonInheritedData, touchAction, static_cast<unsigned>(touchAction)); }
>+    void setTouchAction(OptionSet<TouchAction> ta) { SET_VAR(m_rareNonInheritedData, touchAction, ta.toRaw()); }
> #endif
> 
> #if ENABLE(CSS_SCROLL_SNAP)
>diff --git a/Source/WebCore/rendering/style/RenderStyleConstants.h b/Source/WebCore/rendering/style/RenderStyleConstants.h
>index 66e5c7b47410a1b0af11bea436ac9cb2a84771e4..67c7c04f84d43fcad00b01aa6dd3514fbed6afed 100644
>--- a/Source/WebCore/rendering/style/RenderStyleConstants.h
>+++ b/Source/WebCore/rendering/style/RenderStyleConstants.h
>@@ -1085,13 +1085,6 @@ enum class CSSBoxType : uint8_t {
>     ViewBox
> };
> 
>-#if ENABLE(TOUCH_EVENTS)
>-enum class TouchAction : uint8_t {
>-    Auto,
>-    Manipulation
>-};
>-#endif
>-
> #if ENABLE(CSS_SCROLL_SNAP)
> enum class ScrollSnapStrictness : uint8_t {
>     None,
>diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
>index f9baa142305d220774ef26c04be2e3b2881aa94f..5ce3cbf5180b321b7d73ee45f34cb186d97e0f60 100644
>--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
>+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.h
>@@ -175,7 +175,7 @@ public:
>     std::unique_ptr<HashSet<String>> customPaintWatchedProperties;
> 
> #if ENABLE(TOUCH_EVENTS)
>-    unsigned touchAction : 1; // TouchAction
>+    unsigned touchAction : 5; // TouchAction
> #endif
> 
>     unsigned pageSizeType : 2; // PageSizeType

Actions: View | Formatted Diff | Diff

Attachments on bug 193314: 358788 | 358795 | 358935 | 358937 | 358958