Merge 140803

Source/WebCore/html/shadow/DateTimeFieldElement.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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
 DateTimeFieldElement::FieldOwner::~FieldOwner()
 {
 }
 
 DateTimeFieldElement::DateTimeFieldElement(Document* document, FieldOwner& fieldOwner)
     : HTMLElement(spanTag, document)
     , m_fieldOwner(&fieldOwner)
 {
     // On accessibility, DateTimeFieldElement acts like spin button.
     setAttribute(roleAttr, "spinbutton");
+    setAttribute(aria_valuetextAttr, AXDateTimeFieldEmptyValueText());
 }
 
 void DateTimeFieldElement::defaultEventHandler(Event* event)
 {
     if (event->type() == eventNames().blurEvent)
         didBlur();
 
     if (event->type() == eventNames().focusEvent)
         didFocus();
 
@@ skipping 136 matching lines @@
 void DateTimeFieldElement::updateVisibleValue(EventBehavior eventBehavior)
 {
     Text* const textNode = toText(firstChild());
     const String newVisibleValue = visibleValue();
     ASSERT(newVisibleValue.length() > 0);
 
     if (textNode->wholeText() == newVisibleValue)
         return;
 
     textNode->replaceWholeText(newVisibleValue, ASSERT_NO_EXCEPTION);
-    setAttribute(aria_valuetextAttr, hasValue() ? newVisibleValue : AXDateTimeFieldEmptyValueText());
-    setAttribute(aria_valuenowAttr, newVisibleValue);
+    if (hasValue()) {
+        setAttribute(aria_valuetextAttr, newVisibleValue);
+        setAttribute(aria_valuenowAttr, String::number(valueForARIAValueNow()));
+    } else {
+        setAttribute(aria_valuetextAttr, AXDateTimeFieldEmptyValueText());
+        removeAttribute(aria_valuenowAttr);
+    }
 
     if (eventBehavior == DispatchEvent && m_fieldOwner)
         m_fieldOwner->fieldValueChanged();
 }
 
+int DateTimeFieldElement::valueForARIAValueNow() const
+{
+    return valueAsInteger();
+}
+
 } // namespace WebCore
 
 #endif