Title: [199255] branches/safari-601.1.46-branch/Source/WebCore
- Revision
- 199255
- Author
- [email protected]
- Date
- 2016-04-08 16:01:01 -0700 (Fri, 08 Apr 2016)
Log Message
Merged r199253. rdar://problem/25533763
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (199254 => 199255)
--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-08 22:59:58 UTC (rev 199254)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-04-08 23:01:01 UTC (rev 199255)
@@ -1,5 +1,16 @@
2016-04-08 Babak Shafiei <[email protected]>
+ Merge r199253.
+
+ 2016-04-08 Jer Noble <[email protected]>
+
+ Unreviewed 32-bit build fix; make type of std::min<> explicit.
+
+ * platform/audio/ios/AudioDestinationIOS.cpp:
+ (WebCore::AudioDestinationIOS::render):
+
+2016-04-08 Babak Shafiei <[email protected]>
+
Merge r199252.
2016-04-08 Jer Noble <[email protected]>
Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (199254 => 199255)
--- branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-08 22:59:58 UTC (rev 199254)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2016-04-08 23:01:01 UTC (rev 199255)
@@ -219,7 +219,7 @@
while (framesRemaining > 0) {
if (m_startSpareFrame < m_endSpareFrame) {
ASSERT(m_startSpareFrame < m_endSpareFrame);
- UInt32 framesThisTime = std::min(m_endSpareFrame - m_startSpareFrame, numberOfFrames);
+ UInt32 framesThisTime = std::min<UInt32>(m_endSpareFrame - m_startSpareFrame, numberOfFrames);
assignAudioBuffersToBus(buffers, *m_renderBus, numberOfBuffers, numberOfFrames, frameOffset, framesThisTime);
m_renderBus->copyFromRange(*m_spareBus, m_startSpareFrame, m_endSpareFrame);
frameOffset += framesThisTime;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
