Changeset 19620 in webkit

Timestamp:

Feb 14, 2007 2:52:17 AM (17 years ago)

Author:

antti

Message:

LayoutTests:

Reviewed by Hyatt.

• layout test for ​http://bugs.webkit.org/show_bug.cgi?id=11923 REGRESSION: Placeholder text in password field shows as bullets <rdar://problem/4960257>

• fast/forms/password-placeholder-expected.checksum: Added.
• fast/forms/password-placeholder-expected.png: Added.
• fast/forms/password-placeholder-expected.txt: Added.
• fast/forms/password-placeholder.html: Added.

WebCore:

Reviewed by Hyatt.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=11923 REGRESSION: Placeholder text in password field shows as bullets <rdar://problem/4960257>

Disable textSecurity when placeholder is visible.

• rendering/RenderTextControl.cpp: (WebCore::RenderTextControl::updatePlaceholder):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/password-placeholder-expected.checksum (added)
• LayoutTests/fast/forms/password-placeholder-expected.png (added)
• LayoutTests/fast/forms/password-placeholder-expected.txt (added)
• LayoutTests/fast/forms/password-placeholder.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderTextControl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-14  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Hyatt.
+        
+        - layout test for http://bugs.webkit.org/show_bug.cgi?id=11923
+        REGRESSION: Placeholder text in password field shows as bullets
+        <rdar://problem/4960257>        
+
+        * fast/forms/password-placeholder-expected.checksum: Added.
+        * fast/forms/password-placeholder-expected.png: Added.
+        * fast/forms/password-placeholder-expected.txt: Added.
+        * fast/forms/password-placeholder.html: Added.
+
 2007-02-13  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-14  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Hyatt.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=11923
+        REGRESSION: Placeholder text in password field shows as bullets
+        <rdar://problem/4960257> 
+        
+        Disable textSecurity when placeholder is visible.
+        
+        * rendering/RenderTextControl.cpp:
+        (WebCore::RenderTextControl::updatePlaceholder):
+
 2007-02-13  Alexey Proskuryakov  <ap@webkit.org>
 

trunk/WebCore/rendering/RenderTextControl.cpp

@@ -218 +218 @@
 void RenderTextControl::updatePlaceholder()
 {
+    bool oldPlaceholderVisible = m_placeholderVisible;
+    
     String placeholder;
     if (!m_multiLine) {
@@ -240 +242 @@
 
     RenderObject* renderer = m_innerText->renderer();
-    RenderStyle* style = renderer->style();
-    if (style->color() != color) {
-        style->setColor(color);
+    RenderStyle* innerStyle = renderer->style();
+    if (innerStyle->color() != color) {
+        innerStyle->setColor(color);
         renderer->repaint();
+    }
+
+    // temporary disable textSecurity if placeholder is visible
+    if (style()->textSecurity() != TSNONE && oldPlaceholderVisible != m_placeholderVisible) {
+        RenderStyle* newInnerStyle = new (renderArena()) RenderStyle(*innerStyle);
+        newInnerStyle->setTextSecurity(m_placeholderVisible ? TSNONE : style()->textSecurity());
+        renderer->setStyle(newInnerStyle);
+        for (Node* n = m_innerText->firstChild(); n; n = n->traverseNextNode(m_innerText.get())) {
+            if (n->renderer())
+                n->renderer()->setStyle(newInnerStyle);
+        }
     }
 }