Title: [145662] branches/safari-536.30-branch/Source/WebCore
- Revision
- 145662
- Author
- [email protected]
- Date
- 2013-03-12 18:35:20 -0700 (Tue, 12 Mar 2013)
Log Message
Merged r140879. <rdar://problem/13334945>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (145661 => 145662)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 01:33:33 UTC (rev 145661)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-03-13 01:35:20 UTC (rev 145662)
@@ -1,5 +1,21 @@
2013-03-12 Lucas Forschler <[email protected]>
+ Merge r140879
+
+ 2013-01-25 Raymond Toy <[email protected]>
+
+ Don't subtract too much from nonSilentFramesToProcess
+ https://bugs.webkit.org/show_bug.cgi?id=107966
+
+ Reviewed by Kenneth Russell.
+
+ No new tests.
+
+ * Modules/webaudio/AudioScheduledSourceNode.cpp:
+ (WebCore::AudioScheduledSourceNode::updateSchedulingInfo):
+
+2013-03-12 Lucas Forschler <[email protected]>
+
Merge r140520
2013-01-23 Hajime Morrita <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp (145661 => 145662)
--- branches/safari-536.30-branch/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2013-03-13 01:33:33 UTC (rev 145661)
+++ branches/safari-536.30-branch/Source/WebCore/Modules/webaudio/AudioScheduledSourceNode.cpp 2013-03-13 01:35:20 UTC (rev 145662)
@@ -117,7 +117,11 @@
ASSERT(isSafe);
if (isSafe) {
- nonSilentFramesToProcess -= framesToZero;
+ if (framesToZero > nonSilentFramesToProcess)
+ nonSilentFramesToProcess = 0;
+ else
+ nonSilentFramesToProcess -= framesToZero;
+
for (unsigned i = 0; i < outputBus->numberOfChannels(); ++i)
memset(outputBus->channel(i)->mutableData() + zeroStartFrame, 0, sizeof(float) * framesToZero);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
