[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[crogers at google.com]

The following commit has been merged in the webkit-1.3 branch:
commit 662029660d9022cf72e11b5c9c5e763d8a275df6
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 21 23:06:52 2011 +0000

    2011-01-21  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Add FFTFrameStub to avoid link errors during bringup on platforms without an FFT implementation
            https://bugs.webkit.org/show_bug.cgi?id=52922
    
            No new tests since audio API is not yet implemented.
    
            * WebCore.gypi:
            * platform/audio/FFTFrameStub.cpp: Added.
            (WebCore::FFTFrame::FFTFrame):
            (WebCore::FFTFrame::~FFTFrame):
            (WebCore::FFTFrame::multiply):
            (WebCore::FFTFrame::doFFT):
            (WebCore::FFTFrame::doInverseFFT):
            (WebCore::FFTFrame::cleanup):
            (WebCore::FFTFrame::realData):
            (WebCore::FFTFrame::imagData):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 0488da5..1897fa2 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2011-01-21  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Add FFTFrameStub to avoid link errors during bringup on platforms without an FFT implementation
+        https://bugs.webkit.org/show_bug.cgi?id=52922
+
+        No new tests since audio API is not yet implemented.
+
+        * WebCore.gypi:
+        * platform/audio/FFTFrameStub.cpp: Added.
+        (WebCore::FFTFrame::FFTFrame):
+        (WebCore::FFTFrame::~FFTFrame):
+        (WebCore::FFTFrame::multiply):
+        (WebCore::FFTFrame::doFFT):
+        (WebCore::FFTFrame::doInverseFFT):
+        (WebCore::FFTFrame::cleanup):
+        (WebCore::FFTFrame::realData):
+        (WebCore::FFTFrame::imagData):
+
 2011-01-21  Tony Chang  <tony at chromium.org>
 
         Reviewed by Sam Weinig.
diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index ca3ab04..ca52804 100644
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -2405,6 +2405,7 @@
             'platform/audio/FFTConvolver.cpp',
             'platform/audio/FFTFrame.h',
             'platform/audio/FFTFrame.cpp',
+            'platform/audio/FFTFrameStub.cpp',
             'platform/audio/HRTFDatabase.h',
             'platform/audio/HRTFDatabase.cpp',
             'platform/audio/HRTFDatabaseLoader.h',
diff --git a/Source/WebCore/platform/audio/FFTFrameStub.cpp b/Source/WebCore/platform/audio/FFTFrameStub.cpp
new file mode 100644
index 0000000..17405c9
--- /dev/null
+++ b/Source/WebCore/platform/audio/FFTFrameStub.cpp
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// FFTFrame stub implementation to avoid link errors during bringup
+
+#include "config.h"
+
+#if ENABLE(WEB_AUDIO)
+
+#if !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFTW)
+
+#include "FFTFrame.h"
+
+namespace WebCore {
+
+// Normal constructor: allocates for a given fftSize.
+FFTFrame::FFTFrame(unsigned fftSize)
+    : m_FFTSize(fftSize)
+    , m_log2FFTSize(static_cast<unsigned>(log2(fftSize)))
+{
+    ASSERT_NOT_REACHED();
+}
+
+// Creates a blank/empty frame (interpolate() must later be called).
+FFTFrame::FFTFrame()
+    : m_FFTSize(0)
+    , m_log2FFTSize(0)
+{
+    ASSERT_NOT_REACHED();
+}
+
+// Copy constructor.
+FFTFrame::FFTFrame(const FFTFrame& frame)
+    : m_FFTSize(frame.m_FFTSize)
+    , m_log2FFTSize(frame.m_log2FFTSize)
+{
+    ASSERT_NOT_REACHED();
+}
+
+FFTFrame::~FFTFrame()
+{
+    ASSERT_NOT_REACHED();
+}
+
+void FFTFrame::multiply(const FFTFrame& frame)
+{
+    ASSERT_NOT_REACHED();
+}
+
+void FFTFrame::doFFT(float* data)
+{
+    ASSERT_NOT_REACHED();
+}
+
+void FFTFrame::doInverseFFT(float* data)
+{
+    ASSERT_NOT_REACHED();
+}
+
+void FFTFrame::cleanup()
+{
+    ASSERT_NOT_REACHED();
+}
+
+float* FFTFrame::realData() const
+{
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+float* FFTFrame::imagData() const
+{
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+} // namespace WebCore
+
+#endif // !OS(DARWIN) && !USE(WEBAUDIO_MKL) && !USE(WEBAUDIO_FFTW)
+
+#endif // ENABLE(WEB_AUDIO)

-- 
WebKit Debian packaging