Log Message
Fix the build. * platform/network/ResourceHandle.h: * platform/network/mac/ResourceHandleMac.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173503 => 173504)
--- trunk/Source/WebCore/ChangeLog 2014-09-11 01:25:46 UTC (rev 173503)
+++ trunk/Source/WebCore/ChangeLog 2014-09-11 01:47:23 UTC (rev 173504)
@@ -1,3 +1,10 @@
+2014-09-10 Timothy Horton <[email protected]>
+
+ Fix the build.
+
+ * platform/network/ResourceHandle.h:
+ * platform/network/mac/ResourceHandleMac.mm:
+
2014-09-09 Myles C. Maxfield <[email protected]> <[email protected]>
Delete class SavedDrawingStateForMask
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (173503 => 173504)
--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-09-11 01:25:46 UTC (rev 173503)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2014-09-11 01:47:23 UTC (rev 173504)
@@ -140,8 +140,8 @@
#endif
#if PLATFORM(COCOA) && ENABLE(WEB_TIMING)
+ void setCollectsTimingData();
#if USE(CFNETWORK)
- void setCollectsTimingData();
static void getConnectionTimingData(CFURLConnectionRef, ResourceLoadTiming&);
#else
static void getConnectionTimingData(NSURLConnection *, ResourceLoadTiming&);
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (173503 => 173504)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-09-11 01:25:46 UTC (rev 173503)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-09-11 01:47:23 UTC (rev 173504)
@@ -754,9 +754,7 @@
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;
@@ -764,6 +762,8 @@
[NSURLConnection _setCollectsTimingData:YES];
});
}
+
+#if USE(CFNETWORK)
void ResourceHandle::getConnectionTimingData(CFURLConnectionRef connection, ResourceLoadTiming& timing)
{
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
