Handle AX help-Text for media time slider.

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 12 matching lines @@
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 
 #include "config.h"
 #include "modules/accessibility/AXMediaControls.h"
 
-#include "core/html/HTMLMediaElement.h"
 #include "platform/text/PlatformLocale.h"
 
 namespace blink {
 
 using blink::WebLocalizedString;
 using namespace HTMLNames;
 
 static inline String queryString(WebLocalizedString::Name name)
 {
     return Locale::defaultLocale().queryString(name);
@@ skipping 154 matching lines @@
 {
 }
 
 PassRefPtr<AXObject> AXMediaControlsContainer::create(RenderObject* renderer)
 {
     return adoptRef(new AXMediaControlsContainer(renderer));
 }
 
 String AXMediaControlsContainer::accessibilityDescription() const
 {
-    return queryString(controllingVideoElement() ? WebLocalizedString::AXMediaVideoElement : WebLocalizedString::AXMediaAudioElement);
+    return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElement : WebLocalizedString::AXMediaAudioElement);
 }
 
 String AXMediaControlsContainer::helpText() const
 {
-    return queryString(controllingVideoElement() ? WebLocalizedString::AXMediaVideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp);
-}
-
-bool AXMediaControlsContainer::controllingVideoElement() const
-{
-    Node* node = m_renderer->node();
-    if (!node)
-        return true;
-
-    return isHTMLVideoElement(toParentMediaElement(node));
+    return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoElementHelp : WebLocalizedString::AXMediaAudioElementHelp);
 }
 
 bool AXMediaControlsContainer::computeAccessibilityIsIgnored() const
 {
     return accessibilityIsIgnoredByDefault();
 }
 
 //
 // AccessibilityMediaTimeline
 
@@ skipping 18 matching lines @@
 {
     Node* node = m_renderer->node();
     if (!isHTMLInputElement(node))
         return String();
 
     return localizedMediaTimeDescription(toHTMLInputElement(node)->value().toFloat());
 }
 
 String AccessibilityMediaTimeline::helpText() const
 {
-    return queryString(WebLocalizedString::AXMediaSliderHelp);
+    return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp);
 }
 
 
 //
 // AccessibilityMediaTimeDisplay
 
 AccessibilityMediaTimeDisplay::AccessibilityMediaTimeDisplay(RenderObject* renderer)
     : AccessibilityMediaControl(renderer)
 {
 }
@@ skipping 25 matching lines @@
 {
     if (!m_renderer || !m_renderer->node())
         return String();
 
     MediaControlTimeDisplayElement* element = static_cast<MediaControlTimeDisplayElement*>(m_renderer->node());
     float time = element->currentValue();
     return localizedMediaTimeDescription(fabsf(time));
 }
 
 } // namespace blink