Commit 418804e4 authored by bfulgham@apple.com's avatar bfulgham@apple.com
Browse files

../WebCore: [Windows] Enable CaptionUserPreferencesMediaAF on Windows.

https://bugs.webkit.org/show_bug.cgi?id=118076

Reviewed by Eric Carlson.

* WebCore.vcxproj/WebCore.vcxproj: Enable building the CaptionUserPreferencesMediaAF source file.
* page/CaptionUserPreferencesMediaAF.cpp: Add soft-link commands for CoreText symbols needed in
  the implementation for Windows.
* platform/LocalizedStrings.cpp: Enable Text Track-related strings on Windows.
* platform/LocalizedStrings.h: Ditto.

../WTF: [Windows] Enable CaptionUserPreferenceMediaAF on Windows.
https://bugs.webkit.org/show_bug.cgi?id=118076

Reviewed by Eric Carlson.

* wtf/Platform.h: Enable Media Accessibility Framework in Windows build environments
  that support it.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@152035 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 465bceda
2013-06-26 Brent Fulgham <bfulgham@apple.com>
[Windows] Enable CaptionUserPreferenceMediaAF on Windows.
https://bugs.webkit.org/show_bug.cgi?id=118076
Reviewed by Eric Carlson.
* wtf/Platform.h: Enable Media Accessibility Framework in Windows build environments
that support it.
2013-06-24 Roger Fong <roger_fong@apple.com>
 
Unreviewed. AppleWin build fix, followup to r151915.
......
......@@ -467,7 +467,7 @@
/* Graphics engines */
/* USE(CG) and PLATFORM(CI) */
#if PLATFORM(MAC) || PLATFORM(IOS)
#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
#define WTF_USE_CG 1
#endif
#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
......@@ -968,7 +968,7 @@
#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#endif
#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#if (PLATFORM(MAC) || (OS(WINDOWS) && USE(CG))) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
#endif
......
2013-06-26 Brent Fulgham <bfulgham@apple.com>
[Windows] Enable CaptionUserPreferencesMediaAF on Windows.
https://bugs.webkit.org/show_bug.cgi?id=118076
Reviewed by Eric Carlson.
* WebCore.vcxproj/WebCore.vcxproj: Enable building the CaptionUserPreferencesMediaAF source file.
* page/CaptionUserPreferencesMediaAF.cpp: Add soft-link commands for CoreText symbols needed in
the implementation for Windows.
* platform/LocalizedStrings.cpp: Enable Text Track-related strings on Windows.
* platform/LocalizedStrings.h: Ditto.
2013-06-26 Ryosuke Niwa <rniwa@webkit.org>
 
Speed up SVG sprites by only painting the source rect in SVGImage::draw
......@@ -4142,12 +4142,8 @@
<ClCompile Include="..\page\BarProp.cpp" />
<ClCompile Include="..\page\CaptionUserPreferences.cpp" />
<ClCompile Include="..\page\CaptionUserPreferencesMediaAF.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\page\Chrome.cpp" />
<ClCompile Include="..\page\animation\CompositeAnimation.cpp" />
......@@ -131,6 +131,11 @@ SOFT_LINK_VARIABLE_DLL_IMPORT(MediaAccessibility, kMAXCaptionAppearanceSettingsC
SOFT_LINK_LIBRARY(CoreText)
SOFT_LINK_DLL_IMPORT(CoreText, CTFontDescriptorCopyAttribute, CFTypeRef, __cdecl, (CTFontDescriptorRef descriptor, CFStringRef attribute), (descriptor, attribute));
#define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
SOFT_LINK_VARIABLE_DLL_IMPORT(CoreText, kCTFontNameAttribute, CFStringRef)
#define kCTFontNameAttribute get_kCTFontNameAttribute()
#endif
......
......@@ -1052,7 +1052,7 @@ String textTrackNoLabelText()
return WEB_UI_STRING_KEY("Unknown", "Unknown (text track)", "Menu item label for a text track that has no other name");
}
#if PLATFORM(MAC)
#if PLATFORM(MAC) || PLATFORM(WIN)
String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language)
{
return formatLocalizedString(WEB_UI_STRING("%@ (%@-%@)", "Text track display name format that includes the country and language of the subtitle, in the form of 'Title (Language-Country)'"), title.createCFString().get(), language.createCFString().get(), country.createCFString().get());
......
......@@ -243,7 +243,7 @@ namespace WebCore {
String textTrackOffMenuItemText();
String textTrackAutomaticMenuItemText();
String textTrackNoLabelText();
#if PLATFORM(MAC)
#if PLATFORM(MAC) || PLATFORM(WIN)
String textTrackCountryAndLanguageMenuItemText(const String& title, const String& country, const String& language);
String textTrackLanguageMenuItemText(const String& title, const String& language);
String closedCaptionTrackMenuItemText(const String&);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment