Make use of new AX name calc in Chromium.

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

 /*
  * Copyright (C) 2009 Apple 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 58 matching lines @@
 }
 
 MediaControlElementType AccessibilityMediaControl::controlType() const
 {
     if (!layoutObject() || !layoutObject()->node())
         return MediaTimelineContainer; // Timeline container is not accessible.
 
     return mediaControlElementType(layoutObject()->node());
 }
 
-String AccessibilityMediaControl::deprecatedTitle(TextUnderElementMode mode) const
-{
-    // FIXME: the ControlsPanel container should never be visible in the
-    // accessibility hierarchy.
-    if (controlType() == MediaControlsPanel)
-        return queryString(WebLocalizedString::AXMediaDefault);
-
-    return AXLayoutObject::deprecatedTitle(mode);
-}
-
-String AccessibilityMediaControl::deprecatedAccessibilityDescription() const
+String AccessibilityMediaControl::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
     switch (controlType()) {
     case MediaEnterFullscreenButton:
         return queryString(WebLocalizedString::AXMediaEnterFullscreenButton);
     case MediaExitFullscreenButton:
         return queryString(WebLocalizedString::AXMediaExitFullscreenButton);
     case MediaMuteButton:
         return queryString(WebLocalizedString::AXMediaMuteButton);
     case MediaPlayButton:
         return queryString(WebLocalizedString::AXMediaPlayButton);
@@ skipping 11 matching lines @@
         return queryString(WebLocalizedString::AXMediaHideClosedCaptionsButton);
     case MediaCastOffButton:
         return queryString(WebLocalizedString::AxMediaCastOffButton);
     case MediaCastOnButton:
         return queryString(WebLocalizedString::AxMediaCastOnButton);
     default:
         return queryString(WebLocalizedString::AXMediaDefault);
     }
 }
 
-String AccessibilityMediaControl::deprecatedHelpText() const
+String AccessibilityMediaControl::description(AXNameFrom nameFrom, AXDescriptionFrom& descriptionFrom, AXObjectVector* descriptionObjects) const
 {
     switch (controlType()) {
     case MediaEnterFullscreenButton:
         return queryString(WebLocalizedString::AXMediaEnterFullscreenButtonHelp);
     case MediaExitFullscreenButton:
         return queryString(WebLocalizedString::AXMediaExitFullscreenButtonHelp);
     case MediaMuteButton:
         return queryString(WebLocalizedString::AXMediaMuteButtonHelp);
     case MediaPlayButton:
         return queryString(WebLocalizedString::AXMediaPlayButtonHelp);
@@ skipping 57 matching lines @@
 AXMediaControlsContainer::AXMediaControlsContainer(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCache)
     : AccessibilityMediaControl(layoutObject, axObjectCache)
 {
 }
 
 AXObject* AXMediaControlsContainer::create(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCache)
 {
     return new AXMediaControlsContainer(layoutObject, axObjectCache);
 }
 
-String AXMediaControlsContainer::deprecatedAccessibilityDescription() const
+String AXMediaControlsContainer::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElement : WebLocalizedString::AXMediaAudioElement);
 }
 
-String AXMediaControlsContainer::deprecatedHelpText() const
+String AXMediaControlsContainer::description(AXNameFrom nameFrom, AXDescriptionFrom& descriptionFrom, AXObjectVector* descriptionObjects) const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp);
 }
 
 bool AXMediaControlsContainer::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons) const
 {
     return accessibilityIsIgnoredByDefault(ignoredReasons);
 }
 
 //
@@ skipping 18 matching lines @@
 
 String AccessibilityMediaTimeline::valueDescription() const
 {
     Node* node = m_layoutObject->node();
     if (!isHTMLInputElement(node))
         return String();
 
     return localizedMediaTimeDescription(toHTMLInputElement(node)->value().toFloat());
 }
 
-String AccessibilityMediaTimeline::deprecatedHelpText() const
+String AccessibilityMediaTimeline::description(AXNameFrom nameFrom, AXDescriptionFrom& descriptionFrom, AXObjectVector* descriptionObjects) const
 {
     return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp);
 }
 
 
 //
 // AccessibilityMediaTimeDisplay
 
 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCache)
     : AccessibilityMediaControl(layoutObject, axObjectCache)
 {
 }
 
 AXObject* AccessibilityMediaTimeDisplay::create(LayoutObject* layoutObject, AXObjectCacheImpl& axObjectCache)
 {
     return new AccessibilityMediaTimeDisplay(layoutObject, axObjectCache);
 }
 
 bool AccessibilityMediaTimeDisplay::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons) const
 {
     if (!m_layoutObject || !m_layoutObject->style() || m_layoutObject->style()->visibility() != VISIBLE)
         return true;
 
     if (!m_layoutObject->style()->width().value())
         return true;
 
     return accessibilityIsIgnoredByDefault(ignoredReasons);
 }
 
-String AccessibilityMediaTimeDisplay::deprecatedAccessibilityDescription() const
+String AccessibilityMediaTimeDisplay::textAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources) const
 {
     if (controlType() == MediaCurrentTimeDisplay)
         return queryString(WebLocalizedString::AXMediaCurrentTimeDisplay);
     return queryString(WebLocalizedString::AXMediaTimeRemainingDisplay);
 }
 
 String AccessibilityMediaTimeDisplay::stringValue() const
 {
     if (!m_layoutObject || !m_layoutObject->node())
         return String();
 
     MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDisplayElement*>(m_layoutObject->node());
     float time = element->currentValue();
     return localizedMediaTimeDescription(fabsf(time));
 }
 
 } // namespace blink