Changeset 271446 in webkit

Timestamp:

Jan 13, 2021, 11:20:42 AM (6 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (r257839): Broken focus when 'display' changes in an attribute selector
​https://bugs.webkit.org/show_bug.cgi?id=217240
<rdar://problem/69891684>

Reviewed by Wenson Hsieh.

Source/WebCore:

Focus optimization that avoids full style resolution when setting focus in unrendered subtrees
misbehaves when the style is invalidated via an attribute change.

Test case by Ali Juma.

Test: fast/dom/focus-style-resolution-attribute-change.html

• dom/Element.cpp:

(WebCore::Element::invalidateStyle):

• dom/Node.cpp:

(WebCore::Node::invalidateStyle):

We need to set the computed style invalidity bit on all style invalidation code paths.

• html/InputType.cpp:

(WebCore::InputType::setValue):

Don't invalidate style when nothing changes.

LayoutTests:

• fast/dom/focus-style-resolution-attribute-change-expected.html: Added.
• fast/dom/focus-style-resolution-attribute-change.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/focus-style-resolution-attribute-change-expected.html (added)
• LayoutTests/fast/dom/focus-style-resolution-attribute-change.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Element.cpp (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/html/InputType.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-01-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r257839): Broken focus when 'display' changes in an attribute selector
+        https://bugs.webkit.org/show_bug.cgi?id=217240
+        <rdar://problem/69891684>
+
+        Reviewed by Wenson Hsieh.
+
+        * fast/dom/focus-style-resolution-attribute-change-expected.html: Added.
+        * fast/dom/focus-style-resolution-attribute-change.html: Added.
+
 2021-01-13  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-01-13  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r257839): Broken focus when 'display' changes in an attribute selector
+        https://bugs.webkit.org/show_bug.cgi?id=217240
+        <rdar://problem/69891684>
+
+        Reviewed by Wenson Hsieh.
+
+        Focus optimization that avoids full style resolution when setting focus in unrendered subtrees
+        misbehaves when the style is invalidated via an attribute change.
+
+        Test case by Ali Juma.
+
+        Test: fast/dom/focus-style-resolution-attribute-change.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::invalidateStyle):
+        * dom/Node.cpp:
+        (WebCore::Node::invalidateStyle):
+
+        We need to set the computed style invalidity bit on all style invalidation code paths.
+
+        * html/InputType.cpp:
+        (WebCore::InputType::setValue):
+
+        Don't invalidate style when nothing changes.
+
 2021-01-13  Kenneth Russell  <kbr@chromium.org>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1967 +1967 @@
     Node::invalidateStyle(Style::Validity::ElementInvalid);
     invalidateSiblingsIfNeeded(*this);
-
-    // FIXME: This flag should be set whenever styles are invalidated while computed styles are present,
-    // not just in this codepath.
-    setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 }
 

trunk/Source/WebCore/dom/Node.cpp

@@ -891 +891 @@
         return;
 
+    // FIXME: This should be set on all descendants in case of a subtree invalidation.
+    setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
+
     // FIXME: Why the second condition?
     bool markAncestors = styleValidity() == Style::Validity::Valid || validity == Style::Validity::SubtreeAndRenderersInvalid;

trunk/Source/WebCore/html/InputType.cpp

@@ -657 +657 @@
     ASSERT(element());
     element()->setValueInternal(sanitizedValue, eventBehavior);
-    element()->invalidateStyleForSubtree();
     if (!valueChanged)
         return;
+    element()->invalidateStyleForSubtree();
 
     switch (eventBehavior) {