Changeset 106361 in webkit


Ignore:
Timestamp:
Jan 31, 2012 8:44:15 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

The spec renamed addTrack() to addTextTrack().
​https://bugs.webkit.org/show_bug.cgi?id=77381

Patch by Arko Saha <​arko@motorola.com> on 2012-01-31
Reviewed by Eric Carlson.

Renamed addTrack() to addTextTrack().
Spec: ​http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-elements

Source/WebCore:

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::addTextTrack):

  • html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::addTextTrack):

  • html/HTMLMediaElement.idl:

LayoutTests:

  • media/track/track-add-track-expected.txt:
  • media/track/track-add-track.html:
  • media/track/track-addtrack-kind-expected.txt:
  • media/track/track-addtrack-kind.html:
  • media/track/track-text-track-destructor-crash.html:
  • media/track/track-texttracks-expected.txt:
  • media/track/track-texttracks.html:
  • platform/gtk/fast/dom/Window/window-properties-expected.txt:
  • platform/mac/fast/dom/Window/window-properties-expected.txt:
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r106349 r106361  
     12012-01-31  Arko Saha  <arko@motorola.com>
     2
     3        The spec renamed addTrack() to addTextTrack().
     4        https://bugs.webkit.org/show_bug.cgi?id=77381
     5
     6        Reviewed by Eric Carlson.
     7
     8        Renamed addTrack() to addTextTrack().
     9        Spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-elements
     10
     11        * media/track/track-add-track-expected.txt:
     12        * media/track/track-add-track.html:
     13        * media/track/track-addtrack-kind-expected.txt:
     14        * media/track/track-addtrack-kind.html:
     15        * media/track/track-text-track-destructor-crash.html:
     16        * media/track/track-texttracks-expected.txt:
     17        * media/track/track-texttracks.html:
     18        * platform/gtk/fast/dom/Window/window-properties-expected.txt:
     19        * platform/mac/fast/dom/Window/window-properties-expected.txt:
     20
    1212012-01-31  Yuzo Fujishima  <yuzo@google.com>
    222

  • trunk/LayoutTests/media/track/track-add-track-expected.txt

    r101999 r106361  
    1212EXPECTED (event.track == '[object TextTrack]') OK
    1313
    14 ** Test a TextTrack created with video.addTrack().
    15 RUN(tracks.push(video.addTrack('captions', 'Caption Track', 'en')))
     14** Test a TextTrack created with video.addTextTrack().
     15RUN(tracks.push(video.addTextTrack('captions', 'Caption Track', 'en')))
    1616EXPECTED (video.textTracks.length == '2') OK
    1717EVENT(addtrack)

  • trunk/LayoutTests/media/track/track-add-track.html

    r101999 r106361  
    1919
    2020                if (video.textTracks.length == 1) {
    21                     consoleWrite("<br>** Test a TextTrack created with video.addTrack().");
    22                     run("tracks.push(video.addTrack('captions', 'Caption Track', 'en'))");
     21                    consoleWrite("<br>** Test a TextTrack created with video.addTextTrack().");
     22                    run("tracks.push(video.addTextTrack('captions', 'Caption Track', 'en'))");
    2323                    testExpected("video.textTracks.length", 2);
    2424                } else {

  • trunk/LayoutTests/media/track/track-addtrack-kind-expected.txt

    r100453 r106361  
    1 Tests that the addTrack() only accepts known 'kind' values.
     1Tests that the addTextTrack() only accepts known 'kind' values.
    22
    33++ Test invalid 'kind'.
    44EXPECTED (video.textTracks.length == '0') OK
    5 TEST(video.addTrack('kaptions')) THROWS(DOMException.SYNTAX_ERR) OK
     5TEST(video.addTextTrack('kaptions')) THROWS(DOMException.SYNTAX_ERR) OK
    66EXPECTED (video.textTracks.length == '0') OK
    77
    88++ Test all valid 'kind' keywords.
    9 RUN(video.addTrack('subtitles'))
     9RUN(video.addTextTrack('subtitles'))
    1010EXPECTED (video.textTracks.length == '1') OK
    11 RUN(video.addTrack('captions'))
     11RUN(video.addTextTrack('captions'))
    1212EXPECTED (video.textTracks.length == '2') OK
    13 RUN(video.addTrack('descriptions'))
     13RUN(video.addTextTrack('descriptions'))
    1414EXPECTED (video.textTracks.length == '3') OK
    15 RUN(video.addTrack('chapters'))
     15RUN(video.addTextTrack('chapters'))
    1616EXPECTED (video.textTracks.length == '4') OK
    17 RUN(video.addTrack('metadata'))
     17RUN(video.addTextTrack('metadata'))
    1818EXPECTED (video.textTracks.length == '5') OK
    1919

  • trunk/LayoutTests/media/track/track-addtrack-kind.html

    r100453 r106361  
    1212            function addTrack(type)
    1313            {
    14                 run("video.addTrack('" + type + "')");
     14                run("video.addTextTrack('" + type + "')");
    1515                testExpected("video.textTracks.length", ++trackCount);
    1616            }
    … …  
    2222                consoleWrite("<em>++ Test invalid 'kind'.</em>");
    2323                testExpected("video.textTracks.length", 0);
    24                 testException("video.addTrack('kaptions')", "DOMException.SYNTAX_ERR");
     24                testException("video.addTextTrack('kaptions')", "DOMException.SYNTAX_ERR");
    2525                testExpected("video.textTracks.length", 0);
    2626                consoleWrite("");
    … …  
    4040    </head>
    4141    <body onload="start()">
    42         <p>Tests that the addTrack() only accepts known 'kind' values.</p>
     42        <p>Tests that the addTextTrack() only accepts known 'kind' values.</p>
    4343        <video>
    4444        </video>

  • trunk/LayoutTests/media/track/track-text-track-destructor-crash.html

    r98807 r106361  
    1515                var video = document.createElement('video');
    1616                for (var i = 0; i < 1000; i++)
    17                     tracks[i] = video.addTrack('captions', 'Captions Track', 'en');
     17                    tracks[i] = video.addTextTrack('captions', 'Captions Track', 'en');
    1818                testExpected("tracks.length", 1000);
    1919                consoleWrite("");

  • trunk/LayoutTests/media/track/track-texttracks-expected.txt

    r100616 r106361  
    11Tests that TextTracks in a TextTrackList are kept in the correct order.
    22
    3 ** Add a track with video.addTrack().
    4 RUN(video.addTrack('descriptions', 'Descriptions Track', 'en'))
     3** Add a track with video.addTextTrack().
     4RUN(video.addTextTrack('descriptions', 'Descriptions Track', 'en'))
    55
    66** Add a <track> element with DOM API.
    … …  
    1515EXPECTED (video.textTracks[2].kind == 'descriptions') OK
    1616
    17 ** Add another <track> element, is should insert before the addTrack() track.
     17** Add another <track> element, is should insert before the addTextTrack() track.
    1818RUN(trackElement = document.createElement('track'))
    1919RUN(trackElement.setAttribute('kind', 'metadata'))

  • trunk/LayoutTests/media/track/track-texttracks.html

    r100616 r106361  
    1414                findMediaElement();
    1515
    16                 consoleWrite("** Add a track with video.addTrack().");
    17                 run("video.addTrack('descriptions', 'Descriptions Track', 'en')");
     16                consoleWrite("** Add a track with video.addTextTrack().");
     17                run("video.addTextTrack('descriptions', 'Descriptions Track', 'en')");
    1818
    1919                consoleWrite("<br>** Add a &lt;track&gt; element with DOM API.");
    … …  
    2828                testExpected("video.textTracks[2].kind", "descriptions");
    2929
    30                 consoleWrite("<br>** Add another &lt;track&gt; element, is should insert before the addTrack() track.");
     30                consoleWrite("<br>** Add another &lt;track&gt; element, is should insert before the addTextTrack() track.");
    3131                run("trackElement = document.createElement('track')");
    3232                run("trackElement.setAttribute('kind', 'metadata')");

  • trunk/LayoutTests/platform/gtk/fast/dom/Window/window-properties-expected.txt

    r105514 r106361  
    7373window.Audio.prototype.TEXT_NODE [number]
    7474window.Audio.prototype.addEventListener [function]
    75 window.Audio.prototype.addTrack [function]
     75window.Audio.prototype.addTextTrack [function]
    7676window.Audio.prototype.appendChild [function]
    7777window.Audio.prototype.blur [function]

  • trunk/LayoutTests/platform/mac/fast/dom/Window/window-properties-expected.txt

    r105672 r106361  
    7373window.Audio.prototype.TEXT_NODE [number]
    7474window.Audio.prototype.addEventListener [function]
    75 window.Audio.prototype.addTrack [function]
     75window.Audio.prototype.addTextTrack [function]
    7676window.Audio.prototype.appendChild [function]
    7777window.Audio.prototype.blur [function]

  • trunk/Source/WebCore/ChangeLog

    r106360 r106361  
     12012-01-31  Arko Saha  <arko@motorola.com>
     2
     3        The spec renamed addTrack() to addTextTrack().
     4        https://bugs.webkit.org/show_bug.cgi?id=77381
     5
     6        Reviewed by Eric Carlson.
     7
     8        Renamed addTrack() to addTextTrack().
     9        Spec: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-elements
     10
     11        * html/HTMLMediaElement.cpp:
     12        (WebCore::HTMLMediaElement::addTextTrack):
     13        * html/HTMLMediaElement.h:
     14        (WebCore::HTMLMediaElement::addTextTrack):
     15        * html/HTMLMediaElement.idl:
     16
    1172012-01-31  Peter Rybin  <peter.rybin@gmail.com>
    218

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r106156 r106361  
    21992199
    22002200#if ENABLE(VIDEO_TRACK)
    2201 PassRefPtr<TextTrack> HTMLMediaElement::addTrack(const String& kind, const String& label, const String& language, ExceptionCode& ec)
     2201PassRefPtr<TextTrack> HTMLMediaElement::addTextTrack(const String& kind, const String& label, const String& language, ExceptionCode& ec)
    22022202{
    22032203    if (!RuntimeEnabledFeatures::webkitVideoTrackEnabled())

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r106156 r106361  
    198198
    199199#if ENABLE(VIDEO_TRACK)
    200     PassRefPtr<TextTrack> addTrack(const String& kind, const String& label, const String& language, ExceptionCode&);
    201     PassRefPtr<TextTrack> addTrack(const String& kind, const String& label, ExceptionCode& ec) { return addTrack(kind, label, emptyString(), ec); }
    202     PassRefPtr<TextTrack> addTrack(const String& kind, ExceptionCode& ec) { return addTrack(kind, emptyString(), emptyString(), ec); }
     200    PassRefPtr<TextTrack> addTextTrack(const String& kind, const String& label, const String& language, ExceptionCode&);
     201    PassRefPtr<TextTrack> addTextTrack(const String& kind, const String& label, ExceptionCode& ec) { return addTextTrack(kind, label, emptyString(), ec); }
     202    PassRefPtr<TextTrack> addTextTrack(const String& kind, ExceptionCode& ec) { return addTextTrack(kind, emptyString(), emptyString(), ec); }
    203203
    204204    TextTrackList* textTracks();

  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r100453 r106361  
    113113
    114114#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
    115     [EnabledAtRuntime=webkitVideoTrack] TextTrack addTrack(in DOMString kind, in [Optional] DOMString label, in [Optional] DOMString language)
     115    [EnabledAtRuntime=webkitVideoTrack] TextTrack addTextTrack(in DOMString kind, in [Optional] DOMString label, in [Optional] DOMString language)
    116116        raises (DOMException);
    117117    readonly attribute [EnabledAtRuntime=webkitVideoTrack] TextTrackList textTracks;
Note: See TracChangeset for help on using the changeset viewer.