<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[185173] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/185173">185173</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-03 15:35:44 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Caps lock indicator should not be shown in read-only or disabled field
https://bugs.webkit.org/show_bug.cgi?id=145612
<rdar://problem/21227454>
Reviewed by Darin Adler.
.:
* ManualTests/password-caps-lock-should-not-show-in-read-only-field.html: Added.
* ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html: Added.
* ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html: Added.
Source/WebCore:
* html/TextFieldInputType.cpp:
(WebCore::TextFieldInputType::disabledAttributeChanged): Update caps lock indicator state.
(WebCore::TextFieldInputType::readonlyAttributeChanged): Ditto.
(WebCore::TextFieldInputType::shouldDrawCapsLockIndicator): Do not draw the caps lock indicator
when the field is read-only or disabled.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlTextFieldInputTypecpp">trunk/Source/WebCore/html/TextFieldInputType.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkManualTestspasswordcapslockshouldnotshowinreadonlyfieldhtml">trunk/ManualTests/password-caps-lock-should-not-show-in-read-only-field.html</a></li>
<li><a href="#trunkManualTestspasswordcapslockshouldnotshowwhenfieldbecomesdisabledhtml">trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html</a></li>
<li><a href="#trunkManualTestspasswordcapslockshouldnotshowwhenfieldbecomesreadonlyhtml">trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (185172 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-06-03 22:32:40 UTC (rev 185172)
+++ trunk/ChangeLog 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-03 Daniel Bates <dabates@apple.com>
+
+ Caps lock indicator should not be shown in read-only or disabled field
+ https://bugs.webkit.org/show_bug.cgi?id=145612
+ <rdar://problem/21227454>
+
+ Reviewed by Darin Adler.
+
+ * ManualTests/password-caps-lock-should-not-show-in-read-only-field.html: Added.
+ * ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html: Added.
+ * ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html: Added.
+
</ins><span class="cx"> 2015-06-01 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [cmake] Suppress parentheses-equality warnings
</span></span></pre></div>
<a id="trunkManualTestspasswordcapslockshouldnotshowinreadonlyfieldhtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/password-caps-lock-should-not-show-in-read-only-field.html (0 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/password-caps-lock-should-not-show-in-read-only-field.html (rev 0)
+++ trunk/ManualTests/password-caps-lock-should-not-show-in-read-only-field.html 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This test can be used to verify that the caps lock indicator is not shown in a read-only password field.</p>
+<ol>
+ <li>Click on the password field (below) to focus it.</li>
+ <li>Press the caps lock key on the keyboard.</li>
+</ol>
+<p>This test FAILED if the caps lock indicator is shown. Otherwise, it PASSED.</p>
+<input type="password" readonly>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkManualTestspasswordcapslockshouldnotshowwhenfieldbecomesdisabledhtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html (0 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html (rev 0)
+++ trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-disabled.html 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This test can be used to verify that the caps lock indicator is not shown when the password field becomes disabled.</p>
+<ol>
+ <li>Click on the password field (below) to focus it.</li>
+ <li>Press the caps lock key on the keyboard.</li>
+</ol>
+<p>This test FAILED if the caps lock indicator is shown. Otherwise, it PASSED.</p>
+<input type="password" onkeydown="this.disabled = true;"> <!-- AppKit only dispatches a keydown event when the caps lock key is enabled. -->
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkManualTestspasswordcapslockshouldnotshowwhenfieldbecomesreadonlyhtml"></a>
<div class="addfile"><h4>Added: trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html (0 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html (rev 0)
+++ trunk/ManualTests/password-caps-lock-should-not-show-when-field-becomes-read-only.html 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This test can be used to verify that the caps lock indicator is not shown when the password field becomes read-only.</p>
+<ol>
+ <li>Click on the password field (below) to focus it.</li>
+ <li>Press the caps lock key on the keyboard.</li>
+</ol>
+<p>This test FAILED if the caps lock indicator is shown. Otherwise, it PASSED.</p>
+<input type="password" onkeydown="this.readOnly = true;"> <!-- AppKit only dispatches a keydown event when the caps lock key is enabled. -->
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185172 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-03 22:32:40 UTC (rev 185172)
+++ trunk/Source/WebCore/ChangeLog 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-03 Daniel Bates <dabates@apple.com>
+
+ Caps lock indicator should not be shown in read-only or disabled field
+ https://bugs.webkit.org/show_bug.cgi?id=145612
+ <rdar://problem/21227454>
+
+ Reviewed by Darin Adler.
+
+ * html/TextFieldInputType.cpp:
+ (WebCore::TextFieldInputType::disabledAttributeChanged): Update caps lock indicator state.
+ (WebCore::TextFieldInputType::readonlyAttributeChanged): Ditto.
+ (WebCore::TextFieldInputType::shouldDrawCapsLockIndicator): Do not draw the caps lock indicator
+ when the field is read-only or disabled.
+
</ins><span class="cx"> 2015-06-03 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in GraphicsContext3D::getInternalFramebufferSize
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlTextFieldInputTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/TextFieldInputType.cpp (185172 => 185173)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/TextFieldInputType.cpp 2015-06-03 22:32:40 UTC (rev 185172)
+++ trunk/Source/WebCore/html/TextFieldInputType.cpp 2015-06-03 22:35:44 UTC (rev 185173)
</span><span class="lines">@@ -358,6 +358,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_innerSpinButton)
</span><span class="cx"> m_innerSpinButton->releaseCapture();
</span><ins>+ capsLockStateMayHaveChanged();
</ins><span class="cx"> updateAutoFillButton();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -365,6 +366,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_innerSpinButton)
</span><span class="cx"> m_innerSpinButton->releaseCapture();
</span><ins>+ capsLockStateMayHaveChanged();
</ins><span class="cx"> updateAutoFillButton();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -551,6 +553,9 @@
</span><span class="cx"> if (element().document().focusedElement() != &element())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (element().isDisabledOrReadOnly())
+ return false;
+
</ins><span class="cx"> Frame* frame = element().document().frame();
</span><span class="cx"> if (!frame)
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>