Changeset 101088 in webkit


Ignore:
Timestamp:
Nov 23, 2011, 10:12:59 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r101057.
​http://trac.webkit.org/changeset/101057
​https://bugs.webkit.org/show_bug.cgi?id=73027

Broke Chromium Windows build (Requested by aklein on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-11-23

Source/WebCore:

  • html/HTMLTrackElement.cpp:

(WebCore::HTMLTrackElement::HTMLTrackElement):
(WebCore::HTMLTrackElement::didCompleteLoad):
(WebCore::HTMLTrackElement::textTrackReadyStateChanged):

  • html/HTMLTrackElement.h:
  • html/HTMLTrackElement.idl:
  • html/LoadableTextTrack.cpp:

(WebCore::LoadableTextTrack::loadTimerFired):
(WebCore::LoadableTextTrack::cueLoadingStarted):
(WebCore::LoadableTextTrack::cueLoadingCompleted):

  • html/TextTrack.cpp:

(WebCore::TextTrack::TextTrack):
(WebCore::TextTrack::setReadyState):

  • html/TextTrack.h:

(WebCore::TextTrack::readyState):

  • html/TextTrack.idl:

LayoutTests:

  • media/track/track-add-track-expected.txt:
  • media/track/track-add-track.html:
  • media/track/track-constants-expected.txt:
  • media/track/track-constants.html:
  • media/track/track-load-error-readyState-expected.txt:
  • media/track/track-load-error-readyState.html:
  • media/track/track-load-from-element-readyState-expected.txt:
  • media/track/track-load-from-element-readyState.html:
  • media/track/track-load-from-src-readyState-expected.txt:
  • media/track/track-load-from-src-readyState.html:
Location:
trunk
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r101084 r101088  
     12011-11-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r101057.
     4        http://trac.webkit.org/changeset/101057
     5        https://bugs.webkit.org/show_bug.cgi?id=73027
     6
     7        Broke Chromium Windows build (Requested by aklein on #webkit).
     8
     9        * media/track/track-add-track-expected.txt:
     10        * media/track/track-add-track.html:
     11        * media/track/track-constants-expected.txt:
     12        * media/track/track-constants.html:
     13        * media/track/track-load-error-readyState-expected.txt:
     14        * media/track/track-load-error-readyState.html:
     15        * media/track/track-load-from-element-readyState-expected.txt:
     16        * media/track/track-load-from-element-readyState.html:
     17        * media/track/track-load-from-src-readyState-expected.txt:
     18        * media/track/track-load-from-src-readyState.html:
     19
    1202011-11-23  Philippe Normand  <pnormand@igalia.com>
    221

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

    r101057 r101088  
    66RUN(trackElement.src = 'captions-webvtt/tc004-webvtt-file.vtt')
    77EXPECTED (video.textTracks.length == '1') OK
    8 EXPECTED (trackElement.readyState == '0') OK
     8EXPECTED (tracks[0].readyState == '0') OK
    99EVENT(addtrack)
    1010EXPECTED (event.target == '[object TextTrackList]') OK
    … …  
    1515RUN(tracks.push(video.addTrack('captions', 'Caption Track', 'en')))
    1616EXPECTED (video.textTracks.length == '2') OK
     17EXPECTED (tracks[1].readyState == '0') OK
    1718EVENT(addtrack)
    1819EXPECTED (event.target == '[object TextTrackList]') OK
    1920EXPECTED (event instanceof window.TrackEvent == 'true') OK
    2021EXPECTED (event.track == '[object TextTrack]') OK
     22EXPECTED (tracks[1].readyState == '0') OK
    2123
    2224END OF TEST

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

    r101057 r101088  
    2222                    run("tracks.push(video.addTrack('captions', 'Caption Track', 'en'))");
    2323                    testExpected("video.textTracks.length", 2);
     24                    testExpected("tracks[1].readyState", TextTrack.NONE);
    2425                } else {
     26                    testExpected("tracks[1].readyState", TextTrack.NONE);
    2527                    consoleWrite("");
    2628                    endTest();
    … …  
    4345                run("trackElement.src = 'captions-webvtt/tc004-webvtt-file.vtt'");
    4446                testExpected("video.textTracks.length", 1);
    45                 testExpected("trackElement.readyState", HTMLTrackElement.NONE);
     47                testExpected("tracks[0].readyState", TextTrack.NONE);
    4648            }
    4749

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

    r101057 r101088  
    11Test TextTrack constants.
    22
    3 EXPECTED (HTMLTrackElement.NONE == '0') OK
    4 EXPECTED (HTMLTrackElement.LOADING == '1') OK
    5 EXPECTED (HTMLTrackElement.LOADED == '2') OK
    6 EXPECTED (HTMLTrackElement.ERROR == '3') OK
     3EXPECTED (TextTrack.NONE == '0') OK
     4EXPECTED (TextTrack.LOADING == '1') OK
     5EXPECTED (TextTrack.LOADED == '2') OK
     6EXPECTED (TextTrack.ERROR == '3') OK
    77
    88EXPECTED (TextTrack.DISABLED == '0') OK

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

    r101057 r101088  
    66        function doTest ()
    77        {
    8             testExpected("HTMLTrackElement.NONE", 0);
    9             testExpected("HTMLTrackElement.LOADING", 1);
    10             testExpected("HTMLTrackElement.LOADED", 2);
    11             testExpected("HTMLTrackElement.ERROR", 3);
     8            testExpected("TextTrack.NONE", 0);
     9            testExpected("TextTrack.LOADING", 1);
     10            testExpected("TextTrack.LOADED", 2);
     11            testExpected("TextTrack.ERROR", 3);
    1212            consoleWrite("");
    1313

  • trunk/LayoutTests/media/track/track-load-error-readyState-expected.txt

    r101057 r101088  
    22
    33EVENT(error)
    4 EXPECTED (track.readyState == '3') OK
     4EXPECTED (track.track.readyState == '3') OK
    55END OF TEST
    66

  • trunk/LayoutTests/media/track/track-load-error-readyState.html

    r101057 r101088  
    1212                consoleWrite("EVENT(error)");
    1313                track = document.getElementById('testTrackError');
    14                 testExpected("track.readyState", HTMLTrackElement.ERROR);
     14                testExpected("track.track.readyState", TextTrack.ERROR);
    1515                endTest();
    1616            }

  • trunk/LayoutTests/media/track/track-load-from-element-readyState-expected.txt

    r101057 r101088  
    22
    33EVENT(load)
    4 EXPECTED (track.readyState == '2') OK
     4EXPECTED (track.track.readyState == '2') OK
    55END OF TEST
    66

  • trunk/LayoutTests/media/track/track-load-from-element-readyState.html

    r101057 r101088  
    1212                consoleWrite("EVENT(load)");
    1313                track = document.getElementById('testTrackSrc');
    14                 testExpected("track.readyState", HTMLTrackElement.LOADED);
     14                testExpected("track.track.readyState", TextTrack.LOADED);
    1515                endTest();
    1616            }

  • trunk/LayoutTests/media/track/track-load-from-src-readyState-expected.txt

    r101057 r101088  
    11Tests the load event on HTMLTrackElement and LOADED readyState on TextTrack when src is set from JavaScript.
    22
    3 EXPECTED (track.readyState == '0') OK
     3EXPECTED (track.track.readyState == '0') OK
    44EVENT(load)
    5 EXPECTED (track.readyState == '2') OK
     5EXPECTED (track.track.readyState == '2') OK
    66END OF TEST
    77

  • trunk/LayoutTests/media/track/track-load-from-src-readyState.html

    r101057 r101088  
    1717            {
    1818                consoleWrite("EVENT(load)");
    19                 testExpected("track.readyState", HTMLTrackElement.LOADED);
     19                testExpected("track.track.readyState", TextTrack.LOADED);
    2020                endTest();
    2121            }
    2222
    2323            track = document.getElementById('testTrackEmpty');
    24             testExpected("track.readyState", HTMLTrackElement.NONE);
     24            testExpected("track.track.readyState", TextTrack.NONE);
    2525            track.addEventListener("load", function () { trackLoaded(); }, true);
    2626            track.src = "captions-webvtt/tc004-webvtt-file.vtt";   

  • trunk/Source/WebCore/ChangeLog

    r101085 r101088  
     12011-11-23  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r101057.
     4        http://trac.webkit.org/changeset/101057
     5        https://bugs.webkit.org/show_bug.cgi?id=73027
     6
     7        Broke Chromium Windows build (Requested by aklein on #webkit).
     8
     9        * html/HTMLTrackElement.cpp:
     10        (WebCore::HTMLTrackElement::HTMLTrackElement):
     11        (WebCore::HTMLTrackElement::didCompleteLoad):
     12        (WebCore::HTMLTrackElement::textTrackReadyStateChanged):
     13        * html/HTMLTrackElement.h:
     14        * html/HTMLTrackElement.idl:
     15        * html/LoadableTextTrack.cpp:
     16        (WebCore::LoadableTextTrack::loadTimerFired):
     17        (WebCore::LoadableTextTrack::cueLoadingStarted):
     18        (WebCore::LoadableTextTrack::cueLoadingCompleted):
     19        * html/TextTrack.cpp:
     20        (WebCore::TextTrack::TextTrack):
     21        (WebCore::TextTrack::setReadyState):
     22        * html/TextTrack.h:
     23        (WebCore::TextTrack::readyState):
     24        * html/TextTrack.idl:
     25
    1262011-11-23  Yury Semikhatsky  <yurys@chromium.org>
    227

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

    r101057 r101088  
    4444inline HTMLTrackElement::HTMLTrackElement(const QualifiedName& tagName, Document* document)
    4545    : HTMLElement(tagName, document)
    46     , m_readyState(HTMLTrackElement::NONE)
    4746{
    4847    LOG(Media, "HTMLTrackElement::HTMLTrackElement - %p", this);
    … …  
    208207void HTMLTrackElement::didCompleteLoad(LoadableTextTrack*, bool loadingFailed)
    209208{
    210     loadingFailed ? setReadyState(HTMLTrackElement::ERROR) : setReadyState(HTMLTrackElement::LOADED);
    211 
    212209    ExceptionCode ec = 0;
    213210    dispatchEvent(Event::create(loadingFailed ? eventNames().errorEvent : eventNames().loadEvent, false, false), ec);
    214211}
    215 
    216 void HTMLTrackElement::setReadyState(ReadyState state)
    217 {
    218     m_readyState = state;
    219     if (HTMLMediaElement* parent = mediaElement())
    220         return parent->textTrackReadyStateChanged(m_track.get());
     212   
     213void HTMLTrackElement::textTrackReadyStateChanged(TextTrack* track)
     214{
     215    if (HTMLMediaElement* parent = mediaElement())
     216        return parent->textTrackReadyStateChanged(track);
    221217}
    222218   

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

    r101057 r101088  
    5454    bool isDefault() const;
    5555    void setIsDefault(bool);
    56    
    57     enum ReadyState { NONE = 0, LOADING = 1, LOADED = 2, ERROR = 3 };
    58     ReadyState readyState() const { return m_readyState; }
    5956
    6057    TextTrack* track();
    … …  
    6360    virtual bool canLoadUrl(LoadableTextTrack*, const KURL&);
    6461    virtual void didCompleteLoad(LoadableTextTrack*, bool /* loadingFailed */);
    65    
    66     void setReadyState(ReadyState);
    6762
    6863private:
    … …  
    8580
    8681    // TextTrackClient
     82    virtual void textTrackReadyStateChanged(TextTrack*);
    8783    virtual void textTrackModeChanged(TextTrack*);
    8884    virtual void textTrackKindChanged(TextTrack*);
    … …  
    9490    LoadableTextTrack* ensureTrack();
    9591
    96     HTMLTrackElement::ReadyState m_readyState;
    9792    RefPtr<LoadableTextTrack> m_track;
    9893};

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

    r101057 r101088  
    2929        EnabledAtRuntime=webkitVideoTrack
    3030    ] HTMLTrackElement : HTMLElement {
    31         attribute [Reflect, URL] DOMString src;
    32         attribute DOMString kind;
    33         attribute DOMString srclang;
    34         attribute DOMString label;
    35         attribute [Reflect=default] boolean isDefault;
     31    attribute [Reflect, URL] DOMString src;
     32    attribute DOMString kind;
     33    attribute DOMString srclang;
     34    attribute DOMString label;
     35    attribute [Reflect=default] boolean isDefault;
    3636
    37         const unsigned short NONE = 0;
    38         const unsigned short LOADING = 1;
    39         const unsigned short LOADED = 2;
    40         const unsigned short ERROR = 3;
    41         readonly attribute unsigned short readyState;
    42 
    43         readonly attribute TextTrack track;
     37    readonly attribute TextTrack track;
    4438};
    4539}

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

    r101057 r101088  
    6565void LoadableTextTrack::loadTimerFired(Timer<LoadableTextTrack>*)
    6666{
    67     if (!m_trackElement)
    68         return;
    69 
    70     m_trackElement->setReadyState(HTMLTrackElement::LOADING);
     67    setReadyState(TextTrack::LOADING);
    7168   
    7269    if (m_loader)
    7370        m_loader->cancelLoad();
    7471
    75     if (!m_trackElement->canLoadUrl(this, m_url)) {
    76         m_trackElement->setReadyState(HTMLTrackElement::ERROR);
     72    if (!m_trackElement || !m_trackElement->canLoadUrl(this, m_url)) {
     73        setReadyState(TextTrack::HTML_ERROR);
    7774        return;
    7875    }
    … …  
    104101    ASSERT_UNUSED(loader, m_loader == loader);
    105102   
    106     if (!m_trackElement)
    107         return;
    108     m_trackElement->setReadyState(HTMLTrackElement::LOADING);
     103    setReadyState(TextTrack::LOADING);
    109104}
    110105
    … …  
    113108    ASSERT_UNUSED(loader, m_loader == loader);
    114109
    115     if (!m_trackElement)
    116         return;
    117     m_trackElement->didCompleteLoad(this, loadingFailed);
     110    loadingFailed ? setReadyState(TextTrack::HTML_ERROR) : setReadyState(TextTrack::LOADED);
     111
     112    if (m_trackElement)
     113        m_trackElement->didCompleteLoad(this, loadingFailed);
    118114}
    119115

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

    r101057 r101088  
    7676    , m_label(label)
    7777    , m_language(language)
     78    , m_readyState(TextTrack::NONE)
    7879    , m_mode(TextTrack::HIDDEN)
    7980    , m_client(client)
    … …  
    117118    if (m_client && oldKind != m_kind)
    118119        m_client->textTrackKindChanged(this);
     120}
     121
     122void TextTrack::setReadyState(ReadyState state)
     123{
     124    m_readyState = state;
     125    if (m_client)
     126        m_client->textTrackReadyStateChanged(this);
    119127}
    120128

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

    r101057 r101088  
    4444public:
    4545    virtual ~TextTrackClient() { }
     46    virtual void textTrackReadyStateChanged(TextTrack*) = 0;
    4647    virtual void textTrackKindChanged(TextTrack*) = 0;
    4748    virtual void textTrackModeChanged(TextTrack*) = 0;
    … …  
    7677    void setLanguage(const String& language) { m_language = language; }
    7778
     79    enum ReadyState { NONE = 0, LOADING = 1, LOADED = 2, HTML_ERROR = 3 };
     80    ReadyState readyState() const { return m_readyState; }
     81
    7882    enum Mode { DISABLED = 0, HIDDEN = 1, SHOWING = 2 };
    7983    Mode mode() const { return m_mode; }
    … …  
    104108    TextTrack(ScriptExecutionContext*, TextTrackClient*, const String& kind, const String& label, const String& language, TextTrackType);
    105109
     110    void setReadyState(ReadyState);
     111
    106112    RefPtr<TextTrackCueList> m_cues;
    107113
    … …  
    110116    String m_label;
    111117    String m_language;
     118    TextTrack::ReadyState m_readyState;
    112119    TextTrack::Mode m_mode;
    113120    TextTrackClient* m_client;

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

    r101057 r101088  
    3535        readonly attribute DOMString language;
    3636
     37        const unsigned short NONE = 0;
     38        const unsigned short LOADING = 1;
     39        const unsigned short LOADED = 2;
     40        // Reflect is used for TextTrack::ERROR because it conflicts with a windows define.
     41        const [Reflect=HTML_ERROR] unsigned short ERROR = 3;
     42        readonly attribute unsigned short readyState;
     43
    3744        const unsigned short DISABLED = 0;
    3845        const unsigned short HIDDEN = 1;
Note: See TracChangeset for help on using the changeset viewer.