[webkit-changes] [WebKit/WebKit] 58d118: REGRESSION(265827 at main): Variable reference in mat...

[Antti Koivisto]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 58d11893af8926dc0092a858dab48021353d7535
      https://github.com/WebKit/WebKit/commit/58d11893af8926dc0092a858dab48021353d7535
  Author: Antti Koivisto <antti at apple.com>
  Date:   2023-07-11 (Tue, 11 Jul 2023)

  Changed paths:
    A LayoutTests/fast/css/variables/variable-reference-override-cached-expected.html
    A LayoutTests/fast/css/variables/variable-reference-override-cached.html
    M Source/WebCore/style/PropertyCascade.cpp
    M Source/WebCore/style/PropertyCascade.h

  Log Message:
  -----------
  REGRESSION(265827 at main): Variable reference in matched declarations cache can not be overridden
https://bugs.webkit.org/show_bug.cgi?id=259112
rdar://111924949

Reviewed by Myles C. Maxfield.

A normal non-inherited value overriding a variable reference may not be applied correctly.

* LayoutTests/fast/css/variables/variable-reference-override-cached-expected.html: Added.
* LayoutTests/fast/css/variables/variable-reference-override-cached.html: Added.
* Source/WebCore/style/PropertyCascade.cpp:
(WebCore::Style::PropertyCascade::hasProperty):
(WebCore::Style::PropertyCascade::addMatch):
(WebCore::Style::PropertyCascade::shouldApplyAfterAnimation):

The cached variable reference case needs the same already-applied check as the after-animation case.
Move the check to addMatch.

* Source/WebCore/style/PropertyCascade.h:

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