-
eric.carlson@apple.com authored
https://bugs.webkit.org/show_bug.cgi?id=113417 Reviewed by Jer Noble. Source/WebCore: Test: media/track/track-in-band-legacy-api.html * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::HTMLMediaElement): Delete m_disableCaptions, it is no longer used. (WebCore::HTMLMediaElement::configureTextTrackGroup): Pass this to textTrackSelectionScore. (WebCore::HTMLMediaElement::setClosedCaptionsVisible): Delete m_disableCaptions, it is no longer used. * html/HTMLMediaElement.h: Ditto. * page/CaptionUserPreferences.cpp: (WebCore::CaptionUserPreferences::textTrackSelectionScore): Add an HTMLMediaElement parameter. * page/CaptionUserPreferences.h: * page/CaptionUserPreferencesMac.h: * page/CaptionUserPreferencesMac.mm: (WebCore::CaptionUserPreferencesMac::textTrackSelectionScore): Return a score if the media element is showing captions, even if the preference says captions are disabled. LayoutTests: * media/track/track-in-band-legacy-api-expected.txt: Added. * media/track/track-in-band-legacy-api.html: Added. * platform/chromium/TestExpectations: Skip new test. * platform/efl/TestExpectations: Ditto. * platform/gtk/TestExpectations: Ditto. * platform/mac/TestExpectations: Ditto. * platform/qt/TestExpectations: Ditto. * platform/win/TestExpectations: Ditto. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147001 268f45cc-cd09-0410-ab3c-d52691b4dbfc
92907e15