Bug 115740 – [Mac] Inband text tracks are not in text track menu on Lion

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Eric Carlson]

Inband text tracks are not listed in the track menu on OS X Lion.

[Eric Carlson]

Created attachment 201004 [details]
Proposed patch

[WebKit Commit Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/platform/mac-lion/media/video-controls-captions-trackmenu-localized-expected.txt', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Platform.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/html/HTMLMediaElement.cpp', u'Source/WebCore/html/HTMLMediaElement.h', u'Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp', u'Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h', u'Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp', u'Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm', u'Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm']" exit_code: 1
Source/WebCore/ChangeLog:13:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:19:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:20:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:34:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:44:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:47:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:49:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:53:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 8 in 14 files


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

[Eric Carlson]

Created attachment 201006 [details]
Out damned tabs!

[Dean Jackson]

Comment on attachment 201006 [details]
Out damned tabs!

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

> Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm:88
>  {
>      if (!m_playerItemTrack)
>          return false;
> -    
> -    return [[[m_playerItemTrack assetTrack] mediaType] isEqualToString:AVMediaTypeClosedCaption];
> +
> +    return true;
>  }

Seems like this can now be "return m_playerItemTrack"

> Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm:98
>  bool InbandTextTrackPrivateLegacyAVFObjC::isMainProgramContent() const
>  {
> -    if (!m_playerItemTrack)
> -        return false;
> -    
> -    return [[m_playerItemTrack assetTrack] hasMediaCharacteristic:AVMediaCharacteristicIsMainProgramContent];
> +    return m_playerItemTrack;
>  }

Which is the same as this now.

[Eric Carlson]

Committed r149741  - https://trac.webkit.org/r149741