<!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>[185971] trunk</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/185971">185971</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-25 16:47:29 -0700 (Thu, 25 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WIN] Enable WEB_TIMING API
https://bugs.webkit.org/show_bug.cgi?id=146330
<rdar://problem/21530765>
Reviewed by Dean Jackson.
Source/WebCore:
Tested by internal HLS tests.
Enable WEB_TIMING features on Windows by activating the feature flag,
and correcting some build errors.
* platform/network/cf/ResourceHandleCFNet.cpp:
(WebCore::ResourceHandle::start): "setCollectionTimingData" is only
defined for PLATFORM(COCOA).
* platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
(WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
The 'ResourceHandle::getConnectionTimingData' method is only defined
for PLATFORM(COCOA).
WebKitLibraries:
Enable WEB_TIMING features on Windows by activating the feature flag,
and correcting some build errors.
* win/tools/vsprops/FeatureDefines.props: Enable feature flag.
* win/tools/vsprops/FeatureDefinesCairo.props: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp">trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/Source/WebCore/ChangeLog        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-25 Brent Fulgham <bfulgham@apple.com>
+
+ [WIN] Enable WEB_TIMING API
+ https://bugs.webkit.org/show_bug.cgi?id=146330
+ <rdar://problem/21530765>
+
+ Reviewed by Dean Jackson.
+
+ Tested by internal HLS tests.
+
+ Enable WEB_TIMING features on Windows by activating the feature flag,
+ and correcting some build errors.
+
+ * platform/network/cf/ResourceHandleCFNet.cpp:
+ (WebCore::ResourceHandle::start): "setCollectionTimingData" is only
+ defined for PLATFORM(COCOA).
+ * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
+ The 'ResourceHandle::getConnectionTimingData' method is only defined
+ for PLATFORM(COCOA).
+
</ins><span class="cx"> 2015-06-25 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline media controls disappear when returning a video to inline
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> bool shouldUseCredentialStorage = !client() || client()->shouldUseCredentialStorage(this);
</span><span class="cx">
</span><del>-#if ENABLE(WEB_TIMING)
</del><ins>+#if ENABLE(WEB_TIMING) && PLATFORM(COCOA)
</ins><span class="cx"> setCollectsTimingData();
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSynchronousResourceHandleCFURLConnectionDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ResourceResponse resourceResponse(cfResponse);
</span><del>-#if ENABLE(WEB_TIMING)
</del><ins>+#if PLATFORM(COCOA) && ENABLE(WEB_TIMING)
</ins><span class="cx"> ResourceHandle::getConnectionTimingData(connection, resourceResponse.resourceLoadTiming());
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(connection);
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/WebKitLibraries/ChangeLog        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-25 Brent Fulgham <bfulgham@apple.com>
+
+ [WIN] Enable WEB_TIMING API
+ https://bugs.webkit.org/show_bug.cgi?id=146330
+ <rdar://problem/21530765>
+
+ Reviewed by Dean Jackson.
+
+ Enable WEB_TIMING features on Windows by activating the feature flag,
+ and correcting some build errors.
+
+ * win/tools/vsprops/FeatureDefines.props: Enable feature flag.
+ * win/tools/vsprops/FeatureDefinesCairo.props: Ditto.
+
</ins><span class="cx"> 2015-05-27 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> img.currentSrc problem in strict mode with old picturefill
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefines.props        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
</span><span class="cx"> <ENABLE_WEB_AUDIO />
</span><span class="cx"> <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
</span><del>- <ENABLE_WEB_TIMING />
</del><ins>+ <ENABLE_WEB_TIMING>ENABLE_WEB_TIMING</ENABLE_WEB_TIMING>
</ins><span class="cx"> <ENABLE_WEBGL />
</span><span class="cx"> <ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
</span><span class="cx"> <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props (185970 => 185971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props        2015-06-25 23:38:59 UTC (rev 185970)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props        2015-06-25 23:47:29 UTC (rev 185971)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
</span><span class="cx"> <ENABLE_WEB_AUDIO />
</span><span class="cx"> <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
</span><del>- <ENABLE_WEB_TIMING />
</del><ins>+ <ENABLE_WEB_TIMING>ENABLE_WEB_TIMING</ENABLE_WEB_TIMING>
</ins><span class="cx"> <ENABLE_WEBGL>ENABLE_WEBGL</ENABLE_WEBGL>
</span><span class="cx"> <ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
</span><span class="cx"> <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
</span></span></pre>
</div>
</div>
</body>
</html>