Merge 140803

Source/WebCore/html/shadow/DateTimeSymbolicFieldElement.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 114 matching lines @@
 String DateTimeSymbolicFieldElement::value() const
 {
     return hasValue() ? m_symbols[m_selectedIndex] : emptyString();
 }
 
 int DateTimeSymbolicFieldElement::valueAsInteger() const
 {
     return m_selectedIndex;
 }
 
+int DateTimeSymbolicFieldElement::valueForARIAValueNow() const
+{
+    // Synchronize with minimum/maximum adjustment in initialize().
+    return m_selectedIndex + 1;
+}
+
 String DateTimeSymbolicFieldElement::visibleEmptyValue() const
 {
     return m_visibleEmptyValue;
 }
 
 String DateTimeSymbolicFieldElement::visibleValue() const
 {
     return hasValue() ? m_symbols[m_selectedIndex] : visibleEmptyValue();
 }
 
 int DateTimeSymbolicFieldElement::indexOfSelectedOption() const
 {
     return m_selectedIndex;
 }
 
 int DateTimeSymbolicFieldElement::optionCount() const
 {
     return m_symbols.size();
 }
 
 String DateTimeSymbolicFieldElement::optionAtIndex(int index) const
 {
     return m_symbols[index];
 }
 
 } // namespace WebCore
 
 #endif