Title: [207657] tags/Safari-602.3.3.0.1/Source/WebCore
- Revision
- 207657
- Author
- bshaf...@apple.com
- Date
- 2016-10-20 22:07:43 -0700 (Thu, 20 Oct 2016)
Log Message
Merge r207654. rdar://problem/28883727
Modified Paths
Diff
Modified: tags/Safari-602.3.3.0.1/Source/WebCore/ChangeLog (207656 => 207657)
--- tags/Safari-602.3.3.0.1/Source/WebCore/ChangeLog 2016-10-21 05:05:44 UTC (rev 207656)
+++ tags/Safari-602.3.3.0.1/Source/WebCore/ChangeLog 2016-10-21 05:07:43 UTC (rev 207657)
@@ -1,3 +1,14 @@
+2016-10-20 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r207654. rdar://problem/28883727
+
+ 2016-10-20 Babak Shafiei <bshaf...@apple.com>
+
+ Build fix. rdar://problem/28883727
+
+ * platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp:
+ (WebCore::SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse):
+
2016-10-20 Daniel Bates <daba...@apple.com>
Merge r206809. rdar://problem/28718761
Modified: tags/Safari-602.3.3.0.1/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp (207656 => 207657)
--- tags/Safari-602.3.3.0.1/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2016-10-21 05:05:44 UTC (rev 207656)
+++ tags/Safari-602.3.3.0.1/Source/WebCore/platform/network/cf/SynchronousResourceHandleCFURLConnectionDelegate.cpp 2016-10-21 05:07:43 UTC (rev 207657)
@@ -135,7 +135,7 @@
}
#endif // !PLATFORM(COCOA)
-void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLConnectionRef, CFURLResponseRef cfResponse)
+void SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(CFURLConnectionRef connection, CFURLResponseRef cfResponse)
{
LOG(Network, "CFNet - SynchronousResourceHandleCFURLConnectionDelegate::didReceiveResponse(handle=%p) (%s)", m_handle, m_handle->firstRequest().url().string().utf8().data());
@@ -180,10 +180,12 @@
#if PLATFORM(COCOA) && ENABLE(WEB_TIMING)
ResourceHandle::getConnectionTimingData(connection, resourceResponse.resourceLoadTiming());
#else
+ UNUSED_PARAM(connection);
+#endif
+
#if USE(QUICK_LOOK)
resourceResponse.setIsQuickLook(isQuickLookPreview);
#endif
-#endif
m_handle->client()->didReceiveResponse(m_handle, WTFMove(resourceResponse));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
