-
eric.carlson@apple.com authored
https://bugs.webkit.org/show_bug.cgi?id=118477 Reviewed by Jer Noble. Source/WebCore: Test: media/video-controls-captions-trackmenu-includes-enabled-track.html * html/shadow/MediaControlElements.cpp: (WebCore::MediaControlClosedCaptionsTrackListElement::updateDisplay): Don't select the "Off" menu item if a track is enabled. * page/CaptionUserPreferencesMediaAF.cpp: (WebCore::CaptionUserPreferencesMediaAF::sortedTrackListForMenu): Always include a track that is showing in the menu. Add more diagnostic logging. LayoutTests: * media/trackmenu-test.js: Add some new utility functions. * media/video-controls-captions-trackmenu-includes-enabled-track-expected.txt: Added. * media/video-controls-captions-trackmenu-includes-enabled-track.html: Added. * platform/efl/TestExpectations: * platform/gtk/TestExpectations: * platform/qt/TestExpectations: * platform/win/TestExpectations: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152547 268f45cc-cd09-0410-ab3c-d52691b4dbfc
c17fca43