Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 9df4aed36a6c810e46410e4442d9db7c4a0db3e9
      
https://github.com/WebKit/WebKit/commit/9df4aed36a6c810e46410e4442d9db7c4a0db3e9
  Author: Antti Koivisto <[email protected]>
  Date:   2026-04-14 (Tue, 14 Apr 2026)

  Changed paths:
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/dashed-function-cycles-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/dashed-function-eval-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/function-attr-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/function-shadow-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/local-attr-substitution-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/local-if-substitution-expected.txt
    M 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/parameter-types.tentative-expected.txt
    M Source/WebCore/style/PropertyCascade.cpp
    M Source/WebCore/style/PropertyCascade.h
    M Source/WebCore/style/StyleBuilder.cpp
    M Source/WebCore/style/StyleBuilderState.h
    M Source/WebCore/style/StyleSubstitutionContext.h
    M Source/WebCore/style/StyleSubstitutionResolver.cpp

  Log Message:
  -----------
  [css-mixins-1] Fix cycle detection and nested function calls
https://bugs.webkit.org/show_bug.cgi?id=312101
rdar://174609179

Reviewed by Alan Baradlay (OOPS\!).

Various fixes.

* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/dashed-function-cycles-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/dashed-function-eval-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/function-attr-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/function-shadow-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/local-attr-substitution-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/local-if-substitution-expected.txt:
* 
LayoutTests/imported/w3c/web-platform-tests/css/css-mixins/parameter-types.tentative-expected.txt:
* Source/WebCore/style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::functionResultProperty const):
* Source/WebCore/style/PropertyCascade.h:
* Source/WebCore/style/StyleBuilder.cpp:
(WebCore::Style::Builder::resolveFunctionResult):

Initialize m_currentProperty when resolving the result descriptor.

* Source/WebCore/style/StyleBuilderState.h:
(WebCore::Style::BuilderState::addGuardedFunctionContexts):

Helper to add parent context guards.

* Source/WebCore/style/StyleSubstitutionContext.h:
(WebCore::Style::GuardedSubstitutionContexts::addFunctionContextsFrom):
* Source/WebCore/style/StyleSubstitutionResolver.cpp:
(WebCore::Style::SubstitutionResolver::resolveAndRegisterDashedFunctionArguments):
(WebCore::Style::SubstitutionResolver::substituteDashedFunction):

Initialize element for nested style builder.
Pass guarded substitution contexts from parent to the nested builder.

Canonical link: https://commits.webkit.org/311178@main



To unsubscribe from these emails, change your notification settings at 
https://github.com/WebKit/WebKit/settings/notifications

Reply via email to