Bug 109730 – [Mac] Caption menu should have only one item selected

• Component: Media
• Status: RESOLVED FIXED

[Eric Carlson]

The caption menu can end up with more than one item selected when the selected track changes because of a change in user preferences.

[Eric Carlson]

Created attachment 188154 [details]
Proposed patch

[WebKit Review Bot]

Attachment 188154 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/media/track/track-user-preferences-expected.txt', u'LayoutTests/media/track/track-user-preferences.html', u'Source/WebCore/CMakeLists.txt', u'Source/WebCore/ChangeLog', u'Source/WebCore/GNUmakefile.list.am', u'Source/WebCore/Target.pri', u'Source/WebCore/WebCore.gypi', u'Source/WebCore/WebCore.vcproj/WebCore.vcproj', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/html/HTMLMediaElement.cpp', u'Source/WebCore/html/HTMLMediaElement.h', u'Source/WebCore/page/CaptionUserPreferences.cpp', u'Source/WebCore/page/CaptionUserPreferences.h', u'Source/WebCore/page/CaptionUserPreferencesMac.h', u'Source/WebCore/page/CaptionUserPreferencesMac.mm']" exit_code: 1
Source/WebCore/page/CaptionUserPreferences.h:64:  The parameter name "language" adds no information, so it should be removed.  [readability/parameter_name] [5]
Source/WebCore/page/CaptionUserPreferences.h:67:  The parameter name "track" adds no information, so it should be removed.  [readability/parameter_name] [5]
Total errors found: 2 in 16 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Dean Jackson]

Comment on attachment 188154 [details]
Proposed patch

View in context: https://bugs.webkit.org/attachment.cgi?id=188154&action=review

> Source/WebCore/ChangeLog:14
> +        * WebCore.vcproj/WebCore.vcproj: Ditto.

Don't we also edit the VS2010 file now as well? WebCore.vcxproj/ This will make Roger happier :)

> Source/WebCore/page/CaptionUserPreferences.h:70
> +    virtual String displayNameForTrack(TextTrack* track) const;
>      virtual bool testingMode() const { return m_testingMode; }
> +
>      virtual void setTestingMode(bool override) { m_testingMode = override; }

Nit: extra line got added here.

[Eric Carlson]

Created attachment 188168 [details]
Update patch.

[Peter Beverloo (cr-android ews)]

Comment on attachment 188168 [details]
Update patch.

Attachment 188168 [details] did not pass cr-android-ews (chromium-android):
Output: http://queues.webkit.org/results/16559076

[Early Warning System Bot]

Comment on attachment 188168 [details]
Update patch.

Attachment 188168 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/16525025

[Early Warning System Bot]

Comment on attachment 188168 [details]
Update patch.

Attachment 188168 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/16560018

[Eric Carlson]

Created attachment 188175 [details]
#import -> #include

[Dean Jackson]

Comment on attachment 188175 [details]
#import -> #include

View in context: https://bugs.webkit.org/attachment.cgi?id=188175&action=review

> Source/WebCore/WebCore.vcxproj/WebCore.vcxproj:2003
> -    <ClCompile Include="..\page\ContentSecurityPolicy.cpp" />
> +    <ClCompile Include="..\page\Console.cpp" />

What's this?

[Eric Carlson]

(In reply to comment #9)
> (From update of attachment 188175 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=188175&action=review
> 
> > Source/WebCore/WebCore.vcxproj/WebCore.vcxproj:2003
> > -    <ClCompile Include="..\page\ContentSecurityPolicy.cpp" />
> > +    <ClCompile Include="..\page\Console.cpp" />
> 
> What's this?

Oops, thanks for spotting that!

[Eric Carlson]

Committed in http://trac.webkit.org/r142809.

[Ryosuke Niwa]

This patch appears to have caused media/media-captions.html to crash on Mac:
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&tests=media%2Fmedia-captions.html

Blame list:
http://trac.webkit.org/log/?verbose=on&rev=142810&stop_rev=142807