[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[crogers at google.com]

The following commit has been merged in the debian/experimental branch:
commit 05e5e52efb99e315bcca16c4cc0a672de669b404
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 03:02:37 2010 +0000

    2010-10-27  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Allow AudioDSPKernel to function without an AudioDSPKernelProcessor
            https://bugs.webkit.org/show_bug.cgi?id=48472
    
            No new tests since audio API is not yet implemented.
    
            * platform/audio/AudioDSPKernel.h:
            (WebCore::AudioDSPKernel::AudioDSPKernel):
            (WebCore::AudioDSPKernel::sampleRate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9cb43d9..63a14b4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-27  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Allow AudioDSPKernel to function without an AudioDSPKernelProcessor
+        https://bugs.webkit.org/show_bug.cgi?id=48472
+
+        No new tests since audio API is not yet implemented.
+
+        * platform/audio/AudioDSPKernel.h:
+        (WebCore::AudioDSPKernel::AudioDSPKernel):
+        (WebCore::AudioDSPKernel::sampleRate):
+
 2010-10-27  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/platform/audio/AudioDSPKernel.h b/WebCore/platform/audio/AudioDSPKernel.h
index d9be6dc..d0719c5 100644
--- a/WebCore/platform/audio/AudioDSPKernel.h
+++ b/WebCore/platform/audio/AudioDSPKernel.h
@@ -41,6 +41,13 @@ class AudioDSPKernel {
 public:
     AudioDSPKernel(AudioDSPKernelProcessor* kernelProcessor)
         : m_kernelProcessor(kernelProcessor)
+        , m_sampleRate(kernelProcessor->sampleRate())
+    {
+    }
+
+    AudioDSPKernel(double sampleRate)
+        : m_kernelProcessor(0)
+        , m_sampleRate(sampleRate)
     {
     }
 
@@ -50,7 +57,7 @@ public:
     virtual void process(const float* source, float* destination, size_t framesToProcess) = 0;
     virtual void reset() = 0;
 
-    double sampleRate() const { return processor()->sampleRate(); }
+    double sampleRate() const { return m_sampleRate; }
     double nyquist() const { return 0.5 * sampleRate(); }
 
     AudioDSPKernelProcessor* processor() { return m_kernelProcessor; }
@@ -58,6 +65,7 @@ public:
 
 protected:
     AudioDSPKernelProcessor* m_kernelProcessor;
+    double m_sampleRate;
 };
 
 } // namespace WebCore

-- 
WebKit Debian packaging