Implement aria-placeholder

third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp

 /*
  * Copyright (C) 2012, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 2351 matching lines @@
   }
 
   // 5.1 Text inputs - step 3 (placeholder attribute)
   if (htmlElement && htmlElement->isTextFormControl()) {
     nameFrom = AXNameFromPlaceholder;
     if (nameSources) {
       nameSources->append(NameSource(*foundTextAlternative, placeholderAttr));
       NameSource& source = nameSources->last();
       source.type = nameFrom;
     }
-    HTMLElement* element = toHTMLElement(getNode());
-    const AtomicString& placeholder =
-        element->fastGetAttribute(placeholderAttr);
+    const String placeholder = placeholderFromNativeAttribute();
     if (!placeholder.isEmpty()) {
       textAlternative = placeholder;
       if (nameSources) {
         NameSource& source = nameSources->last();
         source.text = textAlternative;
-        source.attributeValue = placeholder;
+        source.attributeValue = htmlElement->fastGetAttribute(placeholderAttr);
+        *foundTextAlternative = true;
       } else {
         return textAlternative;
       }
     }
+
+    // Also check for aria-placeholder.
+    nameFrom = AXNameFromPlaceholder;
+    if (nameSources) {
+      nameSources->append(
+          NameSource(*foundTextAlternative, aria_placeholderAttr));
+      NameSource& source = nameSources->last();
+      source.type = nameFrom;
+    }
+    const AtomicString& ariaPlaceholder =
+        htmlElement->fastGetAttribute(aria_placeholderAttr);
+    if (!ariaPlaceholder.isEmpty()) {
+      textAlternative = ariaPlaceholder;
+      if (nameSources) {
+        NameSource& source = nameSources->last();
+        source.text = textAlternative;
+        source.attributeValue = ariaPlaceholder;
+        *foundTextAlternative = true;
+      } else {
+        return textAlternative;
+      }
+    }
+
     return textAlternative;
   }
 
   // 5.7 figure and figcaption Elements
   if (getNode()->hasTagName(figureTag)) {
     // figcaption
     nameFrom = AXNameFromRelatedElement;
     if (nameSources) {
       nameSources->append(NameSource(*foundTextAlternative));
       nameSources->last().type = nameFrom;
@@ skipping 303 matching lines @@
       }
     } else if (descriptionSources) {
       descriptionSources->last().invalid = true;
     }
   }
 
   HTMLElement* htmlElement = nullptr;
   if (getNode()->isHTMLElement())
     htmlElement = toHTMLElement(getNode());
 
-  // placeholder, 5.1.2 from:
-  // http://rawgit.com/w3c/aria/master/html-aam/html-aam.html
-  if (nameFrom != AXNameFromPlaceholder && htmlElement &&
-      htmlElement->isTextFormControl()) {
-    descriptionFrom = AXDescriptionFromPlaceholder;
-    if (descriptionSources) {
-      descriptionSources->append(
-          DescriptionSource(foundDescription, placeholderAttr));
-      DescriptionSource& source = descriptionSources->last();
-      source.type = descriptionFrom;
-    }
-    HTMLElement* element = toHTMLElement(getNode());
-    const AtomicString& placeholder =
-        element->fastGetAttribute(placeholderAttr);
-    if (!placeholder.isEmpty()) {
-      description = placeholder;
-      if (descriptionSources) {
-        DescriptionSource& source = descriptionSources->last();
-        source.text = description;
-        source.attributeValue = placeholder;
-        foundDescription = true;
-      } else {
-        return description;
-      }
-    }
-  }
-
   const HTMLInputElement* inputElement = nullptr;
   if (isHTMLInputElement(getNode()))
     inputElement = toHTMLInputElement(getNode());
 
   // value, 5.2.2 from: http://rawgit.com/w3c/aria/master/html-aam/html-aam.html
   if (nameFrom != AXNameFromValue && inputElement &&
       inputElement->isTextButton()) {
     descriptionFrom = AXDescriptionFromAttribute;
     if (descriptionSources) {
       descriptionSources->append(
@@ skipping 130 matching lines @@
 }
 
 String AXNodeObject::placeholder(AXNameFrom nameFrom,
                                  AXDescriptionFrom descriptionFrom) const {
   if (nameFrom == AXNameFromPlaceholder)
     return String();
 
   if (descriptionFrom == AXDescriptionFromPlaceholder)
     return String();
 
-  if (!getNode())
+  Node* node = getNode();
+  if (!node || !node->isHTMLElement())
     return String();
 
-  String placeholder;
-  if (isHTMLInputElement(*getNode())) {
-    HTMLInputElement* inputElement = toHTMLInputElement(getNode());
-    placeholder = inputElement->strippedPlaceholder();
-  } else if (isHTMLTextAreaElement(*getNode())) {
-    HTMLTextAreaElement* textAreaElement = toHTMLTextAreaElement(getNode());
-    placeholder = textAreaElement->strippedPlaceholder();
-  }
-  return placeholder;
+  String nativePlaceholder = placeholderFromNativeAttribute();
+  if (!nativePlaceholder.isEmpty())
+    return nativePlaceholder;
+
+  const AtomicString& ariaPlaceholder =
+      toHTMLElement(node)->fastGetAttribute(aria_placeholderAttr);
+  if (!ariaPlaceholder.isEmpty())
+    return ariaPlaceholder;
+
+  return String();
+}
+
+String AXNodeObject::placeholderFromNativeAttribute() const {
+  Node* node = getNode();
+  if (!node || !isHTMLTextFormControlElement(node))
+    return String();
+  return toHTMLTextFormControlElement(node)->strippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->trace(m_node);
   AXObject::trace(visitor);
 }
 
 }  // namespace blink