[WIN] Enable WEB_TIMING API
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jun 2015 23:47:29 +0000 (23:47 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 25 Jun 2015 23:47:29 +0000 (23:47 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@185971 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/FeatureDefines.props
WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props

index 4dfd1cf..66c2ddb 100644 (file)
@@ -1,3 +1,24 @@
+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).
+
 2015-06-25  Dean Jackson  <dino@apple.com>
 
         Inline media controls disappear when returning a video to inline
index e085f75..77a52c2 100644 (file)
@@ -252,7 +252,7 @@ bool ResourceHandle::start()
 
     bool shouldUseCredentialStorage = !client() || client()->shouldUseCredentialStorage(this);
 
-#if ENABLE(WEB_TIMING)
+#if ENABLE(WEB_TIMING) && PLATFORM(COCOA)
     setCollectsTimingData();
 #endif
 
index 15d8fa0..af1a02b 100644 (file)
@@ -145,7 +145,7 @@ void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLC
 #endif
     
     ResourceResponse resourceResponse(cfResponse);
-#if ENABLE(WEB_TIMING)
+#if PLATFORM(COCOA) && ENABLE(WEB_TIMING)
     ResourceHandle::getConnectionTimingData(connection, resourceResponse.resourceLoadTiming());
 #else
     UNUSED_PARAM(connection);
index 7115bdb..374c863 100644 (file)
@@ -1,3 +1,17 @@
+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.
+
 2015-05-27  Dean Jackson  <dino@apple.com>
 
         img.currentSrc problem in strict mode with old picturefill
index 26a409e..661b2b2 100644 (file)
@@ -82,7 +82,7 @@
     <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
-    <ENABLE_WEB_TIMING />
+    <ENABLE_WEB_TIMING>ENABLE_WEB_TIMING</ENABLE_WEB_TIMING>
     <ENABLE_WEBGL />
     <ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
     <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>
index 892d61d..6fe377e 100644 (file)
@@ -82,7 +82,7 @@
     <ENABLE_VIEW_MODE_CSS_MEDIA>ENABLE_VIEW_MODE_CSS_MEDIA</ENABLE_VIEW_MODE_CSS_MEDIA>
     <ENABLE_WEB_AUDIO />
     <ENABLE_WEB_SOCKETS>ENABLE_WEB_SOCKETS</ENABLE_WEB_SOCKETS>
-    <ENABLE_WEB_TIMING />
+    <ENABLE_WEB_TIMING>ENABLE_WEB_TIMING</ENABLE_WEB_TIMING>
     <ENABLE_WEBGL>ENABLE_WEBGL</ENABLE_WEBGL>
     <ENABLE_WEBVTT_REGIONS>ENABLE_WEBVTT_REGIONS</ENABLE_WEBVTT_REGIONS>
     <ENABLE_XHR_TIMEOUT>ENABLE_XHR_TIMEOUT</ENABLE_XHR_TIMEOUT>