Index: Source/modules/accessibility/AXMediaControls.cpp |
diff --git a/Source/modules/accessibility/AXMediaControls.cpp b/Source/modules/accessibility/AXMediaControls.cpp |
index 550e4c47fb3d7a25cecaeb7d328030dbe7ade249..39adada9a58eb31e7b9d2f5338c93ecbb8e45bd2 100644 |
--- a/Source/modules/accessibility/AXMediaControls.cpp |
+++ b/Source/modules/accessibility/AXMediaControls.cpp |
@@ -30,7 +30,6 @@ |
#include "config.h" |
#include "modules/accessibility/AXMediaControls.h" |
-#include "core/html/HTMLMediaElement.h" |
#include "platform/text/PlatformLocale.h" |
namespace blink { |
@@ -205,21 +204,12 @@ PassRefPtr<AXObject> AXMediaControlsContainer::create(RenderObject* 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 |
@@ -258,7 +248,7 @@ String AccessibilityMediaTimeline::valueDescription() const |
String AccessibilityMediaTimeline::helpText() const |
{ |
- return queryString(WebLocalizedString::AXMediaSliderHelp); |
+ return queryString(isControllingVideoElement() ? WebLocalizedString::AXMediaVideoSliderHelp : WebLocalizedString::AXMediaAudioSliderHelp); |
} |