<!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>[152129] branches/safari-537-branch/Source</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/152129">152129</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-06-27 15:19:30 -0700 (Thu, 27 Jun 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/152035">r152035</a>.  &lt;rdar://problem/14280545&gt;</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari537branchSourceWTFChangeLog">branches/safari-537-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari537branchSourceWTFwtfPlatformh">branches/safari-537-branch/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#branchessafari537branchSourceWebCoreChangeLog">branches/safari-537-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari537branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari537branchSourceWebCorepageCaptionUserPreferencesMediaAFcpp">branches/safari-537-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp</a></li>
<li><a href="#branchessafari537branchSourceWebCoreplatformLocalizedStringscpp">branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#branchessafari537branchSourceWebCoreplatformLocalizedStringsh">branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari537branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WTF/ChangeLog (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WTF/ChangeLog        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WTF/ChangeLog        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-06-27  Lucas Forschler  &lt;lforschler@apple.com&gt;
+
+        Merge r152035
+
+    2013-06-26  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+            [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.
+
</ins><span class="cx"> 2013-06-25  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r151755
</span></span></pre></div>
<a id="branchessafari537branchSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WTF/wtf/Platform.h (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WTF/wtf/Platform.h        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WTF/wtf/Platform.h        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> /* Graphics engines */
</span><span class="cx"> 
</span><span class="cx"> /* USE(CG) and PLATFORM(CI) */
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) &amp;&amp; !USE(WINGDI) &amp;&amp; !PLATFORM(WIN_CAIRO))
</ins><span class="cx"> #define WTF_USE_CG 1
</span><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) &amp;&amp; USE(CG))
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if PLATFORM(MAC) &amp;&amp; !PLATFORM(IOS) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</del><ins>+#if (PLATFORM(MAC) || (OS(WINDOWS) &amp;&amp; USE(CG))) &amp;&amp; !PLATFORM(IOS) &amp;&amp; __MAC_OS_X_VERSION_MIN_REQUIRED &gt;= 1090
</ins><span class="cx"> #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari537branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WebCore/ChangeLog        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2013-06-27  Lucas Forschler  &lt;lforschler@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r152035
+
+    2013-06-26  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+            [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  &lt;lforschler@apple.com&gt;
+
</ins><span class="cx">         Merge r152004
</span><span class="cx"> 
</span><span class="cx">     2013-06-26  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari537branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -3899,12 +3899,8 @@
</span><span class="cx">     &lt;ClCompile Include=&quot;..\page\BarProp.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\page\CaptionUserPreferences.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\page\CaptionUserPreferencesMediaAF.cpp&quot;&gt;
</span><del>-      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
-      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
-      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Debug|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
-      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Production|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
</del><span class="cx">       &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
</span><del>-      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Release|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
</del><ins>+      &lt;ExcludedFromBuild Condition=&quot;'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'&quot;&gt;true&lt;/ExcludedFromBuild&gt;
</ins><span class="cx">     &lt;/ClCompile&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\page\Chrome.cpp&quot; /&gt;
</span><span class="cx">     &lt;ClCompile Include=&quot;..\page\animation\CompositeAnimation.cpp&quot; /&gt;
</span></span></pre></div>
<a id="branchessafari537branchSourceWebCorepageCaptionUserPreferencesMediaAFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -131,7 +131,12 @@
</span><span class="cx"> 
</span><span class="cx"> SOFT_LINK_LIBRARY(CoreText)
</span><span class="cx"> 
</span><ins>+SOFT_LINK_DLL_IMPORT(CoreText, CTFontDescriptorCopyAttribute,  CFTypeRef, __cdecl, (CTFontDescriptorRef descriptor, CFStringRef attribute), (descriptor, attribute));
+#define CTFontDescriptorCopyAttribute softLink_CTFontDescriptorCopyAttribute
</ins><span class="cx"> 
</span><ins>+SOFT_LINK_VARIABLE_DLL_IMPORT(CoreText, kCTFontNameAttribute, CFStringRef)
+#define kCTFontNameAttribute get_kCTFontNameAttribute()
+
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari537branchSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.cpp (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.cpp        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.cpp        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx">     return WEB_UI_STRING_KEY(&quot;Unknown&quot;, &quot;Unknown (text track)&quot;, &quot;Menu item label for a text track that has no other name&quot;);
</span><span class="cx"> }
</span><span class="cx">     
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(WIN)
</ins><span class="cx"> String textTrackCountryAndLanguageMenuItemText(const String&amp; title, const String&amp; country, const String&amp; language)
</span><span class="cx"> {
</span><span class="cx">     return formatLocalizedString(WEB_UI_STRING(&quot;%@ (%@-%@)&quot;, &quot;Text track display name format that includes the country and language of the subtitle, in the form of 'Title (Language-Country)'&quot;), title.createCFString().get(), language.createCFString().get(), country.createCFString().get());
</span></span></pre></div>
<a id="branchessafari537branchSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.h (152128 => 152129)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.h        2013-06-27 22:18:39 UTC (rev 152128)
+++ branches/safari-537-branch/Source/WebCore/platform/LocalizedStrings.h        2013-06-27 22:19:30 UTC (rev 152129)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">     String textTrackOffMenuItemText();
</span><span class="cx">     String textTrackAutomaticMenuItemText();
</span><span class="cx">     String textTrackNoLabelText();
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(MAC) || PLATFORM(WIN)
</ins><span class="cx">     String textTrackCountryAndLanguageMenuItemText(const String&amp; title, const String&amp; country, const String&amp; language);
</span><span class="cx">     String textTrackLanguageMenuItemText(const String&amp; title, const String&amp; language);
</span><span class="cx">     String closedCaptionTrackMenuItemText(const String&amp;);
</span></span></pre>
</div>
</div>

</body>
</html>