| Index: Source/core/html/track/TextTrackCue.cpp
|
| diff --git a/Source/core/html/track/TextTrackCue.cpp b/Source/core/html/track/TextTrackCue.cpp
|
| index 09683e0b4eb9919f84e1b184966253c3d58e397e..b24658d1cb336585a152f4a11ff0e3dc6013496e 100644
|
| --- a/Source/core/html/track/TextTrackCue.cpp
|
| +++ b/Source/core/html/track/TextTrackCue.cpp
|
| @@ -273,11 +273,11 @@ void TextTrackCue::setId(const String& id)
|
| cueDidChange();
|
| }
|
|
|
| -void TextTrackCue::setStartTime(double value, ExceptionState& es)
|
| +void TextTrackCue::setStartTime(double value, ExceptionState& exceptionState)
|
| {
|
| // NaN, Infinity and -Infinity values should trigger a TypeError.
|
| if (std::isinf(value) || std::isnan(value)) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return;
|
| }
|
|
|
| @@ -290,11 +290,11 @@ void TextTrackCue::setStartTime(double value, ExceptionState& es)
|
| cueDidChange();
|
| }
|
|
|
| -void TextTrackCue::setEndTime(double value, ExceptionState& es)
|
| +void TextTrackCue::setEndTime(double value, ExceptionState& exceptionState)
|
| {
|
| // NaN, Infinity and -Infinity values should trigger a TypeError.
|
| if (std::isinf(value) || std::isnan(value)) {
|
| - es.throwUninformativeAndGenericTypeError();
|
| + exceptionState.throwUninformativeAndGenericTypeError();
|
| return;
|
| }
|
|
|
| @@ -332,7 +332,7 @@ const String& TextTrackCue::vertical() const
|
| }
|
| }
|
|
|
| -void TextTrackCue::setVertical(const String& value, ExceptionState& es)
|
| +void TextTrackCue::setVertical(const String& value, ExceptionState& exceptionState)
|
| {
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrackcue-vertical
|
| // On setting, the text track cue writing direction must be set to the value given
|
| @@ -348,7 +348,7 @@ void TextTrackCue::setVertical(const String& value, ExceptionState& es)
|
| else if (value == verticalGrowingRightKeyword())
|
| direction = VerticalGrowingRight;
|
| else
|
| - es.throwUninformativeAndGenericDOMException(SyntaxError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(SyntaxError);
|
|
|
| if (direction == m_writingDirection)
|
| return;
|
| @@ -368,13 +368,13 @@ void TextTrackCue::setSnapToLines(bool value)
|
| cueDidChange();
|
| }
|
|
|
| -void TextTrackCue::setLine(int position, ExceptionState& es)
|
| +void TextTrackCue::setLine(int position, ExceptionState& exceptionState)
|
| {
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrackcue-line
|
| // On setting, if the text track cue snap-to-lines flag is not set, and the new
|
| // value is negative or greater than 100, then throw an IndexSizeError exception.
|
| if (!m_snapToLines && (position < 0 || position > 100)) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -388,13 +388,13 @@ void TextTrackCue::setLine(int position, ExceptionState& es)
|
| cueDidChange();
|
| }
|
|
|
| -void TextTrackCue::setPosition(int position, ExceptionState& es)
|
| +void TextTrackCue::setPosition(int position, ExceptionState& exceptionState)
|
| {
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrackcue-position
|
| // On setting, if the new value is negative or greater than 100, then throw an IndexSizeError exception.
|
| // Otherwise, set the text track cue text position to the new value.
|
| if (position < 0 || position > 100) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -407,13 +407,13 @@ void TextTrackCue::setPosition(int position, ExceptionState& es)
|
| cueDidChange();
|
| }
|
|
|
| -void TextTrackCue::setSize(int size, ExceptionState& es)
|
| +void TextTrackCue::setSize(int size, ExceptionState& exceptionState)
|
| {
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrackcue-size
|
| // On setting, if the new value is negative or greater than 100, then throw an IndexSizeError
|
| // exception. Otherwise, set the text track cue size to the new value.
|
| if (size < 0 || size > 100) {
|
| - es.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(IndexSizeError);
|
| return;
|
| }
|
|
|
| @@ -445,7 +445,7 @@ const String& TextTrackCue::align() const
|
| }
|
| }
|
|
|
| -void TextTrackCue::setAlign(const String& value, ExceptionState& es)
|
| +void TextTrackCue::setAlign(const String& value, ExceptionState& exceptionState)
|
| {
|
| // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#dom-texttrackcue-align
|
| // On setting, the text track cue alignment must be set to the value given in the
|
| @@ -465,7 +465,7 @@ void TextTrackCue::setAlign(const String& value, ExceptionState& es)
|
| else if (value == rightKeyword())
|
| alignment = Right;
|
| else
|
| - es.throwUninformativeAndGenericDOMException(SyntaxError);
|
| + exceptionState.throwUninformativeAndGenericDOMException(SyntaxError);
|
|
|
| if (alignment == m_cueAlignment)
|
| return;
|
|
|