diff --git a/complete.html b/complete.html index 55d1ef71dbd..13f3a0c6447 100644 --- a/complete.html +++ b/complete.html @@ -33879,28 +33879,41 @@
4.8.10.12.1 Text track model

A text track cue has a text track cue - computed line position whose value is defined in terms of - the other aspects of the cue. If the text track cue line - position is numeric, then that is the text track cue - computed line position. Otherwise, the text track cue - line position is the special value auto; if the text track - cue snap-to-lines flag of the text track cue - is not set, the text track cue computed line position - is the value 100; otherwise, it is the value returned by the - following algorithm:

- -
  1. Let cue be the text track + computed line position whose value is that returned by the + following algorithm, which is defined in terms of the other + aspects of the cue:

    + +
    1. If the text track cue line position is + numeric, the text track cue snap-to-lines flag of + the text track cue is not set, and the text + track cue line position is negative or greater than 100, + then return 100 and abort these steps.

    2. + +
    3. If the text track cue line position is numeric, + return the value of the text track cue line position + and abort these steps. (Either the text track cue + snap-to-lines flag is set, so any value, not just those in + the range 0..100, is valid, or the value is in the range 0..100 + and is thus valid regardless of the value of that flag.)

    4. + +
    5. If the text track cue snap-to-lines flag of + the text track cue is not set, return the value 100 + and abort these steps. (The text track cue line + position is the special value auto.)

    6. + +
    7. Let cue be the text track cue.

    8. -
    9. If cue is not associated with a - text track, or if that text track is - not in the list of text tracks of a media - element, return −1 and abort these steps.

    10. +
    11. If cue is not in a list of cues of a text + track, or if that text track is not in the + list of text tracks of a media element, + return −1 and abort these steps.

    12. Let track be the text - track that the cue is associated - with.

    13. + track whose list of + cues the cue is in.
    14. Let n be the number of text tracks whose text track mode is showing @@ -33950,10 +33963,7 @@

      4.8.10.12.1 Text track model

      Each text track cue has a corresponding - TextTrackCue object, and can be associated with a - particular text track. Once a text track - cue is associated with a particular text track, - the association is permanent. A text track cue's + TextTrackCue object. A text track cue's in-memory representation can be dynamically changed through this TextTrackCue API.

      @@ -34723,13 +34733,11 @@
      4.8.10.12.5 Text track API
      textTrack . addCue( cue )

      Adds the given cue to textTrack's text track list of cues.

      -

      Throws an exception if the argument is associated with another text track or already in the list of cues.

      textTrack . removeCue( cue )

      Removes the given cue from textTrack's text track list of cues.

      -

      Throws an exception if the argument is associated with another text track or not in the list of cues.

      @@ -34912,20 +34920,9 @@
      4.8.10.12.5 Text track API

      The addCue(cue) method of TextTrack objects, when invoked, must run the following steps:

      -
      1. If the given cue is already associated - with a text track other than the method's - TextTrack object's text track, then throw - an InvalidStateError exception and abort these - steps.

      2. - -
      3. If the given cue is already listed in - the method's TextTrack object's text - track's text track list of cues, then throw an - InvalidStateError exception.

      4. - -
      5. Associate cue with the method's - TextTrack object's text track, if it is - not currently associated with a text track.

      6. +
        1. If the given cue is in a text + track list of cues, then remove cue from + that text track list of cues.

        2. Add cue to the method's TextTrack object's text track's @@ -34935,12 +34932,7 @@

          4.8.10.12.5 Text track API
          TextTrack objects, when invoked, must run the following steps:

          -
          1. If the given cue is not associated with - the method's TextTrack object's text - track, then throw an InvalidStateError - exception.

          2. - -
          3. If the given cue is not currently listed +

            1. If the given cue is not currently listed in the method's TextTrack object's text track's text track list of cues, then throw a NotFoundError exception.

            2. @@ -35166,8 +35158,7 @@
              4.8.10.12.5 Text track API

              The TextTrackCue(startTime, endTime, text) constructor, when invoked, must run the following steps:

              -
              1. Create a new text track cue that is not - associated with any text track. Let cue be that text track cue.

              2. +
                1. Create a new text track cue. Let cue be that text track cue.

                2. Let cue's text track cue start time be the value of the startTime @@ -35218,9 +35209,10 @@

                  4.8.10.12.5 Text track API

                The track attribute, on getting, must return the TextTrack object - of the text track with which the text track - cue that the TextTrackCue object represents is - associated, if any; or null otherwise.

                + of the text track in whose list of cues the text track cue that + the TextTrackCue object represents finds itself, if + any; or null otherwise.

                The id attribute, on getting, must return the text track cue @@ -35280,11 +35272,8 @@

                4.8.10.12.5 Text track API

                The line attribute, on getting, must return the text track cue computed line position of the text track cue that the - TextTrackCue object represents. 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. Otherwise, set the text - track cue line position to the new value.

                + TextTrackCue object represents. On setting, set the + text track cue line position to the new value.

                There is no way to explicitly set the text track cue line position to the special default auto diff --git a/index b/index index 55d1ef71dbd..13f3a0c6447 100644 --- a/index +++ b/index @@ -33879,28 +33879,41 @@ interface MediaController { the other active tracks.

                A text track cue has a text track cue - computed line position whose value is defined in terms of - the other aspects of the cue. If the text track cue line - position is numeric, then that is the text track cue - computed line position. Otherwise, the text track cue - line position is the special value auto; if the text track - cue snap-to-lines flag of the text track cue - is not set, the text track cue computed line position - is the value 100; otherwise, it is the value returned by the - following algorithm:

                - -
                1. Let cue be the text track + computed line position whose value is that returned by the + following algorithm, which is defined in terms of the other + aspects of the cue:

                  + +
                  1. If the text track cue line position is + numeric, the text track cue snap-to-lines flag of + the text track cue is not set, and the text + track cue line position is negative or greater than 100, + then return 100 and abort these steps.

                  2. + +
                  3. If the text track cue line position is numeric, + return the value of the text track cue line position + and abort these steps. (Either the text track cue + snap-to-lines flag is set, so any value, not just those in + the range 0..100, is valid, or the value is in the range 0..100 + and is thus valid regardless of the value of that flag.)

                  4. + +
                  5. If the text track cue snap-to-lines flag of + the text track cue is not set, return the value 100 + and abort these steps. (The text track cue line + position is the special value auto.)

                  6. + +
                  7. Let cue be the text track cue.

                  8. -
                  9. If cue is not associated with a - text track, or if that text track is - not in the list of text tracks of a media - element, return −1 and abort these steps.

                  10. +
                  11. If cue is not in a list of cues of a text + track, or if that text track is not in the + list of text tracks of a media element, + return −1 and abort these steps.

                  12. Let track be the text - track that the cue is associated - with.

                  13. + track whose list of + cues the cue is in.
                  14. Let n be the number of text tracks whose text track mode is showing @@ -33950,10 +33963,7 @@ interface MediaController {

                    Each text track cue has a corresponding - TextTrackCue object, and can be associated with a - particular text track. Once a text track - cue is associated with a particular text track, - the association is permanent. A text track cue's + TextTrackCue object. A text track cue's in-memory representation can be dynamically changed through this TextTrackCue API.

                    @@ -34723,13 +34733,11 @@ interface TextTrack : EventTargettextTrack . addCue( cue )

                    Adds the given cue to textTrack's text track list of cues.

                    -

                    Throws an exception if the argument is associated with another text track or already in the list of cues.

                    textTrack . removeCue( cue )

                    Removes the given cue from textTrack's text track list of cues.

                    -

                    Throws an exception if the argument is associated with another text track or not in the list of cues.

                    @@ -34912,20 +34920,9 @@ interface TextTrack : EventTarget

                    The addCue(cue) method of TextTrack objects, when invoked, must run the following steps:

                    -
                    1. If the given cue is already associated - with a text track other than the method's - TextTrack object's text track, then throw - an InvalidStateError exception and abort these - steps.

                    2. - -
                    3. If the given cue is already listed in - the method's TextTrack object's text - track's text track list of cues, then throw an - InvalidStateError exception.

                    4. - -
                    5. Associate cue with the method's - TextTrack object's text track, if it is - not currently associated with a text track.

                    6. +
                      1. If the given cue is in a text + track list of cues, then remove cue from + that text track list of cues.

                      2. Add cue to the method's TextTrack object's text track's @@ -34935,12 +34932,7 @@ interface TextTrack : EventTargetTextTrack objects, when invoked, must run the following steps:

                        -
                        1. If the given cue is not associated with - the method's TextTrack object's text - track, then throw an InvalidStateError - exception.

                        2. - -
                        3. If the given cue is not currently listed +

                          1. If the given cue is not currently listed in the method's TextTrack object's text track's text track list of cues, then throw a NotFoundError exception.

                          2. @@ -35166,8 +35158,7 @@ interface TextTrackCue : EventTa

                            The TextTrackCue(startTime, endTime, text) constructor, when invoked, must run the following steps:

                            -
                            1. Create a new text track cue that is not - associated with any text track. Let cue be that text track cue.

                            2. +
                              1. Create a new text track cue. Let cue be that text track cue.

                              2. Let cue's text track cue start time be the value of the startTime @@ -35218,9 +35209,10 @@ interface TextTrackCue : EventTa

                              The track attribute, on getting, must return the TextTrack object - of the text track with which the text track - cue that the TextTrackCue object represents is - associated, if any; or null otherwise.

                              + of the text track in whose list of cues the text track cue that + the TextTrackCue object represents finds itself, if + any; or null otherwise.

                              The id attribute, on getting, must return the text track cue @@ -35280,11 +35272,8 @@ interface TextTrackCue : EventTa

                              The line attribute, on getting, must return the text track cue computed line position of the text track cue that the - TextTrackCue object represents. 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. Otherwise, set the text - track cue line position to the new value.

                              + TextTrackCue object represents. On setting, set the + text track cue line position to the new value.

                              There is no way to explicitly set the text track cue line position to the special default auto diff --git a/source b/source index 4b9eb602816..bc5a575aaf4 100644 --- a/source +++ b/source @@ -37094,30 +37094,43 @@ interface MediaController { the other active tracks.

                              A text track cue has a text track cue - computed line position whose value is defined in terms of - the other aspects of the cue. If the text track cue line - position is numeric, then that is the text track cue - computed line position. Otherwise, the text track cue - line position is the special value auto; if the text track - cue snap-to-lines flag of the text track cue - is not set, the text track cue computed line position - is the value 100; otherwise, it is the value returned by the - following algorithm:

                              + computed line position whose value is that returned by the + following algorithm, which is defined in terms of the other + aspects of the cue:

                                +
                              1. If the text track cue line position is + numeric, the text track cue snap-to-lines flag of + the text track cue is not set, and the text + track cue line position is negative or greater than 100, + then return 100 and abort these steps.

                              2. + +
                              3. If the text track cue line position is numeric, + return the value of the text track cue line position + and abort these steps. (Either the text track cue + snap-to-lines flag is set, so any value, not just those in + the range 0..100, is valid, or the value is in the range 0..100 + and is thus valid regardless of the value of that flag.)

                              4. + +
                              5. If the text track cue snap-to-lines flag of + the text track cue is not set, return the value 100 + and abort these steps. (The text track cue line + position is the special value auto.)

                              6. +
                              7. Let cue be the text track cue.

                              8. -
                              9. If cue is not associated with a - text track, or if that text track is - not in the list of text tracks of a media - element, return −1 and abort these steps.

                              10. +
                              11. If cue is not in a list of cues of a text + track, or if that text track is not in the + list of text tracks of a media element, + return −1 and abort these steps.

                              12. Let track be the text - track that the cue is associated - with.

                              13. + track whose list of + cues the cue is in.

                              14. Let n be the number of text tracks whose text track @@ -37174,10 +37187,7 @@ interface MediaController {

                                Each text track cue has a corresponding - TextTrackCue object, and can be associated with a - particular text track. Once a text track - cue is associated with a particular text track, - the association is permanent. A text track cue's + TextTrackCue object. A text track cue's in-memory representation can be dynamically changed through this TextTrackCue API.

                                @@ -38063,13 +38073,11 @@ interface TextTrack : EventTarget {
                                textTrack . addCue( cue )

                                Adds the given cue to textTrack's text track list of cues.

                                -

                                Throws an exception if the argument is associated with another text track or already in the list of cues.

                                textTrack . removeCue( cue )

                                Removes the given cue from textTrack's text track list of cues.

                                -

                                Throws an exception if the argument is associated with another text track or not in the list of cues.

                                @@ -38288,20 +38296,9 @@ interface TextTrack : EventTarget {
                                  -
                                1. If the given cue is already associated - with a text track other than the method's - TextTrack object's text track, then throw - an InvalidStateError exception and abort these - steps.

                                2. - -
                                3. If the given cue is already listed in - the method's TextTrack object's text - track's text track list of cues, then throw an - InvalidStateError exception.

                                4. - -
                                5. Associate cue with the method's - TextTrack object's text track, if it is - not currently associated with a text track.

                                6. +
                                7. If the given cue is in a text + track list of cues, then remove cue from + that text track list of cues.

                                8. Add cue to the method's TextTrack object's text track's @@ -38317,11 +38314,6 @@ interface TextTrack : EventTarget {

                                    -
                                  1. If the given cue is not associated with - the method's TextTrack object's text - track, then throw an InvalidStateError - exception.

                                  2. -
                                  3. If the given cue is not currently listed in the method's TextTrack object's text track's text track list of cues, then throw a @@ -38573,8 +38565,7 @@ interface TextTrackCue : EventTarget {

                                      -
                                    1. Create a new text track cue that is not - associated with any text track. Let

                                      Create a new text track cue. Let cue be that text track cue.

                                    2. Let cue's text track cue start @@ -38628,9 +38619,10 @@ interface TextTrackCue : EventTarget {

                                      The track attribute, on getting, must return the TextTrack object - of the text track with which the text track - cue that the TextTrackCue object represents is - associated, if any; or null otherwise.

                                      + of the text track in whose list of cues the text track cue that + the TextTrackCue object represents finds itself, if + any; or null otherwise.

                                      The id attribute, on getting, must return the text track cue @@ -38697,15 +38689,11 @@ interface TextTrackCue : EventTarget { flag must be set if the new value is true, and must be unset otherwise.

                                      -

                                      The line +

                                      The line attribute, on getting, must return the text track cue computed line position of the text track cue that the - TextTrackCue object represents. 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. Otherwise, set the text - track cue line position to the new value.

                                      + TextTrackCue object represents. On setting, set the + text track cue line position to the new value.

                                      There is no way to explicitly set the text track cue line position to the special default -->.)

                                    3. Cue creation: Let cue be a new - text track cue associated with output's text track.

                                    4. + text track cue.

                                    5. Let cue's text track cue identifier be the empty string.