[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 262aa438e90684609dbc39a2be947d9120006dcd
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 02:49:23 2010 +0000

    2010-11-11  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Fix Accelerate.framework issues in VectorMath 32-bit ppc & i386 vs. other architectures (64-bit, ARM, etc.).
            On the Mac we use the highly optimized versions in Accelerate.framework
            In 32-bit mode (__ppc__ or __i386__) <Accelerate/Accelerate.h> includes <vecLib/vDSP_translate.h> which defines macros
            of the same name as our namespaced function names, so we must handle this case differently.
            Other architectures (64bit, ARM, etc.) do not include this header file.
    
            https://bugs.webkit.org/show_bug.cgi?id=49112
    
            No new tests since audio API is not yet implemented.
    
            * platform/audio/VectorMath.cpp:
            (WebCore::VectorMath::vsmul):
            (WebCore::VectorMath::vadd):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71877 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 10e84d5..338c4d7 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-11-11  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Fix Accelerate.framework issues in VectorMath 32-bit ppc & i386 vs. other architectures (64-bit, ARM, etc.).
+        On the Mac we use the highly optimized versions in Accelerate.framework
+        In 32-bit mode (__ppc__ or __i386__) <Accelerate/Accelerate.h> includes <vecLib/vDSP_translate.h> which defines macros
+        of the same name as our namespaced function names, so we must handle this case differently.
+        Other architectures (64bit, ARM, etc.) do not include this header file.
+        
+        https://bugs.webkit.org/show_bug.cgi?id=49112
+
+        No new tests since audio API is not yet implemented.
+
+        * platform/audio/VectorMath.cpp:
+        (WebCore::VectorMath::vsmul):
+        (WebCore::VectorMath::vadd):
+
 2010-11-11  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/audio/VectorMath.cpp b/WebCore/platform/audio/VectorMath.cpp
index faf5431..64e192b 100644
--- a/WebCore/platform/audio/VectorMath.cpp
+++ b/WebCore/platform/audio/VectorMath.cpp
@@ -38,15 +38,25 @@ namespace VectorMath {
 
 #if OS(DARWIN)
 // On the Mac we use the highly optimized versions in Accelerate.framework
+// In 32-bit mode (__ppc__ or __i386__) <Accelerate/Accelerate.h> includes <vecLib/vDSP_translate.h> which defines macros of the same name as
+// our namespaced function names, so we must handle this case differently.  Other architectures (64bit, ARM, etc.) do not include this header file.
 
 void vsmul(const float* sourceP, int sourceStride, const float* scale, float* destP, int destStride, size_t framesToProcess)
 {
+#if defined(__ppc__) || defined(__i386__)
+    ::vsmul(sourceP, sourceStride, scale, destP, destStride, framesToProcess);
+#else
     vDSP_vsmul(sourceP, sourceStride, scale, destP, destStride, framesToProcess);
+#endif
 }
 
 void vadd(const float* source1P, int sourceStride1, const float* source2P, int sourceStride2, float* destP, int destStride, size_t framesToProcess)
 {
+#if defined(__ppc__) || defined(__i386__)
+    ::vadd(source1P, sourceStride1, source2P, sourceStride2, destP, destStride, framesToProcess);
+#else
     vDSP_vadd(source1P, sourceStride1, source2P, sourceStride2, destP, destStride, framesToProcess);
+#endif
 }
 
 #else

-- 
WebKit Debian packaging