Changeset 286086 in webkit for trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

Timestamp:

Nov 19, 2021, 4:56:18 PM (3 years ago)

Author:

[email protected]

Message:

Implement parsing and animation support for ray() shape accepted by offset-path
​https://bugs.webkit.org/show_bug.cgi?id=233153

Patch by Kiet Ho <Kiet Ho> on 2021-11-19
Reviewed by Dean Jackson.

LayoutTests/imported/w3c:

Rebaselined tests that now should pass.

• web-platform-tests/css/motion/animation/offset-path-composition-expected.txt:
• web-platform-tests/css/motion/animation/offset-path-interpolation-005-expected.txt:
• web-platform-tests/css/motion/offset-supports-calc-expected.txt:
• web-platform-tests/css/motion/parsing/offset-path-computed-expected.txt:
• web-platform-tests/css/motion/parsing/offset-path-computed.html:
• web-platform-tests/css/motion/parsing/offset-path-parsing-valid-expected.txt:

Source/WebCore:

Tests: imported/w3c/web-platform-tests/css/motion/animation/offset-path-composition.html

imported/w3c/web-platform-tests/css/motion/animation/offset-path-interpolation-005.html
imported/w3c/web-platform-tests/css/motion/offset-supports-calc.html
imported/w3c/web-platform-tests/css/motion/parsing/offset-path-computed.html
imported/w3c/web-platform-tests/css/motion/parsing/offset-path-parsing-invalid.html
imported/w3c/web-platform-tests/css/motion/parsing/offset-path-parsing-valid.html

• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:
• animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc): Added support for blending between ray()s.

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::valueIDForRaySize):
(WebCore::valueForPathOperation): Added support for getting the computed value of ray().

• css/CSSRayValue.cpp: Added.

(WebCore::CSSRayValue::customCSSText const):
(WebCore::CSSRayValue::equals const):

• css/CSSRayValue.h: Added.
• css/CSSValue.cpp:

(WebCore::CSSValue::equals const):
(WebCore::CSSValue::cssText const):
(WebCore::CSSValue::destroy):

• css/CSSValue.h:

(WebCore::CSSValue::isRayValue const):

• css/CSSValueKeywords.in: Added new keywords used by ray().
• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeRayShape): Added method to consume ray().
(WebCore::consumePathOperation): Added a switch to control whether to accept
ray() or not. Both clip-path and offset-path uses this function, however clip-path
doesn't support the ray shape, while offset-path does, hence the switch.
(WebCore::CSSPropertyParser::parseSingleValue):

• rendering/PathOperation.h: Added a new subclass of PathOperation called RayPathOperation

to represent ray().

• rendering/RenderBox.cpp:

(WebCore::RenderBox::hitTestClipPath const):

• style/StyleBuilderConverter.h:

(WebCore::Style::BuilderConverter::convertPathOperation): Added support for converting CSSRayValue
to RayPathOperation.

File:

• trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -42 +42 @@
 #include "CSSPropertyNames.h"
 #include "CSSPropertyParser.h"
+#include "CSSRayValue.h"
 #include "CSSReflectValue.h"
 #include "CSSSelector.h"
@@ -1457 +1458 @@
 }
 
+static CSSValueID valueIDForRaySize(RayPathOperation::Size size)
+{
+    switch (size) {
+    case RayPathOperation::Size::ClosestCorner:
+        return CSSValueClosestCorner;
+    case RayPathOperation::Size::ClosestSide:
+        return CSSValueClosestSide;
+    case RayPathOperation::Size::FarthestCorner:
+        return CSSValueFarthestCorner;
+    case RayPathOperation::Size::FarthestSide:
+        return CSSValueFarthestSide;
+    case RayPathOperation::Size::Sides:
+        return CSSValueSides;
+    }
+
+    ASSERT_NOT_REACHED();
+    return CSSValueInvalid;
+}
+
 static Ref<CSSValue> valueForPathOperation(const RenderStyle& style, const PathOperation* operation, SVGPathConversion conversion = SVGPathConversion::None)
 {
@@ -1464 +1484 @@
         return cssValuePool.createIdentifierValue(CSSValueNone);
 
-    if (is<ReferencePathOperation>(*operation))
+    switch (operation->type()) {
+    case PathOperation::Reference:
         return CSSPrimitiveValue::create(downcast<ReferencePathOperation>(*operation).url(), CSSUnitType::CSS_URI);
 
-    auto list = CSSValueList::createSpaceSeparated();
-    if (is<ShapePathOperation>(*operation)) {
+    case PathOperation::Shape: {
+        auto list = CSSValueList::createSpaceSeparated();
+
         auto& shapeOperation = downcast<ShapePathOperation>(*operation);
         list->append(valueForBasicShape(style, shapeOperation.basicShape(), conversion));
+
         if (shapeOperation.referenceBox() != CSSBoxType::BoxMissing)
             list->append(cssValuePool.createValue(shapeOperation.referenceBox()));
-    }
-
-    if (is<BoxPathOperation>(*operation))
-        list->append(cssValuePool.createValue(downcast<BoxPathOperation>(*operation).referenceBox()));
-
-    return list;
+
+        return list;
+    }
+
+    case PathOperation::Box:
+        return cssValuePool.createValue(downcast<BoxPathOperation>(*operation).referenceBox());
+
+    case PathOperation::Ray: {
+        auto& ray = downcast<RayPathOperation>(*operation);
+
+        auto angle = cssValuePool.createValue(ray.angle(), CSSUnitType::CSS_DEG);
+        auto size = cssValuePool.createIdentifierValue(valueIDForRaySize(ray.size()));
+
+        return CSSRayValue::create(WTFMove(angle), WTFMove(size), ray.isContaining());
+    }
+    }
+
+    ASSERT_NOT_REACHED();
+    return cssValuePool.createIdentifierValue(CSSValueNone);
 }