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

Unified Diff: Source/core/html/track/AutomaticTrackSelection.h

Issue 1118613002: Hook up Android closed captions 'enabled' setting to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Addressed comments from fs Created 5 years, 6 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: Source/core/html/track/AutomaticTrackSelection.h
diff --git a/Source/core/html/track/AutomaticTrackSelection.h b/Source/core/html/track/AutomaticTrackSelection.h
index 5572d0f99988a9f08302ebce7f033a2b1a76e0fa..b9e0b48b23bf3d214bb0880b8b027f4f86195038 100644
--- a/Source/core/html/track/AutomaticTrackSelection.h
+++ b/Source/core/html/track/AutomaticTrackSelection.h
@@ -5,10 +5,12 @@
#ifndef AutomaticTrackSelection_h
#define AutomaticTrackSelection_h
+#include "core/html/track/TextTrackKindUserPreference.h"
#include "platform/heap/Handle.h"
namespace blink {
+class TextTrack;
class TextTrackList;
class TrackGroup;
@@ -18,10 +20,12 @@ public:
struct Configuration {
Configuration()
: disableCurrentlyEnabledTracks(false)
- , forceEnableSubtitleOrCaptionTrack(false) { }
+ , forceEnableSubtitleOrCaptionTrack(false)
+ , textTrackKindUserPreference(TextTrackKindUserPreference::Default) { }
bool disableCurrentlyEnabledTracks;
bool forceEnableSubtitleOrCaptionTrack;
+ TextTrackKindUserPreference textTrackKindUserPreference;
};
AutomaticTrackSelection(const Configuration&);
@@ -29,10 +33,13 @@ public:
void perform(TextTrackList&);
private:
- void performAutomaticTextTrackSelection(const TrackGroup&);
+ PassRefPtrWillBeRawPtr<TextTrack> performAutomaticTextTrackSelection(const TrackGroup&);
void enableDefaultMetadataTextTracks(const TrackGroup&);
+ PassRefPtrWillBeRawPtr<TextTrack> enableTrackBasedOnUserPreference(PassRefPtrWillBeRawPtr<TextTrack>,
+ PassRefPtrWillBeRawPtr<TextTrack>);
const Configuration m_configuration;
+ RefPtrWillBeRawPtr<TextTrack> m_fallbackCaptionOrSubtitleTrack;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698