Title: [173634] trunk/Source/WebCore
- Revision
- 173634
- Author
- [email protected]
- Date
- 2014-09-15 15:47:46 -0700 (Mon, 15 Sep 2014)
Log Message
Unreviewed build fix for 32-bit builds.
Make casts from unsigned long long -> size_t explicit, rather than implicit. Also
make CARingBuffer be protected by USING_MEDIA_TOOLBOX so ports without that flag
won't try to compile unused code.
* platform/audio/mac/CARingBuffer.cpp:
(WebCore::CARingBuffer::fetch):
* platform/audio/mac/CARingBuffer.h:
* platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
(WebCore::AudioSourceProviderAVFObjC::provideInput):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (173633 => 173634)
--- trunk/Source/WebCore/ChangeLog 2014-09-15 22:03:46 UTC (rev 173633)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 22:47:46 UTC (rev 173634)
@@ -1,5 +1,19 @@
2014-09-15 Jer Noble <[email protected]>
+ Unreviewed build fix for 32-bit builds.
+
+ Make casts from unsigned long long -> size_t explicit, rather than implicit. Also
+ make CARingBuffer be protected by USING_MEDIA_TOOLBOX so ports without that flag
+ won't try to compile unused code.
+
+ * platform/audio/mac/CARingBuffer.cpp:
+ (WebCore::CARingBuffer::fetch):
+ * platform/audio/mac/CARingBuffer.h:
+ * platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm:
+ (WebCore::AudioSourceProviderAVFObjC::provideInput):
+
+2014-09-15 Jer Noble <[email protected]>
+
Unreviewed logic fix from r173631. Logic for includeShadowDOM was reversed.
* page/DragController.cpp:
Modified: trunk/Source/WebCore/platform/audio/mac/CARingBuffer.cpp (173633 => 173634)
--- trunk/Source/WebCore/platform/audio/mac/CARingBuffer.cpp 2014-09-15 22:03:46 UTC (rev 173633)
+++ trunk/Source/WebCore/platform/audio/mac/CARingBuffer.cpp 2014-09-15 22:47:46 UTC (rev 173634)
@@ -26,6 +26,8 @@
#include "config.h"
#include "CARingBuffer.h"
+#if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
+
#include <CoreAudio/CoreAudioTypes.h>
#include <libkern/OSAtomic.h>
#include <wtf/MathExtras.h>
@@ -272,14 +274,14 @@
return Ok;
}
- size_t byteSize = (endRead - startRead) * m_bytesPerFrame;
+ size_t byteSize = static_cast<size_t>((endRead - startRead) * m_bytesPerFrame);
- size_t destStartByteOffset = std::max<size_t>(0, (startRead - startRead0) * m_bytesPerFrame);
+ size_t destStartByteOffset = static_cast<size_t>(std::max<uint64_t>(0, (startRead - startRead0) * m_bytesPerFrame));
if (destStartByteOffset > 0)
ZeroABL(list, 0, std::min<size_t>(nFrames * m_bytesPerFrame, destStartByteOffset));
- size_t destEndSize = std::max<size_t>(0, endRead0 - endRead);
+ size_t destEndSize = static_cast<size_t>(std::max<uint64_t>(0, endRead0 - endRead));
if (destEndSize > 0)
ZeroABL(list, destStartByteOffset + byteSize, destEndSize * m_bytesPerFrame);
@@ -309,3 +311,5 @@
}
}
+
+#endif // ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
Modified: trunk/Source/WebCore/platform/audio/mac/CARingBuffer.h (173633 => 173634)
--- trunk/Source/WebCore/platform/audio/mac/CARingBuffer.h 2014-09-15 22:03:46 UTC (rev 173633)
+++ trunk/Source/WebCore/platform/audio/mac/CARingBuffer.h 2014-09-15 22:47:46 UTC (rev 173634)
@@ -26,6 +26,8 @@
#ifndef CARingBuffer_h
#define CARingBuffer_h
+#if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
+
#include <runtime/ArrayBuffer.h>
#include <wtf/ByteSpinLock.h>
#include <wtf/Vector.h>
@@ -90,5 +92,6 @@
}
+#endif // ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
#endif // CARingBuffer_h
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm (173633 => 173634)
--- trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2014-09-15 22:03:46 UTC (rev 173633)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2014-09-15 22:47:46 UTC (rev 173634)
@@ -119,7 +119,7 @@
return;
}
- size_t framesAvailable = endFrame - (m_readCount + m_writeAheadCount);
+ size_t framesAvailable = static_cast<size_t>(endFrame - (m_readCount + m_writeAheadCount));
if (framesAvailable < framesToProcess) {
framesToProcess = framesAvailable;
bus->zero();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
