Implement aria-placeholder

third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html

Index: third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html
diff --git a/third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html b/third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html
index c2d0cd2ee3b1b411112ae0dd25a4d82f47d894f0..9b93b07a5d086980dbba0048717902d97826493f 100644
--- a/third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html
+++ b/third_party/WebKit/LayoutTests/accessibility/name-calc-inputs.html
@@ -134,8 +134,8 @@ test(function(t) {
     var axTextInput10 = accessibilityController.accessibleElementById("text10");
     assert_equals(axTextInput10.name, "label-wrapping-text10");
     assert_equals(axTextInput10.nameFrom, "relatedElement");
-    assert_equals(axTextInput10.description, "text10-placeholder");
-    assert_equals(axTextInput10.descriptionFrom, "placeholder");
+    assert_equals(axTextInput10.description, "text10-title");
+    assert_equals(axTextInput10.descriptionFrom, "attribute");
 }, "Text input with placeholder and label-wrapped");
 </script>
 
@@ -154,6 +154,30 @@ test(function(t) {
 }, "Text input with multiple label-for");
 </script>
 
+<div class="container">
+    <input id="text12" type="text" title="text12-title" aria-placeholder="text12-aria-placeholder">
+</div>
+
+<script>
+test(function(t) {
+    var axTextInput12 = accessibilityController.accessibleElementById("text12");
+    assert_equals(axTextInput12.name, "text12-aria-placeholder");
+    assert_equals(axTextInput12.nameFrom, "placeholder");
+}, "Text input with title and aria-placeholder");
+</script>
+
+<div class="container">
+    <input id="text13" type="text" title="text13-title" aria-placeholder="text13-aria-placeholder" placeholder="text13-placeholder">
+</div>
+
+<script>
+test(function(t) {
+    var axTextInput13 = accessibilityController.accessibleElementById("text13");
+    assert_equals(axTextInput13.name, "text13-placeholder");
+    assert_equals(axTextInput13.nameFrom, "placeholder");
+}, "Text input with title and aria-placeholder");
+</script>
+
 <script>
 if (window.testRunner)
     document.body.className = "hideAllContainers";