Title: [147247] tags/Safari-537.35.4/Source/WebKit2
- Revision
- 147247
- Author
- lforsch...@apple.com
- Date
- 2013-03-29 13:24:24 -0700 (Fri, 29 Mar 2013)
Log Message
Merged r147010. <rdar://problem/13479890>
Modified Paths
Diff
Modified: tags/Safari-537.35.4/Source/WebKit2/ChangeLog (147246 => 147247)
--- tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:22:26 UTC (rev 147246)
+++ tags/Safari-537.35.4/Source/WebKit2/ChangeLog 2013-03-29 20:24:24 UTC (rev 147247)
@@ -1,5 +1,16 @@
2013-03-29 Lucas Forschler <lforsch...@apple.com>
+ Merge r147010
+
+ 2013-03-27 Brady Eidson <beid...@apple.com>
+
+ Blind attempt at fixing the release build.
+
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::willCacheResponseAsync):
+
+2013-03-29 Lucas Forschler <lforsch...@apple.com>
+
Merge r147006
2013-03-27 Brady Eidson <beid...@apple.com>
Modified: tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (147246 => 147247)
--- tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-29 20:22:26 UTC (rev 147246)
+++ tags/Safari-537.35.4/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-29 20:24:24 UTC (rev 147247)
@@ -98,7 +98,7 @@
void NetworkResourceLoader::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResponse *nsResponse)
{
- ASSERT(handle == m_handle);
+ ASSERT_UNUSED(handle, handle == m_handle);
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
if (m_bytesReceived >= fileBackedResourceMinimumSize())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
