diff --git a/content/media/TextTrackCue.cpp b/content/media/TextTrackCue.cpp index 41c0f3189ff..d80920b8483 100644 --- a/content/media/TextTrackCue.cpp +++ b/content/media/TextTrackCue.cpp @@ -40,7 +40,7 @@ TextTrackCue::SetDefaultCueSettings() mPauseOnExit = false; mSnapToLines = true; mLine = WEBVTT_AUTO; - mAlign = TextTrackCueAlign::Middle; + mAlign = AlignSetting::Middle; mVertical = DirectionSetting::_empty; } diff --git a/content/media/TextTrackCue.h b/content/media/TextTrackCue.h index 891e4e657be..70f34549131 100644 --- a/content/media/TextTrackCue.h +++ b/content/media/TextTrackCue.h @@ -216,12 +216,12 @@ public: CueChanged(); } - TextTrackCueAlign Align() const + AlignSetting Align() const { return mAlign; } - void SetAlign(TextTrackCueAlign& aAlign) + void SetAlign(AlignSetting& aAlign) { if (mAlign == aAlign) return; @@ -323,7 +323,7 @@ private: nsString mRegionId; DirectionSetting mVertical; int mLine; - TextTrackCueAlign mAlign; + AlignSetting mAlign; // Holds the computed DOM elements that represent the parsed cue text. // http://www.whatwg.org/specs/web-apps/current-work/#text-track-cue-display-state diff --git a/dom/webidl/VTTCue.webidl b/dom/webidl/VTTCue.webidl index 68d9c70316b..7bab05095fb 100644 --- a/dom/webidl/VTTCue.webidl +++ b/dom/webidl/VTTCue.webidl @@ -9,9 +9,7 @@ enum AutoKeyword { "auto" }; -/* Non-spec: Request to add this enum to spec - * can be found here: https://www.w3.org/Bugs/Public/show_bug.cgi?id=20996 */ -enum TextTrackCueAlign { +enum AlignSetting { "start", "middle", "end", @@ -43,7 +41,7 @@ interface VTTCue : EventTarget { attribute long position; [SetterThrows] attribute long size; - attribute TextTrackCueAlign align; + attribute AlignSetting align; attribute DOMString text; DocumentFragment getCueAsHTML();