-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[scroll-animations] add parsing support for the
scroll() notation o…
…f the `animation-timeline` property https://bugs.webkit.org/show_bug.cgi?id=265786 Reviewed by Antti Koivisto. We now add parsing support for the `scroll()` notation of the `animation-timeline` property using a new `CSSValue` subclass: `CSSScrollValue`. This will yield an anonymous `ScrollTimeline`. * LayoutTests/imported/w3c/web-platform-tests/scroll-animations/css/animation-timeline-computed-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/scroll-animations/css/animation-timeline-parsing-expected.txt: * Source/WebCore/Sources.txt: * Source/WebCore/WebCore.xcodeproj/project.pbxproj: * Source/WebCore/animation/ScrollTimeline.cpp: (WebCore::ScrollTimeline::createFromCSSValue): (WebCore::ScrollTimeline::ScrollTimeline): (WebCore::ScrollTimeline::toCSSValue const): * Source/WebCore/animation/ScrollTimeline.h: * Source/WebCore/css/CSSProperties.json: * Source/WebCore/css/CSSScrollValue.cpp: Added. (WebCore::CSSScrollValue::customCSSText const): (WebCore::CSSScrollValue::equals const): * Source/WebCore/css/CSSScrollValue.h: Added. * Source/WebCore/css/CSSToStyleMap.cpp: (WebCore::CSSToStyleMap::mapAnimationTimeline): * Source/WebCore/css/CSSValue.cpp: (WebCore::CSSValue::visitDerived): * Source/WebCore/css/CSSValue.h: (WebCore::CSSValue::isScrollValue const): * Source/WebCore/css/CSSValueKeywords.in: * Source/WebCore/css/ComputedStyleExtractor.cpp: (WebCore::valueForAnimationTimeline): * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeSingleAnimationTimeline): (WebCore::CSSPropertyParserHelpers::consumeAnimationTimelineScroll): * Source/WebCore/css/parser/CSSPropertyParserHelpers.h: * Source/WebCore/platform/animation/Animation.cpp: (WebCore::operator<<): * Source/WebCore/platform/animation/Animation.h: * Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js: Canonical link: https://commits.webkit.org/271477@main
- Loading branch information
Showing
19 changed files
with
295 additions
and
33 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright (C) 2023 Apple Inc. All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions | ||
| * are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * 2. Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * 3. Neither the name of Apple Inc. ("Apple") nor the names of | ||
| * its contributors may be used to endorse or promote products derived | ||
| * from this software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY | ||
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
| * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY | ||
| * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
| * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
| * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "config.h" | ||
| #include "CSSScrollValue.h" | ||
|
|
||
| #include "CSSPrimitiveValueMappings.h" | ||
|
|
||
| namespace WebCore { | ||
|
|
||
| String CSSScrollValue::customCSSText() const | ||
| { | ||
| auto hasScroller = m_scroller && m_scroller->valueID() != CSSValueNearest; | ||
| auto hasAxis = m_axis && m_axis->valueID() != CSSValueBlock; | ||
|
|
||
| return makeString( | ||
| "scroll("_s, | ||
| hasScroller ? m_scroller->cssText() : ""_s, | ||
| hasScroller && hasAxis ? " "_s : ""_s, | ||
| hasAxis ? m_axis->cssText() : ""_s, | ||
| ")"_s | ||
| ); | ||
| } | ||
|
|
||
| bool CSSScrollValue::equals(const CSSScrollValue& other) const | ||
| { | ||
| return compareCSSValuePtr(m_scroller, other.m_scroller) | ||
| && compareCSSValuePtr(m_axis, other.m_axis); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.