Changeset 140862 in webkit


Ignore:
Timestamp:
Jan 25, 2013 1:39:43 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

Adding a text track should not make controls visible
https://bugs.webkit.org/show_bug.cgi?id=107956

Source/WebCore:

Reviewed by Dean Jackson.

Test: media/media-captions-no-controls.html

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateActiveTextTrackCues): Call updateTextTrackDisplay.
(WebCore::HTMLMediaElement::updateTextTrackDisplay): New, call mediaControls->updateTextTrackDisplay()

if we have controls.

(WebCore::HTMLMediaElement::setClosedCaptionsVisible): Call updateTextTrackDisplay.
(WebCore::HTMLMediaElement::createMediaControls): Hide controls if they should not be

visible. Minor drive by cleanup.

(WebCore::HTMLMediaElement::configureTextTrackDisplay): Drive by cleanup, pull the three lines

from updateClosedCaptionsControls inline and delete it because this was the only caller.

  • html/HTMLMediaElement.h:

LayoutTests:

Reviewed by Dean Jackson.

  • media/media-captions-no-controls-expected.txt: Added.
  • media/media-captions-no-controls.html: Added.
Location:
trunk
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r140860 r140862  
     12013-01-25  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Adding a text track should not make controls visible
     4        https://bugs.webkit.org/show_bug.cgi?id=107956
     5
     6        Reviewed by  Dean Jackson.
     7
     8        * media/media-captions-no-controls-expected.txt: Added.
     9        * media/media-captions-no-controls.html: Added.
     10
    1112013-01-25  Erik Arvidsson  <arv@chromium.org>
    212
  • trunk/Source/WebCore/ChangeLog

    r140856 r140862  
     12013-01-25  Eric Carlson  <eric.carlson@apple.com>
     2
     3        Adding a text track should not make controls visible
     4        https://bugs.webkit.org/show_bug.cgi?id=107956
     5
     6        Reviewed by Dean Jackson.
     7
     8        Test: media/media-captions-no-controls.html
     9
     10        * html/HTMLMediaElement.cpp:
     11        (WebCore::HTMLMediaElement::updateActiveTextTrackCues): Call updateTextTrackDisplay.
     12        (WebCore::HTMLMediaElement::updateTextTrackDisplay): New, call mediaControls->updateTextTrackDisplay()
     13            if we have controls.
     14        (WebCore::HTMLMediaElement::setClosedCaptionsVisible):  Call updateTextTrackDisplay.
     15        (WebCore::HTMLMediaElement::createMediaControls): Hide controls if they should not be
     16            visible. Minor drive by cleanup.
     17        (WebCore::HTMLMediaElement::configureTextTrackDisplay): Drive by cleanup, pull the three lines
     18            from updateClosedCaptionsControls inline and delete it because this was the only caller.
     19        * html/HTMLMediaElement.h:
     20
    1212013-01-25  Elliott Sprehn  <esprehn@chromium.org>
    222
  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r140834 r140862  
    11791179        // the mode of a track has changed from 'hidden' to 'showing' and the
    11801180        // cues have not yet been rendered.
     1181        // Note: don't call updateTextTrackDisplay() unless we have controls because it will
     1182        // create them.
    11811183        if (hasMediaControls())
    1182             mediaControls()->updateTextTrackDisplay();
    1183 
     1184            updateTextTrackDisplay();
    11841185        return;
    11851186    }
     
    13191320    m_currentlyActiveCues = currentCues;
    13201321
    1321     if (activeSetChanged && hasMediaControls())
    1322         mediaControls()->updateTextTrackDisplay();
     1322    if (activeSetChanged)
     1323        updateTextTrackDisplay();
    13231324}
    13241325
     
    41504151}
    41514152
     4153#if ENABLE(VIDEO_TRACK)
     4154void HTMLMediaElement::updateTextTrackDisplay()
     4155{
     4156    if (!hasMediaControls() && !createMediaControls())
     4157        return;
     4158   
     4159    mediaControls()->updateTextTrackDisplay();
     4160}
     4161#endif
     4162
    41524163void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
    41534164{
     
    41654176
    41664177        markCaptionAndSubtitleTracksAsUnconfigured();
    4167         mediaControls()->updateTextTrackDisplay();
     4178
     4179        updateTextTrackDisplay();
    41684180    }
    41694181#else
     
    42864298        return true;
    42874299
    4288     ExceptionCode ec;
    4289     RefPtr<MediaControls> controls = MediaControls::create(document());
    4290     if (!controls)
     4300    RefPtr<MediaControls> mediaControls = MediaControls::create(document());
     4301    if (!mediaControls)
    42914302        return false;
    42924303
    4293     controls->setMediaController(m_mediaController ? m_mediaController.get() : static_cast<MediaControllerInterface*>(this));
    4294     controls->reset();
     4304    mediaControls->setMediaController(m_mediaController ? m_mediaController.get() : static_cast<MediaControllerInterface*>(this));
     4305    mediaControls->reset();
    42954306    if (isFullscreen())
    4296         controls->enteredFullscreen();
     4307        mediaControls->enteredFullscreen();
    42974308
    42984309    if (!shadow())
     
    43004311
    43014312    ASSERT(userAgentShadowRoot());
    4302     userAgentShadowRoot()->appendChild(controls, ec);
     4313    userAgentShadowRoot()->appendChild(mediaControls, ASSERT_NO_EXCEPTION);
     4314
     4315    if (!controls() || !inDocument())
     4316        mediaControls->hide();
     4317
    43034318    return true;
    43044319}
     
    43494364        return;
    43504365
    4351     updateClosedCaptionsControls();
    4352 }
    4353 
    4354 void HTMLMediaElement::updateClosedCaptionsControls()
    4355 {
    4356     if (hasMediaControls()) {
    4357         mediaControls()->changedClosedCaptionsVisibility();
    4358 
    4359         if (RuntimeEnabledFeatures::webkitVideoTrackEnabled())
    4360             mediaControls()->updateTextTrackDisplay();
    4361     }
     4366    mediaControls()->changedClosedCaptionsVisibility();
     4367   
     4368    if (RuntimeEnabledFeatures::webkitVideoTrackEnabled())
     4369        updateTextTrackDisplay();
    43624370}
    43634371
  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r140834 r140862  
    259259    bool textTracksAreReady() const;
    260260    void configureTextTrackDisplay();
    261     void updateClosedCaptionsControls();
     261    void updateTextTrackDisplay();
    262262
    263263    // TextTrackClient
Note: See TracChangeset for help on using the changeset viewer.