<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[197200] tags/Safari-601.5.17.2/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/197200">197200</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-02-26 13:57:13 -0800 (Fri, 26 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/196703">r196703</a>. rdar://problem/24623986</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6015172SourceWebCoreChangeLog">tags/Safari-601.5.17.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari6015172SourceWebCorepageCaptionUserPreferencesMediaAFcpp">tags/Safari-601.5.17.2/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6015172SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.17.2/Source/WebCore/ChangeLog (197199 => 197200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.17.2/Source/WebCore/ChangeLog 2016-02-26 21:55:30 UTC (rev 197199)
+++ tags/Safari-601.5.17.2/Source/WebCore/ChangeLog 2016-02-26 21:57:13 UTC (rev 197200)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-26 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r196703. rdar://problem/24623986
+
+ 2016-02-17 Eric Carlson <eric.carlson@apple.com>
+
+ [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.
+
</ins><span class="cx"> 2016-02-12 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge patch for rdar://problem/24626412.
</span></span></pre></div>
<a id="tagsSafari6015172SourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.5.17.2/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (197199 => 197200)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.5.17.2/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-26 21:55:30 UTC (rev 197199)
+++ tags/Safari-601.5.17.2/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp 2016-02-26 21:57:13 UTC (rev 197200)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> #define SOFT_LINK_AVF(Lib, Name, Type) SOFT_LINK_DLL_IMPORT(Lib, Name, Type)
</span><span class="cx"> #define SOFT_LINK_AVF_POINTER(Lib, Name, Type) SOFT_LINK_VARIABLE_DLL_IMPORT_OPTIONAL(Lib, Name, Type)
</span><span class="cx"> #define SOFT_LINK_AVF_FRAMEWORK_IMPORT(Lib, Fun, ReturnType, Arguments, Signature) SOFT_LINK_DLL_IMPORT(Lib, Fun, ReturnType, __cdecl, Arguments, Signature)
</span><ins>+#define SOFT_LINK_AVF_FRAMEWORK_IMPORT_OPTIONAL(Lib, Fun, ReturnType, Arguments) SOFT_LINK_DLL_IMPORT_OPTIONAL(Lib, Fun, ReturnType, __cdecl, Arguments)
</ins><span class="cx">
</span><span class="cx"> // CoreText only needs to be soft-linked on Windows.
</span><span class="cx"> SOFT_LINK_AVF_FRAMEWORK(CoreText)
</span><span class="lines">@@ -75,8 +76,8 @@
</span><span class="cx">
</span><span class="cx"> #define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
</span><span class="cx">
</span><del>-typedef Boolean (*MTEnableCaption2015BehaviorPtrType) ();
-static MTEnableCaption2015BehaviorPtrType MTEnableCaption2015BehaviorPtr() { return nullptr; }
</del><ins>+SOFT_LINK_AVF_FRAMEWORK(CoreMedia)
+SOFT_LINK_AVF_FRAMEWORK_IMPORT_OPTIONAL(CoreMedia, MTEnableCaption2015Behavior, Boolean, ())
</ins><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>