Changeset 146801 in webkit


Ignore:
Timestamp:
Mar 25, 2013 1:10:12 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

REGRESSION(r146380): media/track/track-user-preferences.html
​https://bugs.webkit.org/show_bug.cgi?id=113083

Reviewed by Jer Noble.

Source/WebCore:

Ignore track change notifications triggered by automatic track selection so the
configuration is not changed.

No new tests, this fixes an existing test.

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::configureTextTrackGroup): Clear m_processingPreferenceChange after all

track configuration is finished.

(WebCore::HTMLMediaElement::configureTextTrackDisplay): Do nothing if m_processingPreferenceChange

is true.

LayoutTests:

  • platform/mac/TestExpectations: Remove test from expectations.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r146794 r146801  
     12013-03-25  Eric Carlson  <eric.carlson@apple.com>
     2
     3        REGRESSION(r146380): media/track/track-user-preferences.html
     4        https://bugs.webkit.org/show_bug.cgi?id=113083
     5
     6        Reviewed by Jer Noble.
     7
     8        * platform/mac/TestExpectations: Remove test from expectations.
     9
    1102013-03-25  Ryosuke Niwa  <rniwa@webkit.org>
    211

  • trunk/LayoutTests/platform/mac/TestExpectations

    r146788 r146801  
    14741474plugins/snapshotting [ Skip ]
    14751475
    1476 webkit.org/b/113083 media/track/track-user-preferences.html [ Failure ]
    1477 
    14781476webkit.org/b/113094 editing/pasteboard/can-read-in-copy-and-cut-events.html [ Failure ]
    14791477webkit.org/b/113094 editing/pasteboard/can-read-in-dragstart-event.html [ Failure ]

  • trunk/Source/WebCore/ChangeLog

    r146800 r146801  
     12013-03-25  Eric Carlson  <eric.carlson@apple.com>
     2
     3        REGRESSION(r146380): media/track/track-user-preferences.html
     4        https://bugs.webkit.org/show_bug.cgi?id=113083
     5
     6        Reviewed by Jer Noble.
     7
     8        Ignore track change notifications triggered by automatic track selection so the
     9        configuration is not changed.
     10
     11        No new tests, this fixes an existing test.
     12
     13        * html/HTMLMediaElement.cpp:
     14        (WebCore::HTMLMediaElement::configureTextTrackGroup): Clear m_processingPreferenceChange after all
     15            track configuration is finished.
     16        (WebCore::HTMLMediaElement::configureTextTrackDisplay): Do nothing if m_processingPreferenceChange
     17            is true.
     18
    1192013-03-25  Martin Robinson  <mrobinson@igalia.com>
    220

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

    r146647 r146801  
    31363136
    31373137    if (currentlyEnabledTracks.size()) {
    3138         m_processingPreferenceChange = false;
    31393138        for (size_t i = 0; i < currentlyEnabledTracks.size(); ++i) {
    31403139            RefPtr<TextTrack> textTrack = currentlyEnabledTracks[i];
    … …  
    31463145    if (trackToEnable)
    31473146        trackToEnable->setMode(TextTrack::showingKeyword());
     3147
     3148    m_processingPreferenceChange = false;
    31483149}
    31493150
    … …  
    44644465    ASSERT(m_textTracks);
    44654466
     4467    if (m_processingPreferenceChange)
     4468        return;
     4469
    44664470    bool haveVisibleTextTrack = false;
    44674471    for (unsigned i = 0; i < m_textTracks->length(); ++i) {
Note: See TracChangeset for help on using the changeset viewer.