Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (196824 => 196825)
--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-19 18:58:31 UTC (rev 196824)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-02-19 19:06:11 UTC (rev 196825)
@@ -1,3 +1,18 @@
+2016-02-19 Matthew Hanson <[email protected]>
+
+ Merge r196703. rdar://problem/24623986
+
+ 2016-02-17 Eric Carlson <[email protected]>
+
+ [Win] Allow ports to disable automatic text track selection
+ https://bugs.webkit.org/show_bug.cgi?id=154322
+ <rdar://problem/24623986>
+
+ Reviewed by Brent Fulgham.
+
+ * page/CaptionUserPreferencesMediaAF.cpp:
+ (MTEnableCaption2015BehaviorPtr): Implement for Windows.
+
2016-02-12 Babak Shafiei <[email protected]>
Merge patch for rdar://problem/24626412.
Modified: branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (196824 => 196825)
--- branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-19 18:58:31 UTC (rev 196824)
+++ branches/safari-601-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-19 19:06:11 UTC (rev 196825)
@@ -66,6 +66,7 @@
#define SOFT_LINK_AVF(Lib, Name, Type) SOFT_LINK_DLL_IMPORT(Lib, Name, Type)
#define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
#define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK_DLL_IMPORT(Lib, Fun, ReturnType, __cdecl, Arguments, Signature)
+#define SOFT_LINK_AVF_FRAMEWORK_IMPORT_OPTIONAL(Lib, Fun, ReturnType, Arguments) SOFT_LINK_DLL_IMPORT_OPTIONAL(Lib, Fun, ReturnType, __cdecl, Arguments)
// CoreText only needs to be soft-linked on Windows.
SOFT_LINK_AVF_FRAMEWORK(CoreText)
@@ -75,8 +76,8 @@
#define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
-typedef Boolean (*MTEnableCaption2015BehaviorPtrType) ();
-static MTEnableCaption2015BehaviorPtrType MTEnableCaption2015BehaviorPtr() { return nullptr; }
+SOFT_LINK_AVF_FRAMEWORK(CoreMedia)
+SOFT_LINK_AVF_FRAMEWORK_IMPORT_OPTIONAL(CoreMedia, MTEnableCaption2015Behavior, Boolean, ())
#else
