Changeset 238519 in webkit

Timestamp:

Nov 26, 2018, 1:50:17 PM (8 years ago)

Author:

dbates@webkit.org

Message:

Placeholder text is not repainted after caps lock indicator is hidden
​https://bugs.webkit.org/show_bug.cgi?id=191968
<rdar://problem/46247234>

Reviewed by Zalan Bujtas.

Source/WebCore:

Fixes an issue where the placeholder text in a password field is not repainted when the
caps lock indicator is hidden.

The placeholder renderer is special. It is an excluded child renderer and does not take
part in normal flow layout. It is also created and destroyed as needed. The caps lock
indicator is also special in that it is implemented as a RenderImage and we do not know
its dimensions before it is loaded and the load happens asynchronously. As a result we
detect when the inner text size changes and mark the placeholder as dirty as a way to
keep the dimensions of the placeholder in sync with the dimensions of the inner text.

Test: fast/repaint/placeholder-after-caps-lock-hidden.html

• rendering/RenderTextControlSingleLine.cpp:

(WebCore::RenderTextControlSingleLine::layout): Mark the placeholder as needing layout
the size of the inner text changes.

LayoutTests:

Add a test to ensure to that the placeholder text is repainted when the caps lock indicator is hidden.

• TestExpectations: Skip the test on all platforms as we only support toggling Caps Lock in

WebKit2 on Mac at the moment.

• fast/repaint/placeholder-after-caps-lock-hidden.html: Added.
• platform/mac-wk2/TestExpectations: Mark the test as PASS so that we run it.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt (added)
• LayoutTests/fast/repaint/placeholder-after-caps-lock-hidden.html (added)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTextControlSingleLine.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-11-26  Daniel Bates  <dabates@apple.com>
+
+        Placeholder text is not repainted after caps lock indicator is hidden
+        https://bugs.webkit.org/show_bug.cgi?id=191968
+        <rdar://problem/46247234>
+
+        Reviewed by Zalan Bujtas.
+
+        Add a test to ensure to that the placeholder text is repainted when the caps lock indicator is hidden.
+
+        * TestExpectations: Skip the test on all platforms as we only support toggling Caps Lock in
+        WebKit2 on Mac at the moment.
+        * fast/repaint/placeholder-after-caps-lock-hidden.html: Added.
+        * platform/mac-wk2/TestExpectations: Mark the test as PASS so that we run it.
+
 2018-11-26  Daniel Bates  <dabates@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -402 +402 @@
 fast/forms/auto-fill-button/caps-lock-indicator-should-be-visible-when-after-hiding-auto-fill-strong-password-button.html [ Skip ]
 fast/forms/auto-fill-button/caps-lock-indicator-should-not-be-visible-when-auto-fill-strong-password-button-is-visible.html [ Skip ]
+fast/repaint/placeholder-after-caps-lock-hidden.html [ Skip ]
 
 # This test currently only works for mac-wk2

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -71 +71 @@
 [ Mojave+ ] fast/forms/auto-fill-button/caps-lock-indicator-should-be-visible-when-after-hiding-auto-fill-strong-password-button.html [ Pass ]
 [ Mojave+ ] fast/forms/auto-fill-button/caps-lock-indicator-should-not-be-visible-when-auto-fill-strong-password-button-is-visible.html [ Pass ]
+[ Mojave+ ] fast/repaint/placeholder-after-caps-lock-hidden.html [ Pass ]
 
 fast/events/inactive-window-no-mouse-event.html [ Pass ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-26  Daniel Bates  <dabates@apple.com>
+
+        Placeholder text is not repainted after caps lock indicator is hidden
+        https://bugs.webkit.org/show_bug.cgi?id=191968
+        <rdar://problem/46247234>
+
+        Reviewed by Zalan Bujtas.
+
+        Fixes an issue where the placeholder text in a password field is not repainted when the
+        caps lock indicator is hidden.
+
+        The placeholder renderer is special. It is an excluded child renderer and does not take
+        part in normal flow layout. It is also created and destroyed as needed. The caps lock
+        indicator is also special in that it is implemented as a RenderImage and we do not know
+        its dimensions before it is loaded and the load happens asynchronously. As a result we
+        detect when the inner text size changes and mark the placeholder as dirty as a way to
+        keep the dimensions of the placeholder in sync with the dimensions of the inner text.
+
+        Test: fast/repaint/placeholder-after-caps-lock-hidden.html
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::RenderTextControlSingleLine::layout): Mark the placeholder as needing layout
+        the size of the inner text changes.
+
 2018-11-26  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

@@ -111 +111 @@
     resetOverriddenHeight(containerRenderer, this);
 
+    // Save the old size of the inner text (if we have one) as we will need to layout the placeholder if
+    // it changes to keep the size of the placeholder proportional to the size of the inner text.
+    LayoutSize oldInnerTextSize;
+    if (innerTextRenderer)
+        oldInnerTextSize = innerTextRenderer->size();
+
     RenderBlockFlow::layoutBlock(false);
 
@@ -174 +180 @@
         bool neededLayout = placeholderBox->needsLayout();
         bool placeholderBoxHadLayout = placeholderBox->everHadLayout();
+        if (innerTextSize != oldInnerTextSize) {
+            // The caps lock indicator was hidden. Layout the placeholder. Its layout does not affect its parent.
+            placeholderBox->setChildNeedsLayout(MarkOnlyThis);
+        }
         placeholderBox->layoutIfNeeded();
         LayoutPoint textOffset;