Bug 1276830 - part1 : introduce LineAlignSetting. r=rillian,smaug

MozReview-Commit-ID: 1nZhCpPpTEh

--HG--
extra : rebase_source : f0f55cbcf5df79753b05f16579591f2ce8aa195a
This commit is contained in:
Alastor Wu 2016-06-06 09:53:16 +08:00
Родитель 4f1d56df39
Коммит be17624070
3 изменённых файлов: 12 добавлений и 10 удалений

Просмотреть файл

@ -39,7 +39,7 @@ TextTrackCue::SetDefaultCueSettings()
mSnapToLines = true;
mLineIsAutoKeyword = true;
mAlign = AlignSetting::Middle;
mLineAlign = AlignSetting::Start;
mLineAlign = LineAlignSetting::Start;
mVertical = DirectionSetting::_empty;
mActive = false;
}

Просмотреть файл

@ -172,19 +172,15 @@ public:
}
}
AlignSetting LineAlign() const
LineAlignSetting LineAlign() const
{
return mLineAlign;
}
void SetLineAlign(AlignSetting& aLineAlign, ErrorResult& aRv)
void SetLineAlign(LineAlignSetting& aLineAlign, ErrorResult& aRv)
{
if (mLineAlign == aLineAlign)
if (mLineAlign == aLineAlign) {
return;
if (aLineAlign == AlignSetting::Left ||
aLineAlign == AlignSetting::Right) {
return aRv.Throw(NS_ERROR_DOM_SYNTAX_ERR);
}
mReset = true;
@ -364,7 +360,7 @@ private:
bool mLineIsAutoKeyword;
long mLineLong;
AlignSetting mAlign;
AlignSetting mLineAlign;
LineAlignSetting mLineAlign;
// 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

Просмотреть файл

@ -9,6 +9,12 @@
enum AutoKeyword { "auto" };
enum LineAlignSetting {
"start",
"center",
"end"
};
enum PositionAlignSetting {
"line-left",
"center",
@ -39,7 +45,7 @@ interface VTTCue : TextTrackCue {
attribute boolean snapToLines;
attribute (long or AutoKeyword) line;
[SetterThrows]
attribute AlignSetting lineAlign;
attribute LineAlignSetting lineAlign;
[SetterThrows]
attribute long position;
[SetterThrows]