Fix the build.

* platform/network/ResourceHandle.h:
* platform/network/mac/ResourceHandleMac.mm:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index acffce66fcb4b553ef328472d2f8188344537fb6..cc1f0bc8b69a0ca7a421324e00092e6756efe565 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-10  Timothy Horton  <timothy_horton@apple.com>
+
+        Fix the build.
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/mac/ResourceHandleMac.mm:
+

 2014-09-09  Myles C. Maxfield <mmaxfield@apple.com>  <litherum@gmail.com>
 
         Delete class SavedDrawingStateForMask
 2014-09-09  Myles C. Maxfield <mmaxfield@apple.com>  <litherum@gmail.com>
 
         Delete class SavedDrawingStateForMask

diff --git a/Source/WebCore/platform/network/ResourceHandle.h b/Source/WebCore/platform/network/ResourceHandle.h
index 7c4de7a3808202d5c5c68470b7a926becd991c82..e22dfd9c996d82fb9f95e36964c7e45b7382c868 100644 (file)
--- a/Source/WebCore/platform/network/ResourceHandle.h
+++ b/Source/WebCore/platform/network/ResourceHandle.h
@@ -140,8 +140,8 @@ public:
 #endif
         
 #if PLATFORM(COCOA) && ENABLE(WEB_TIMING)
 #endif
         
 #if PLATFORM(COCOA) && ENABLE(WEB_TIMING)

-#if USE(CFNETWORK)

     void setCollectsTimingData();
     void setCollectsTimingData();

+#if USE(CFNETWORK)

     static void getConnectionTimingData(CFURLConnectionRef, ResourceLoadTiming&);
 #else
     static void getConnectionTimingData(NSURLConnection *, ResourceLoadTiming&);
     static void getConnectionTimingData(CFURLConnectionRef, ResourceLoadTiming&);
 #else
     static void getConnectionTimingData(NSURLConnection *, ResourceLoadTiming&);

diff --git a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
index 4184abc360665aaf922d0fd864de3afe617e493b..76454da9d24e0fb65b8744650f908b7100ee6944 100644 (file)
--- a/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
+++ b/Source/WebCore/platform/network/mac/ResourceHandleMac.mm
@@ -754,9 +754,7 @@ void ResourceHandle::getConnectionTimingData(NSDictionary *timingData, ResourceL
     timing.requestStart = requestStart <= 0 ? 0 : (requestStart - referenceStart) * 1000;
     timing.responseStart = responseStart <= 0 ? 0 : (responseStart - referenceStart) * 1000;
 }
     timing.requestStart = requestStart <= 0 ? 0 : (requestStart - referenceStart) * 1000;
     timing.responseStart = responseStart <= 0 ? 0 : (responseStart - referenceStart) * 1000;
 }

-    
-#if USE(CFNETWORK)
-    
+

 void ResourceHandle::setCollectsTimingData()
 {
     static dispatch_once_t onceToken;
 void ResourceHandle::setCollectsTimingData()
 {
     static dispatch_once_t onceToken;


@@ -764,6 +762,8 @@ void ResourceHandle::setCollectsTimingData()
         [NSURLConnection _setCollectsTimingData:YES];
     });
 }
         [NSURLConnection _setCollectsTimingData:YES];
     });
 }

+
+#if USE(CFNETWORK)

     
 void ResourceHandle::getConnectionTimingData(CFURLConnectionRef connection, ResourceLoadTiming& timing)
 {
     
 void ResourceHandle::getConnectionTimingData(CFURLConnectionRef connection, ResourceLoadTiming& timing)
 {