<!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>[203877] branches/safari-602-branch</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/203877">203877</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:12:02 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203711">r203711</a>. rdar://problem/27279453</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchLayoutTestsaccessibilityautofilltypesexpectedtxt">branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsaccessibilityautofilltypeshtml">branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types.html</a></li>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreaccessibilityAccessibilityObjectcpp">branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreaccessibilityAccessibilityObjecth">branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">branches/safari-602-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203711. rdar://problem/27279453
+
+ 2016-07-25 Nan Wang <n_wang@apple.com>
+
+ AX: Expose autoFillButtonType to accessibility
+ https://bugs.webkit.org/show_bug.cgi?id=160179
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/auto-fill-types-expected.txt:
+ * accessibility/auto-fill-types.html:
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203695. rdar://problem/27010112
</span><span class="cx">
</span><span class="cx"> 2016-07-25 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilityautofilltypesexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types-expected.txt (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types-expected.txt 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types-expected.txt 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -5,10 +5,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Initial auto-fill available: false
</span><ins>+Auto-fill type: none
</ins><span class="cx"> Contact button role: AXRole: AXButton
</span><span class="cx"> Contact button label: AXDescription: contact info auto fill
</span><ins>+Auto-fill type: contacts
</ins><span class="cx"> Credentials button role: AXRole: AXButton
</span><span class="cx"> Credentials button label: AXDescription: password auto fill
</span><ins>+Auto-fill type: credentials
</ins><span class="cx"> Post auto-fill available: true
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsaccessibilityautofilltypeshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types.html (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types.html 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/LayoutTests/accessibility/auto-fill-types.html 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -19,16 +19,19 @@
</span><span class="cx"> var textField = document.getElementById("textfield");
</span><span class="cx"> var axTextField = accessibilityController.accessibleElementById("textfield");
</span><span class="cx"> debug("Initial auto-fill available: " + axTextField.boolAttributeValue("AXValueAutofillAvailable"));
</span><ins>+ debug("Auto-fill type: " + axTextField.stringAttributeValue("AXValueAutofillType"));
</ins><span class="cx">
</span><span class="cx"> window.internals.setShowAutoFillButton(document.getElementById("textfield"), "AutoFillButtonTypeContacts");
</span><span class="cx"> var contactsButton = axTextField.childAtIndex(1);
</span><span class="cx"> debug("Contact button role: " + contactsButton.role);
</span><span class="cx"> debug("Contact button label: " + contactsButton.description);
</span><ins>+ debug("Auto-fill type: " + axTextField.stringAttributeValue("AXValueAutofillType"));
</ins><span class="cx">
</span><span class="cx"> window.internals.setShowAutoFillButton(document.getElementById("textfield"), "AutoFillButtonTypeCredentials");
</span><span class="cx"> var credentialsButton = axTextField.childAtIndex(1);
</span><span class="cx"> debug("Credentials button role: " + credentialsButton.role);
</span><span class="cx"> debug("Credentials button label: " + credentialsButton.description);
</span><ins>+ debug("Auto-fill type: " + axTextField.stringAttributeValue("AXValueAutofillType"));
</ins><span class="cx">
</span><span class="cx"> debug("Post auto-fill available: " + axTextField.boolAttributeValue("AXValueAutofillAvailable"));
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-07-28 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r203711. rdar://problem/27279453
+
+ 2016-07-25 Nan Wang <n_wang@apple.com>
+
+ AX: Expose autoFillButtonType to accessibility
+ https://bugs.webkit.org/show_bug.cgi?id=160179
+
+ Reviewed by Chris Fleizach.
+
+ Added a new attribute on Mac to expose the auto-fill button type.
+
+ Changes are covered in modified test.
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::isValueAutofillAvailable):
+ (WebCore::AccessibilityObject::valueAutofillButtonType):
+ (WebCore::AccessibilityObject::isValueAutofilled):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::passwordFieldValue):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r203706. rdar://problem/27457941
</span><span class="cx">
</span><span class="cx"> 2016-07-25 Jeremy Jones <jeremyj@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.cpp (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -2253,7 +2253,15 @@
</span><span class="cx">
</span><span class="cx"> return downcast<HTMLInputElement>(*node).autoFillButtonType() != AutoFillButtonType::None;
</span><span class="cx"> }
</span><ins>+
+AutoFillButtonType AccessibilityObject::valueAutofillButtonType() const
+{
+ if (!isValueAutofillAvailable())
+ return AutoFillButtonType::None;
</ins><span class="cx">
</span><ins>+ return downcast<HTMLInputElement>(*this->node()).autoFillButtonType();
+}
+
</ins><span class="cx"> bool AccessibilityObject::isValueAutofilled() const
</span><span class="cx"> {
</span><span class="cx"> if (!isNativeTextControl())
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.h (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.h 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/Source/WebCore/accessibility/AccessibilityObject.h 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #define AccessibilityObject_h
</span><span class="cx">
</span><span class="cx"> #include "FloatQuad.h"
</span><ins>+#include "HTMLTextFormControlElement.h"
</ins><span class="cx"> #include "LayoutRect.h"
</span><span class="cx"> #include "Path.h"
</span><span class="cx"> #include "Range.h"
</span><span class="lines">@@ -904,6 +905,7 @@
</span><span class="cx"> virtual String passwordFieldValue() const { return String(); }
</span><span class="cx"> bool isValueAutofilled() const;
</span><span class="cx"> bool isValueAutofillAvailable() const;
</span><ins>+ AutoFillButtonType valueAutofillButtonType() const;
</ins><span class="cx">
</span><span class="cx"> // Used by an ARIA tree to get all its rows.
</span><span class="cx"> void ariaTreeRows(AccessibilityChildrenVector&);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (203876 => 203877)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-07-29 07:11:59 UTC (rev 203876)
+++ branches/safari-602-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-07-29 07:12:02 UTC (rev 203877)
</span><span class="lines">@@ -161,6 +161,10 @@
</span><span class="cx"> #define NSAccessibilityValueAutofillAvailableAttribute @"AXValueAutofillAvailable"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilityValueAutofillTypeAttribute
+#define NSAccessibilityValueAutofillTypeAttribute @"AXValueAutofillType"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityLanguageAttribute
</span><span class="cx"> #define NSAccessibilityLanguageAttribute @"AXLanguage"
</span><span class="cx"> #endif
</span><span class="lines">@@ -3237,6 +3241,17 @@
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityValueAutofillAvailableAttribute])
</span><span class="cx"> return @(m_object->isValueAutofillAvailable());
</span><span class="cx">
</span><ins>+ if ([attributeName isEqualToString:NSAccessibilityValueAutofillTypeAttribute]) {
+ switch (m_object->valueAutofillButtonType()) {
+ case AutoFillButtonType::None:
+ return @"none";
+ case AutoFillButtonType::Credentials:
+ return @"credentials";
+ case AutoFillButtonType::Contacts:
+ return @"contacts";
+ }
+ }
+
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityValueAutofilledAttribute])
</span><span class="cx"> return @(m_object->isValueAutofilled());
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>