Changeset 292582 in webkit

Timestamp:

Apr 7, 2022 5:47:15 PM (2 years ago)

Author:

ntim@apple.com

Message:

[:has() pseudo-class] Support invalidation for :indeterminate pseudo class on <progress>
​https://bugs.webkit.org/show_bug.cgi?id=238923

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

• web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has-expected.txt:
• web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html:

Source/WebCore:

Test: imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html

• html/HTMLProgressElement.cpp:

(WebCore::HTMLProgressElement::HTMLProgressElement):
(WebCore::HTMLProgressElement::parseAttribute):
(WebCore::HTMLProgressElement::didAttachRenderers):
(WebCore::HTMLProgressElement::updateDeterminateState):
(WebCore::HTMLProgressElement::didElementStateChange):
(WebCore::HTMLProgressElement::isDeterminate const): Deleted.

• html/HTMLProgressElement.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has-expected.txt (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html (modified) (3 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLProgressElement.cpp (modified) (5 diffs)
• Source/WebCore/html/HTMLProgressElement.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-04-07  Tim Nguyen  <ntim@apple.com>
+
+        [:has() pseudo-class] Support invalidation for :indeterminate pseudo class on <progress>
+        https://bugs.webkit.org/show_bug.cgi?id=238923
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has-expected.txt:
+        * web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html:
+
 2022-04-07  Matteo Flores  <matteo_flores@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has-expected.txt

@@ -1 +1 @@
  Check me!
 
-PASS :checked & :indeterminate invalidation
+PASS :checked & :indeterminate invalidation on <input>
+PASS :indeterminate invalidation on <progress>
 PASS :disabled invalidation
 PASS :read-only invalidation

trunk/LayoutTests/imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html

@@ -16 +16 @@
   .ancestor:has(#numberinput:out-of-range) { color: darkgreen }
   .ancestor:has(#numberinput:required) { color: pink }
+  .ancestor:has(#progress:indeterminate) { color: orange }
 </style>
 <div id=subject class=ancestor>
@@ -23 +24 @@
   <input id="radioinput" checked>
   <input id="numberinput" type="number" min="1" max="10" value="5">
+  <progress id="progress" value="50" max="100"></progress>
 </div>
 <script>
@@ -48 +50 @@
     assert_equals(getComputedStyle(subject).color, "rgb(0, 128, 0)",
                   "ancestor should be green");
-  }, ":checked & :indeterminate invalidation");
+  }, ":checked & :indeterminate invalidation on <input>");
+
+  test(function() {
+    this.add_cleanup(() => {
+      progress.setAttribute("value", "50");
+    });
+    assert_equals(getComputedStyle(subject).color, "rgb(0, 0, 0)",
+                  "ancestor should be black");
+    progress.removeAttribute("value");
+    assert_equals(getComputedStyle(subject).color, "rgb(255, 165, 0)",
+                  "ancestor should be orange");
+  }, ":indeterminate invalidation on <progress>");
 
   test(function() {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-04-07  Tim Nguyen  <ntim@apple.com>
+
+        [:has() pseudo-class] Support invalidation for :indeterminate pseudo class on <progress>
+        https://bugs.webkit.org/show_bug.cgi?id=238923
+
+        Reviewed by Antti Koivisto.
+
+        Test: imported/w3c/web-platform-tests/css/selectors/invalidation/input-pseudo-classes-in-has.html
+
+        * html/HTMLProgressElement.cpp:
+        (WebCore::HTMLProgressElement::HTMLProgressElement):
+        (WebCore::HTMLProgressElement::parseAttribute):
+        (WebCore::HTMLProgressElement::didAttachRenderers):
+        (WebCore::HTMLProgressElement::updateDeterminateState):
+        (WebCore::HTMLProgressElement::didElementStateChange):
+        (WebCore::HTMLProgressElement::isDeterminate const): Deleted.
+        * html/HTMLProgressElement.h:
+
 2022-04-07  Nikolas Zimmermann  <nzimmermann@igalia.com>
 

trunk/Source/WebCore/html/HTMLProgressElement.cpp

@@ -26 +26 @@
 #include "HTMLParserIdioms.h"
 #include "ProgressShadowElement.h"
+#include "PseudoClassChangeInvalidation.h"
 #include "RenderProgress.h"
 #include "ShadowRoot.h"
@@ -42 +43 @@
     : LabelableElement(tagName, document)
     , m_value(0)
+    , m_isDeterminate(false)
 {
     ASSERT(hasTagName(progressTag));
@@ -78 +80 @@
 void HTMLProgressElement::parseAttribute(const QualifiedName& name, const AtomString& value)
 {
-    if (name == valueAttr)
+    if (name == valueAttr) {
+        updateDeterminateState();
         didElementStateChange();
-    else if (name == maxAttr)
+    } else if (name == maxAttr)
         didElementStateChange();
     else
@@ -88 +91 @@
 void HTMLProgressElement::didAttachRenderers()
 {
-    if (RenderProgress* render = renderProgress())
-        render->updateFromElement();
+    if (RenderProgress* renderer = renderProgress())
+        renderer->updateFromElement();
 }
 
@@ -122 +125 @@
 }
 
-bool HTMLProgressElement::isDeterminate() const
+void HTMLProgressElement::updateDeterminateState()
 {
-    return hasAttributeWithoutSynchronization(valueAttr);
+    bool newIsDeterminate = hasAttributeWithoutSynchronization(valueAttr);
+    if (m_isDeterminate == newIsDeterminate)
+        return;
+    Style::PseudoClassChangeInvalidation styleInvalidation(*this, CSSSelector::PseudoClassIndeterminate, !newIsDeterminate);
+    m_isDeterminate = newIsDeterminate;
 }
-    
+
 void HTMLProgressElement::didElementStateChange()
 {
     m_value->setWidthPercentage(position() * 100);
-    if (RenderProgress* render = renderProgress()) {
-        bool wasDeterminate = render->isDeterminate();
-        render->updateFromElement();
-        if (wasDeterminate != isDeterminate())
-            invalidateStyleForSubtree();
-    }
+    if (RenderProgress* renderer = renderProgress())
+        renderer->updateFromElement();
 }
 

trunk/Source/WebCore/html/HTMLProgressElement.h

@@ -59 +59 @@
     void didAttachRenderers() final;
 
+    void updateDeterminateState();
     void didElementStateChange();
     void didAddUserAgentShadowRoot(ShadowRoot&) final;
-    bool isDeterminate() const;
+    bool isDeterminate() const { return m_isDeterminate; };
 
     bool canContainRangeEndPoint() const final { return false; }
 
     ProgressValueElement* m_value;
+    bool m_isDeterminate { false };
 };