Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp

Issue 1079323002: Support text track selection in video controls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed UX comment on displaying icons only for duplicate labels and rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
index 8abd84b258199c91dc3f920ced137688a0319299..1ceb565ffb1e629d6dd9d08d6a318196eac58177 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
+++ b/third_party/WebKit/Source/core/html/shadow/MediaControlElements.cpp
@@ -32,19 +32,26 @@
#include "bindings/core/v8/ExceptionStatePlaceholder.h"
#include "core/InputTypeNames.h"
#include "core/dom/ClientRect.h"
+#include "core/dom/Text.h"
#include "core/dom/shadow/ShadowRoot.h"
#include "core/events/MouseEvent.h"
#include "core/frame/LocalFrame.h"
+#include "core/html/HTMLLabelElement.h"
#include "core/html/HTMLMediaSource.h"
+#include "core/html/HTMLSpanElement.h"
#include "core/html/HTMLVideoElement.h"
#include "core/html/TimeRanges.h"
#include "core/html/shadow/MediaControls.h"
+#include "core/html/track/TextTrackList.h"
#include "core/input/EventHandler.h"
#include "core/layout/LayoutTheme.h"
#include "core/layout/LayoutVideo.h"
#include "core/layout/api/LayoutSliderItem.h"
+#include "platform/EventDispatchForbiddenScope.h"
#include "platform/Histogram.h"
#include "platform/RuntimeEnabledFeatures.h"
+#include "platform/text/PlatformLocale.h"
+#include "public/platform/Platform.h"
namespace blink {
@@ -55,6 +62,16 @@ namespace {
// This is the duration from mediaControls.css
const double fadeOutDuration = 0.3;
+const QualifiedName& trackIndexAttrName()
+{
+ // Save the track index in an attribute to avoid holding a pointer to the text track.
+ DEFINE_STATIC_LOCAL(QualifiedName, trackIndexAttr, (nullAtom, "data-track-index", nullAtom));
+ return trackIndexAttr;
+}
+
+// When specified as trackIndex, disable text tracks.
+const int trackIndexOffValue = -1;
+
bool isUserInteractionEvent(Event* event)
{
const AtomicString& type = event->type();
@@ -358,16 +375,14 @@ RawPtr<MediaControlToggleClosedCaptionsButtonElement> MediaControlToggleClosedCa
void MediaControlToggleClosedCaptionsButtonElement::updateDisplayType()
{
- bool captionsVisible = mediaElement().closedCaptionsVisible();
+ bool captionsVisible = mediaElement().textTracksVisible();
setDisplayType(captionsVisible ? MediaHideClosedCaptionsButton : MediaShowClosedCaptionsButton);
- setChecked(captionsVisible);
}
void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event* event)
{
if (event->type() == EventTypeNames::click) {
- mediaElement().setClosedCaptionsVisible(!mediaElement().closedCaptionsVisible());
- setChecked(mediaElement().closedCaptionsVisible());
+ mediaControls().toggleTextTrackList();
updateDisplayType();
event->setDefaultHandled();
}
@@ -377,6 +392,159 @@ void MediaControlToggleClosedCaptionsButtonElement::defaultEventHandler(Event* e
// ----------------------------
+MediaControlTextTrackListElement::MediaControlTextTrackListElement(MediaControls& mediaControls)
+ : MediaControlDivElement(mediaControls, MediaTextTrackList)
+{
+}
+
+RawPtr<MediaControlTextTrackListElement> MediaControlTextTrackListElement::create(MediaControls& mediaControls)
+{
+ RawPtr<MediaControlTextTrackListElement> element = new MediaControlTextTrackListElement(mediaControls);
+ element->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list"));
+ element->setIsWanted(false);
+ return element.release();
+}
+
+void MediaControlTextTrackListElement::defaultEventHandler(Event* event)
+{
+ if (event->type() == EventTypeNames::change) {
+ // Identify which input element was selected and set track to showing
+ Node* target = event->target()->toNode();
+ if (!target || !target->isElementNode())
+ return;
+
+ disableShowingTextTracks();
+ int trackIndex = toElement(target)->getIntegralAttribute(trackIndexAttrName());
+ if (trackIndex != trackIndexOffValue) {
+ ASSERT(trackIndex >= 0);
+ showTextTrackAtIndex(trackIndex);
+ mediaElement().disableAutomaticTextTrackSelection();
+ }
+
+ mediaControls().toggleTextTrackList();
+ event->setDefaultHandled();
+ }
+ MediaControlDivElement::defaultEventHandler(event);
+}
+
+void MediaControlTextTrackListElement::setVisible(bool visible)
+{
+ if (visible) {
+ setIsWanted(true);
+ refreshTextTrackListMenu();
+ } else {
+ setIsWanted(false);
+ }
+}
+
+void MediaControlTextTrackListElement::showTextTrackAtIndex(unsigned indexToEnable)
+{
+ TextTrackList* trackList = mediaElement().textTracks();
+ if (indexToEnable >= trackList->length())
+ return;
+ TextTrack* track = trackList->anonymousIndexedGetter(indexToEnable);
+ if (track && track->canBeRendered())
+ track->setMode(TextTrack::showingKeyword());
+}
+
+void MediaControlTextTrackListElement::disableShowingTextTracks()
+{
+ TextTrackList* trackList = mediaElement().textTracks();
+ for (unsigned i = 0; i < trackList->length(); ++i) {
+ TextTrack* track = trackList->anonymousIndexedGetter(i);
+ if (track->mode() == TextTrack::showingKeyword())
+ track->setMode(TextTrack::disabledKeyword());
+ }
+}
+
+String MediaControlTextTrackListElement::getTextTrackLabel(TextTrack* track)
+{
+ if (!track)
+ return mediaElement().locale().queryString(WebLocalizedString::TextTracksOff);
+
+ String trackLabel = track->label();
+
+ if (trackLabel.isEmpty())
+ trackLabel = String(mediaElement().locale().queryString(WebLocalizedString::TextTracksNoLabel));
+
+ return trackLabel;
+}
+
+bool MediaControlTextTrackListElement::shouldDisplayTrackKindMarker(TextTrack* currentTrack, String currentTrackLabel)
philipj_slow 2016/04/19 15:21:09 How about just a free helper function hasDuplicate
srivats 2016/04/19 23:19:02 Done.
+{
+ if (currentTrackLabel == String(mediaElement().locale().queryString(WebLocalizedString::TextTracksNoLabel)))
+ return true;
+ TextTrackList* trackList = mediaElement().textTracks();
+ for (unsigned i = 0; i < trackList->length(); i++) {
philipj_slow 2016/04/19 15:21:09 This will be O(n^2) in the number of tracks which
srivats 2016/04/19 23:19:02 Done.
+ TextTrack* track = trackList->anonymousIndexedGetter(i);
+ if (currentTrack == track)
+ continue;
+ if (currentTrackLabel == track->label())
+ return true;
+ }
+ return false;
+}
+
+// TextTrack parameter when passed in as a nullptr, creates the "Off" list item in the track list.
+RawPtr<Element> MediaControlTextTrackListElement::createTextTrackListItem(TextTrack* track)
+{
+ int trackIndex = track ? track->trackIndex() : trackIndexOffValue;
+ RawPtr<HTMLLabelElement> trackItem = HTMLLabelElement::create(document(), nullptr);
+ trackItem->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-item"));
+ RawPtr<HTMLInputElement> trackItemInput = HTMLInputElement::create(document(), nullptr, false);
+ trackItemInput->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-item-input"));
+ trackItemInput->setType(InputTypeNames::checkbox);
+ trackItemInput->setIntegralAttribute(trackIndexAttrName(), trackIndex);
+ if (!mediaElement().textTracksVisible()) {
+ if (!track)
+ trackItemInput->setChecked(true);
+ } else {
+ // If there are multiple text tracks set to showing, they must all have
+ // checkmarks displayed.
+ if (track && track->mode() == TextTrack::showingKeyword())
+ trackItemInput->setChecked(true);
+ }
+
+ trackItem->appendChild(trackItemInput);
+ String trackLabel = getTextTrackLabel(track);
+ trackItem->appendChild(Text::create(document(), trackLabel));
+ // Add a track kind marker icon if there are multiple tracks with the same label.
+ if (track && shouldDisplayTrackKindMarker(track, trackLabel)) {
+ RawPtr<HTMLSpanElement> trackKindMarker = HTMLSpanElement::create(document());
+ if (track->kind() == track->captionsKeyword()) {
+ trackKindMarker->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-kind-captions"));
+ } else {
+ ASSERT(track->kind() == track->subtitlesKeyword());
+ trackKindMarker->setShadowPseudoId(AtomicString("-internal-media-controls-text-track-list-kind-subtitles"));
+ }
+ trackItem->appendChild(trackKindMarker);
+ }
+ return trackItem;
+}
+
+void MediaControlTextTrackListElement::refreshTextTrackListMenu()
+{
+ if (!mediaElement().hasClosedCaptions() || !mediaElement().textTracksAreReady())
+ return;
+
+ EventDispatchForbiddenScope::AllowUserAgentEvents allowEvents;
+ removeChildren(OmitSubtreeModifiedEvent);
+
+ // Construct a menu for subtitles and captions
+ // Pass in a nullptr to createTextTrackListItem to create the "Off" track item.
+ appendChild(createTextTrackListItem(nullptr));
+
+ TextTrackList* trackList = mediaElement().textTracks();
+ for (unsigned i = 0; i < trackList->length(); i++) {
+ TextTrack* track = trackList->anonymousIndexedGetter(i);
+ if (!track->canBeRendered())
+ continue;
+ appendChild(createTextTrackListItem(track));
+ }
+}
+
+// ----------------------------
+
MediaControlTimelineElement::MediaControlTimelineElement(MediaControls& mediaControls)
: MediaControlInputElement(mediaControls, MediaSlider)
{

Powered by Google App Engine
This is Rietveld 408576698