Changeset 267643 in webkit

Timestamp:

Sep 26, 2020, 6:03:21 PM (6 years ago)

Author:

Alan Coon

Message:

Revert r266887. rdar://problem/69586659

Location:

branches/safari-610-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/programmatic-focus-after-display-expected.txt (deleted)
• LayoutTests/fast/forms/programmatic-focus-after-display.html (deleted)
• Source/WebCore/dom/Element.cpp (modified) (4 diffs)
• Source/WebCore/dom/Node.h (modified) (2 diffs)

branches/safari-610-branch/LayoutTests/ChangeLog

@@ -109 +109 @@
             * fast/scrolling/mac/mousewheel-over-scrollbar.html: Added.
             * fast/scrolling/mac/negative-z-index-overflow-scroll-expected.txt:
-
-2020-09-25  Alan Coon  <alancoon@apple.com>
-
-        Cherry-pick r266887. rdar://problem/69586659
-
-    REGRESSION (r257839): clickpay.com - password placeholder text cannot be replaced
-    https://bugs.webkit.org/show_bug.cgi?id=216257
-    <rdar://problem/68150686>
-    
-    Reviewed by Antti Koivisto.
-    
-    Source/WebCore:
-    
-    On clickpay.com, the field in the login form that contains the text "Password" is actually a plain text input,
-    referred to by the site's script as the "null text input". The page adds a focus event listener to this null
-    text input, and inside of this focus event listener, it reveals a hidden password field by removing an inline
-    `display: none;` style rule on the real password input element, programmatically focuses it, and then hides the
-    null text input by setting it to `display: none;` via inline style.
-    
-    However, after the changes in r257839, we no longer attempt to do a style update upon programmatic focus in the
-    case where the programmatically focused element does not have a renderer yet (this applies to the password field
-    in this scenario, because it previously had `display: none;`). When we determine whether the newly displayed
-    password field is focusable using `Element::isVisibleWithoutResolvingFullStyle`, we then attempt to use either
-    the existing computed `RenderStyle` on the element, or perform a partial computed style resolution using the
-    `ResolveComputedStyleMode::RenderedOnly` flag.
-    
-    But in the case where `ElementRareData`'s computed style exists, it is not guaranteed to be up to date if the
-    inline style changed since the computed style was last set. In the context of this bug, it's actually Safari's
-    AutoFill logic (embedded in the injected bundle) that ends up asking for the computed style of the password
-    input, forcing it to be created and set (though, as demonstrated in the layout test, simply grabbing the
-    computed style is sufficient to replicate the bug outside of Safari).
-    
-    The end result is that we'll use this stale computed style, which still believes that the password input is not
-    displayed, and we end up not focusing the element due to believing that the password input is hidden. To fix
-    this, we would need to either check whether the element has an invalid style (i.e. `needsStyleRecalc()`) before
-    attempting to use the existing computed style, or clear out the `ElementRareData` computed style anytime the
-    element's style is invalidated. However, both of these approaches will cause us to perform partial style
-    resolution much more aggressively, leading to a 2-3% regression in Speedometer.
-    
-    To address the bug without hampering our performance wins from r257839, we add a new node flag so that we can
-    remember when computed styles are no longer valid due to style invalidation, and consult this flag in
-    `Element::isVisibleWithoutResolvingFullStyle` to avoid using the existing computed style.
-    
-    Test: fast/forms/programmatic-focus-after-display.html
-    
-    * dom/Element.cpp:
-    (WebCore::Element::invalidateStyle):
-    (WebCore::Element::resolveComputedStyle):
-    (WebCore::Element::isVisibleWithoutResolvingFullStyle const):
-    * dom/Node.h:
-    (WebCore::Node::setHasValidStyle):
-    
-    LayoutTests:
-    
-    Add a new layout test to verify that the bug does not occur. See WebCore/ChangeLog for more details.
-    
-    * fast/forms/programmatic-focus-after-display-expected.txt: Added.
-    * fast/forms/programmatic-focus-after-display.html: Added.
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@266887 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2020-09-10  Wenson Hsieh  <wenson_hsieh@apple.com>
-
-            REGRESSION (r257839): clickpay.com - password placeholder text cannot be replaced
-            https://bugs.webkit.org/show_bug.cgi?id=216257
-            <rdar://problem/68150686>
-
-            Reviewed by Antti Koivisto.
-
-            Add a new layout test to verify that the bug does not occur. See WebCore/ChangeLog for more details.
-
-            * fast/forms/programmatic-focus-after-display-expected.txt: Added.
-            * fast/forms/programmatic-focus-after-display.html: Added.
 
 2020-09-25  Alan Coon  <alancoon@apple.com>

branches/safari-610-branch/Source/WebCore/dom/Element.cpp

@@ -1945 +1945 @@
     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.
-    if (hasRareData() && elementRareData()->computedStyle())
-        setNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 }
 
@@ -3323 +3318 @@
 {
     ASSERT(isConnected());
-    ASSERT(!existingComputedStyle() || hasNodeFlag(NodeFlag::IsComputedStyleInvalidFlag));
+    ASSERT(!existingComputedStyle());
 
     Deque<RefPtr<Element>, 32> elementsRequiringComputedStyle({ this });
@@ -3343 +3338 @@
         ElementRareData& rareData = element->ensureElementRareData();
         rareData.setComputedStyle(WTFMove(style));
-        element->clearNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 
         if (mode == ResolveComputedStyleMode::RenderedOnly && computedStyle->display() == DisplayType::None)
@@ -3373 +3367 @@
 
     // Compute style in yet unstyled subtree.
-    auto* style = hasNodeFlag(NodeFlag::IsComputedStyleInvalidFlag) ? nullptr : existingComputedStyle();
+    auto* style = existingComputedStyle();
     if (!style)
         style = const_cast<Element&>(*this).resolveComputedStyle(ResolveComputedStyleMode::RenderedOnly);

branches/safari-610-branch/Source/WebCore/dom/Node.h

@@ -554 +554 @@
         ChildrenAffectedByFirstChildRulesFlag = 1 << 25,
         ChildrenAffectedByLastChildRulesFlag = 1 << 26,
-        IsComputedStyleInvalidFlag = 1 << 27,
+        // UnusedFlag = 1 << 27,
 
         AffectsNextSiblingElementStyle = 1 << 28,
@@ -776 +776 @@
     m_nodeFlags &= ~StyleValidityMask;
     clearFlag(StyleResolutionShouldRecompositeLayerFlag);
-    clearNodeFlag(NodeFlag::IsComputedStyleInvalidFlag);
 }