Android accessible hint text should include placeholder.

Previously a text field's placeholder was exposed as the
hint in many circumstances, but a field that had
aria-describedby would override the placeholder.

Update the logic so that the placeholder text is
always included in the hint text for a node.

Bug: 677147
Change-Id: I15c7cfede914db6096d88039213793ec2eaa8ad4
Reviewed-on: https://chromium-review.googlesource.com/c/1385724
Commit-Queue: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Aaron Leventhal <aleventhal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622150}

content/browser/accessibility/browser_accessibility_android.cc

@@ -486,21 +486,32 @@ base::string16 BrowserAccessibilityAndroid::GetText() const {
 }
 
 base::string16 BrowserAccessibilityAndroid::GetHint() const {
-  base::string16 description =
-      GetString16Attribute(ax::mojom::StringAttribute::kDescription);
+  std::vector<base::string16> strings;
 
-  // If we're returning the value as the main text, then return both the
-  // accessible name and description as the hint.
+  // If we're returning the value as the main text, the name needs to be
+  // part of the hint.
   if (ShouldExposeValueAsName()) {
     base::string16 name =
         GetString16Attribute(ax::mojom::StringAttribute::kName);
-    if (!name.empty() && !description.empty())
-      return name + base::ASCIIToUTF16(" ") + description;
-    else if (!name.empty())
-      return name;
+    if (!name.empty())
+      strings.push_back(name);
+  }
+
+  if (GetData().GetNameFrom() != ax::mojom::NameFrom::kPlaceholder &&
+      GetData().GetIntAttribute(ax::mojom::IntAttribute::kDescriptionFrom) !=
+          static_cast<int32_t>(ax::mojom::DescriptionFrom::kPlaceholder)) {
+    base::string16 placeholder =
+        GetString16Attribute(ax::mojom::StringAttribute::kPlaceholder);
+    if (!placeholder.empty())
+      strings.push_back(placeholder);
   }
 
-  return description;
+  base::string16 description =
+      GetString16Attribute(ax::mojom::StringAttribute::kDescription);
+  if (!description.empty())
+    strings.push_back(description);
+
+  return base::JoinString(strings, base::ASCIIToUTF16(" "));
 }
 
 std::string BrowserAccessibilityAndroid::GetRoleString() const {

content/test/data/accessibility/aria/input-text-aria-placeholder-expected-android.txt

 android.webkit.WebView focusable focused scrollable
 ++android.widget.EditText clickable editable_text focusable hint='aria-placeholder1' input_type=1
 ++android.widget.EditText clickable editable_text focusable hint='placeholder2' input_type=1
-++android.widget.EditText clickable editable_text focusable hint='aria-label3' input_type=1
-++android.widget.EditText clickable editable_text focusable hint='aria-label4' input_type=1
-++android.widget.EditText clickable editable_text focusable hint='aria-label5 aria-description5' input_type=1
+++android.widget.EditText clickable editable_text focusable hint='aria-label3 placeholder3' input_type=1
+++android.widget.EditText clickable editable_text focusable hint='aria-label4 aria-placeholder4' input_type=1
+++android.widget.EditText clickable editable_text focusable hint='aria-label5 placeholder5 aria-description5' input_type=1
 ++android.view.View name='aria-description5'
 ++android.widget.EditText clickable editable_text focusable hint='aria-placeholder6 title6' input_type=1
\ No newline at end of file

content/test/data/accessibility/html/input-text-name-calc-expected-android.txt

@@ -7,4 +7,5 @@ android.webkit.WebView focusable focused scrollable
 ++android.widget.EditText clickable editable_text focusable hint='ARIA Placeholder4a' input_type=1
 ++android.widget.EditText clickable editable_text focusable hint='Placeholder4b' input_type=1
 ++android.widget.EditText clickable editable_text focusable hint='Placeholder5 Title5' input_type=1
-++android.widget.EditText clickable editable_text focusable hint='LabelledBy6 DescribedBy6' input_type=1
+++android.widget.EditText clickable editable_text focusable hint='LabelledBy6 DescribedBy6' input_type=1
\ No newline at end of file
+++android.widget.EditText clickable editable_text focusable hint='AriaLabel7 Placeholder7 DescribedBy7' input_type=1
\ No newline at end of file

content/test/data/accessibility/html/input-text-name-calc-expected-auralinux.txt

@@ -8,3 +8,4 @@
 ++[entry] name='Placeholder4b' explicit-name:true
 ++[entry] name='Placeholder5' description='Title5' explicit-name:true
 ++[entry] name='LabelledBy6' description='DescribedBy6' explicit-name:true
+++[entry] name='AriaLabel7' description='DescribedBy7' explicit-name:true
\ No newline at end of file

content/test/data/accessibility/html/input-text-name-calc-expected-blink.txt

@@ -16,4 +16,6 @@ rootWebArea
 ++textField description='Title5' name='Placeholder5' descriptionFrom=attribute
 ++++genericContainer
 ++textField description='DescribedBy6' name='LabelledBy6' descriptionFrom=relatedElement
+++++genericContainer
+++textField description='DescribedBy7' name='AriaLabel7' descriptionFrom=relatedElement
 ++++genericContainer
\ No newline at end of file

content/test/data/accessibility/html/input-text-name-calc-expected-win.txt

@@ -7,4 +7,5 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
 ++ROLE_SYSTEM_TEXT name='ARIA Placeholder4a' FOCUSABLE explicit-name:true
 ++ROLE_SYSTEM_TEXT name='Placeholder4b' FOCUSABLE explicit-name:true
 ++ROLE_SYSTEM_TEXT name='Placeholder5' FOCUSABLE explicit-name:true description='Title5'
-++ROLE_SYSTEM_TEXT name='LabelledBy6' FOCUSABLE explicit-name:true description='DescribedBy6'
+++ROLE_SYSTEM_TEXT name='LabelledBy6' FOCUSABLE explicit-name:true description='DescribedBy6'
\ No newline at end of file
+++ROLE_SYSTEM_TEXT name='AriaLabel7' FOCUSABLE explicit-name:true description='DescribedBy7'
\ No newline at end of file

content/test/data/accessibility/html/input-text-name-calc.html

@@ -22,6 +22,9 @@
          aria-label="AriaLabel6" aria-labelledby="lb6"
          aria-describedby="db6">
 
+  <input id="c7" type="text" aria-label="AriaLabel7"
+         placeholder="Placeholder7" aria-describedby="db7">
+
   <p aria-label="@NO_DUMP">
     <label for="c1">Label1</label>
     <label for="c2">Label2</label>
@@ -34,6 +37,8 @@
     <span id="lb6">LabelledBy6</span>
 
     <span id="db6">DescribedBy6</span>
+
+    <span id="db7">DescribedBy7</span>
   </p>
 </body>
 </html>