Diff
Modified: tags/Safari-537.47/Source/WTF/ChangeLog (152114 => 152115)
--- tags/Safari-537.47/Source/WTF/ChangeLog 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WTF/ChangeLog 2013-06-27 18:01:43 UTC (rev 152115)
@@ -1,3 +1,17 @@
+2013-06-27 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r152035
+
+ 2013-06-26 Brent Fulgham <bfulg...@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-25 Lucas Forschler <lforsch...@apple.com>
Merge r151755
Modified: tags/Safari-537.47/Source/WTF/wtf/Platform.h (152114 => 152115)
--- tags/Safari-537.47/Source/WTF/wtf/Platform.h 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WTF/wtf/Platform.h 2013-06-27 18:01:43 UTC (rev 152115)
@@ -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
Modified: tags/Safari-537.47/Source/WebCore/ChangeLog (152114 => 152115)
--- tags/Safari-537.47/Source/WebCore/ChangeLog 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WebCore/ChangeLog 2013-06-27 18:01:43 UTC (rev 152115)
@@ -1,5 +1,22 @@
2013-06-27 Lucas Forschler <lforsch...@apple.com>
+ Merge r152035
+
+ 2013-06-26 Brent Fulgham <bfulg...@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-27 Lucas Forschler <lforsch...@apple.com>
+
Merge r152004
2013-06-26 Brent Fulgham <bfulg...@apple.com>
Modified: tags/Safari-537.47/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152114 => 152115)
--- tags/Safari-537.47/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-06-27 18:01:43 UTC (rev 152115)
@@ -3899,12 +3899,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" />
Modified: tags/Safari-537.47/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (152114 => 152115)
--- tags/Safari-537.47/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2013-06-27 18:01:43 UTC (rev 152115)
@@ -131,7 +131,12 @@
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
#endif
Modified: tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.cpp (152114 => 152115)
--- tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.cpp 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.cpp 2013-06-27 18:01:43 UTC (rev 152115)
@@ -1052,7 +1052,7 @@
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());
Modified: tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.h (152114 => 152115)
--- tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.h 2013-06-27 17:57:23 UTC (rev 152114)
+++ tags/Safari-537.47/Source/WebCore/platform/LocalizedStrings.h 2013-06-27 18:01:43 UTC (rev 152115)
@@ -243,7 +243,7 @@
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&);
