Changeset 85949 in webkit


Ignore:
Timestamp:
May 6, 2011 8:23:01 AM (13 years ago)
Author:
eric.carlson@apple.com
Message:

2011-05-06 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Darin Adler.

REGRESSION (r77954): HTTP Live Streams have incorrect controller UI
​https://bugs.webkit.org/show_bug.cgi?id=60304
<rdar://problem/9392609>

Don't assume that the only time the media controls UI may need to change is on a
network state change, readyState changes can be significant as well.

Tested manually because we don't have any live streams to test in DRT.

  • html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::setNetworkState): changedNetworkState -> updateStatusDisplay. (WebCore::HTMLMediaElement::setReadyState): Call updateStatusDisplay.
  • html/shadow/MediaControlRootElement.cpp: (WebCore::MediaControlRootElement::reset): changedNetworkState -> updateStatusDisplay. (WebCore::MediaControlRootElement::updateStatusDisplay): Ditto.
  • html/shadow/MediaControlRootElement.h:
  • html/shadow/MediaControlRootElementChromium.cpp: (WebCore::MediaControlRootElementChromium::reset): Ditto. (WebCore::MediaControlRootElementChromium::updateStatusDisplay): Ditto.
  • html/shadow/MediaControlRootElementChromium.h:
  • html/shadow/MediaControls.h:
Location:
trunk/Source/WebCore
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r85944 r85949  
     12011-05-06  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        REGRESSION (r77954): HTTP Live Streams have incorrect controller UI
     6        https://bugs.webkit.org/show_bug.cgi?id=60304
     7        <rdar://problem/9392609>
     8
     9        Don't assume that the only time the media controls UI may need to change is on a
     10        network state change, readyState changes can be significant as well.
     11
     12        Tested manually because we don't have any live streams to test in DRT.
     13
     14        * html/HTMLMediaElement.cpp:
     15        (WebCore::HTMLMediaElement::setNetworkState): changedNetworkState -> updateStatusDisplay.
     16        (WebCore::HTMLMediaElement::setReadyState): Call updateStatusDisplay.
     17
     18        * html/shadow/MediaControlRootElement.cpp:
     19        (WebCore::MediaControlRootElement::reset): changedNetworkState -> updateStatusDisplay.
     20        (WebCore::MediaControlRootElement::updateStatusDisplay): Ditto.
     21        * html/shadow/MediaControlRootElement.h:
     22
     23        * html/shadow/MediaControlRootElementChromium.cpp:
     24        (WebCore::MediaControlRootElementChromium::reset): Ditto.
     25        (WebCore::MediaControlRootElementChromium::updateStatusDisplay): Ditto.
     26        * html/shadow/MediaControlRootElementChromium.h:
     27        * html/shadow/MediaControls.h:
     28
    1292011-05-06  Andreas Kling  <andreas.kling@nokia.com>
    230

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

    r85865 r85949  
    934934
    935935    if (hasMediaControls())
    936         mediaControls()->changedNetworkState();
     936        mediaControls()->updateStatusDisplay();
    937937}
    938938
    … …  
    10261026    }
    10271027
    1028     if (shouldUpdateDisplayState)
     1028    if (shouldUpdateDisplayState) {
    10291029        updateDisplayState();
     1030        if (hasMediaControls())
     1031            mediaControls()->updateStatusDisplay();
     1032    }
    10301033
    10311034    updatePlayState();

  • trunk/Source/WebCore/html/shadow/MediaControlRootElement.cpp

    r84336 r85949  
    275275        return;
    276276
    277     changedNetworkState();
     277    updateStatusDisplay();
    278278
    279279    if (m_mediaElement->supportsFullscreen())
    … …  
    375375}
    376376
    377 void MediaControlRootElement::changedNetworkState()
     377void MediaControlRootElement::updateStatusDisplay()
    378378{
    379379    if (m_statusDisplay)

  • trunk/Source/WebCore/html/shadow/MediaControlRootElement.h

    r84222 r85949  
    9090
    9191    void reportedError();
    92     void changedNetworkState();
    9392    void loadedMetadata();
    9493    void changedClosedCaptionsVisibility();
    … …  
    9695    void showVolumeSlider();
    9796    void updateTimeDisplay();
     97    void updateStatusDisplay();
    9898
    9999private:

  • trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

    r84429 r85949  
    183183        return;
    184184
    185     changedNetworkState();
     185    updateStatusDisplay();
    186186
    187187    float duration = m_mediaElement->duration();
    … …  
    246246}
    247247
    248 void MediaControlRootElementChromium::changedNetworkState()
     248void MediaControlRootElementChromium::updateStatusDisplay()
    249249{
    250250}

  • trunk/Source/WebCore/html/shadow/MediaControlRootElementChromium.h

    r84429 r85949  
    7878
    7979    void reportedError();
    80     void changedNetworkState();
    8180    void loadedMetadata();
    8281    void changedClosedCaptionsVisibility();
    … …  
    8483    void showVolumeSlider();
    8584    void updateTimeDisplay();
     85    void updateStatusDisplay();
    8686
    8787private:

  • trunk/Source/WebCore/html/shadow/MediaControls.h

    r84222 r85949  
    6262
    6363    virtual void reportedError() = 0;
    64     virtual void changedNetworkState() = 0;
    6564    virtual void loadedMetadata() = 0;
    6665    virtual void changedClosedCaptionsVisibility() = 0;
    … …  
    6867    virtual void showVolumeSlider() = 0;
    6968    virtual void updateTimeDisplay() = 0;
     69    virtual void updateStatusDisplay() = 0;
    7070
    7171protected:
Note: See TracChangeset for help on using the changeset viewer.