Bug 118069 – Prepare CaptionUserPreferencesMac for use on Windows port

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

[Brent Fulgham]

Prepare the CaptionUserPreferencesMac class to be usable on the Apple Windows port by:
1. Renaming it to CaptionUserPreferencesMediaAF.cpp
2. Making minor changes to compile with C++.

This change should create no changes in behavior, and will be followed by a Windows-specific patch to turn on various features.

[Brent Fulgham]

Created attachment 205510 [details]
Patch

[WebKit Commit Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/page/CaptionUserPreferencesMac.h', u'Source/WebCore/page/CaptionUserPreferencesMac.mm', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.h', u'Source/WebCore/page/PageGroup.cpp']" exit_code: 1
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:149:  Missing space before {  [whitespace/braces] [5]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:168:  Use 0 instead of NULL.  [readability/null] [5]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:207:  A case label should not be indented, but line up with its switch statement.  [whitespace/indent] [4]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:254:  Use 0 instead of NULL.  [readability/null] [5]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:415:  A case label should not be indented, but line up with its switch statement.  [whitespace/indent] [4]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:524:  One space before end of line comments  [whitespace/comments] [5]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:572:  One space before end of line comments  [whitespace/comments] [5]
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:839:  Weird number of spaces at line-start.  Are you using a 4-space indent?  [whitespace/indent] [3]
Total errors found: 8 in 7 files


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

[Brent Fulgham]

Created attachment 205511 [details]
Update to correct some style warnings.

[Brent Fulgham]

(In reply to comment #2)
> Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:149:  Missing space before {  [whitespace/braces] [5]

I don't think we want to modify this Block syntax.

[Radar WebKit Bug Importer]

<rdar://problem/14278574>

[WebKit Commit Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/page/CaptionUserPreferencesMac.h', u'Source/WebCore/page/CaptionUserPreferencesMac.mm', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.h', u'Source/WebCore/page/PageGroup.cpp']" exit_code: 1
Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:149:  Missing space before {  [whitespace/braces] [5]
Total errors found: 1 in 7 files


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

[Brent Fulgham]

(In reply to comment #6)
> Attachment 205511 [details] did not pass style-queue:
> 
> Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/page/CaptionUserPreferencesMac.h', u'Source/WebCore/page/CaptionUserPreferencesMac.mm', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp', u'Source/WebCore/page/CaptionUserPreferencesMediaAF.h', u'Source/WebCore/page/PageGroup.cpp']" exit_code: 1
> Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp:149:  Missing space before {  [whitespace/braces] [5]
> Total errors found: 1 in 7 files
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

Bug 118072 was filed to encourage check-webkit-style to recognize Block syntax.

[Brent Fulgham]

Committed r152004: <http://trac.webkit.org/changeset/152004>