Skip to content

GitLab

T
tangled
Commit 7d27a19d authored by Takumi Fujimoto's avatar Takumi Fujimoto Committed by Commit Bot
Browse files
Options

Revert "Media Controls: expose current time in timeline accessibility value description." 

This reverts commit 8f0f9ceb.

Reason for revert: Speculative revert
I think this CL is making media/controls/accessibility-timeline.html
fail on WebKit Mac10.10, etc:
https://uberchromegw.corp.google.com/i/chromium.webkit/builders/WebKit%20Mac10.10/builds/45448

Original change's description:
> Media Controls: expose current time in timeline accessibility value description.
> 
> Instead of the proper value that may have many digits and make no sense
> to a human.
> 
> Bug: 829627
> Change-Id: I467354edc416af46de0f1c625e6b890414f8ae6f
> Reviewed-on: https://chromium-review.googlesource.com/998915
> Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
> Reviewed-by: Tommy Steimel <steimel@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#548775}

TBR=mlamouri@chromium.org,steimel@chromium.org

Change-Id: I14730aa64a3b51e7fa4698eeb003d386b02e4b34
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 829627
Reviewed-on: https://chromium-review.googlesource.com/999105Reviewed-by: default avatarTakumi Fujimoto <takumif@chromium.org>
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548799}
parent cffaa6f6
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 38 deletions
third_party/WebKit/LayoutTests/media/controls/accessibility-timeline.html deleted 100644 → 0
View file @ cffaa6f6
<!DOCTYPE html>
<title>Media Controls: timeline accessibility tests</title>
<script src="../../resources/testharness.js"></script>
<script src="../../resources/testharnessreport.js"></script>
<script src="../media-controls.js"></script>
<video controls></video>
<script>
async_test(t => {
assert_true(internals.runtimeFlags.accessibilityObjectModelEnabled);
var video = document.querySelector('video');
video.src = '../content/test.ogv';
var timeline = timelineElement(video);
assert_not_equals(timeline, null);
video.play().then(t.step_func(() => {
assert_equals(timeline.getAttribute('aria-valuetext'), '0:00');
// Let the video play a bit before checking the aria-valuetext again.
setTimeout(t.step_func_done(() => {
assert_equals(timeline.getAttribute('aria-valuetext'), '0:01');
}), 1500);
}));
});
</script>
third_party/WebKit/Source/modules/accessibility/AXMediaControls.cpp
View file @ 7d27a19d
...@@ -332,6 +332,12 @@ AXObject* AccessibilityMediaTimeline::Create( ...@@ -332,6 +332,12 @@ AXObject* AccessibilityMediaTimeline::Create(
return new AccessibilityMediaTimeline(layout_object, ax_object_cache); return new AccessibilityMediaTimeline(layout_object, ax_object_cache);
} }
String AccessibilityMediaTimeline::ValueDescription() const {
if (auto* input = ToHTMLInputElementOrNull(layout_object_->GetNode()))
return LocalizedMediaTimeDescription(input->value().ToFloat());
return String();
}
String AccessibilityMediaTimeline::Description( String AccessibilityMediaTimeline::Description(
AXNameFrom name_from, AXNameFrom name_from,
AXDescriptionFrom& description_from, AXDescriptionFrom& description_from,
......
third_party/WebKit/Source/modules/accessibility/AXMediaControls.h
View file @ 7d27a19d
...@@ -70,6 +70,7 @@ class AccessibilityMediaTimeline final : public AXSlider { ...@@ -70,6 +70,7 @@ class AccessibilityMediaTimeline final : public AXSlider {
String Description(AXNameFrom, String Description(AXNameFrom,
AXDescriptionFrom&, AXDescriptionFrom&,
AXObjectVector* description_objects) const override; AXObjectVector* description_objects) const override;
String ValueDescription() const override;
private: private:
AccessibilityMediaTimeline(LayoutObject*, AXObjectCacheImpl&); AccessibilityMediaTimeline(LayoutObject*, AXObjectCacheImpl&);
......
third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.cpp
View file @ 7d27a19d
...@@ -1722,11 +1722,6 @@ void MediaControlsImpl::MaybeRecordElementsDisplayed() const { ...@@ -1722,11 +1722,6 @@ void MediaControlsImpl::MaybeRecordElementsDisplayed() const {
overflow_menu_->MaybeRecordDisplayed(); overflow_menu_->MaybeRecordDisplayed();
} }
const MediaControlCurrentTimeDisplayElement&
MediaControlsImpl::CurrentTimeDisplay() const {
return *current_time_display_;
}
void MediaControlsImpl::PositionPopupMenu(Element* popup_menu) { void MediaControlsImpl::PositionPopupMenu(Element* popup_menu) {
// The popup is positioned slightly on the inside of the bottom right corner. // The popup is positioned slightly on the inside of the bottom right corner.
static constexpr int kPopupMenuMarginPx = 4; static constexpr int kPopupMenuMarginPx = 4;
......
third_party/WebKit/Source/modules/media_controls/MediaControlsImpl.h
View file @ 7d27a19d
...@@ -146,9 +146,6 @@ class MODULES_EXPORT MediaControlsImpl final : public HTMLDivElement, ...@@ -146,9 +146,6 @@ class MODULES_EXPORT MediaControlsImpl final : public HTMLDivElement,
void MaybeRecordOverflowTimeToAction(); void MaybeRecordOverflowTimeToAction();
// Accessors for UI elements.
const MediaControlCurrentTimeDisplayElement& CurrentTimeDisplay() const;
virtual void Trace(blink::Visitor*); virtual void Trace(blink::Visitor*);
// Track the state of the controls. // Track the state of the controls.
......
third_party/WebKit/Source/modules/media_controls/elements/MediaControlTimelineElement.cpp
View file @ 7d27a19d
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include "core/style/ComputedStyle.h" #include "core/style/ComputedStyle.h"
#include "modules/media_controls/MediaControlsImpl.h" #include "modules/media_controls/MediaControlsImpl.h"
#include "modules/media_controls/MediaControlsResourceLoader.h" #include "modules/media_controls/MediaControlsResourceLoader.h"
#include "modules/media_controls/elements/MediaControlCurrentTimeDisplayElement.h"
#include "modules/media_controls/elements/MediaControlElementsHelper.h" #include "modules/media_controls/elements/MediaControlElementsHelper.h"
#include "platform/runtime_enabled_features.h" #include "platform/runtime_enabled_features.h"
#include "public/platform/Platform.h" #include "public/platform/Platform.h"
...@@ -88,9 +87,6 @@ bool MediaControlTimelineElement::WillRespondToMouseClickEvents() { ...@@ -88,9 +87,6 @@ bool MediaControlTimelineElement::WillRespondToMouseClickEvents() {
void MediaControlTimelineElement::SetPosition(double current_time) { void MediaControlTimelineElement::SetPosition(double current_time) {
setValue(String::Number(current_time)); setValue(String::Number(current_time));
setAttribute(
HTMLNames::aria_valuetextAttr,
AtomicString(GetMediaControls().CurrentTimeDisplay().textContent(true)));
RenderBarSegments(); RenderBarSegments();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment