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

[crogers at google.com]

The following commit has been merged in the debian/experimental branch:
commit 8e1948027ca7a1d11cfb09f83cf0182231b1b6c4
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 3 21:38:16 2010 +0000

    2010-12-03  Chris Rogers  <crogers at google.com>
    
            Unreviewed build fix.
    
            Fix M_E compile error on Chromium Win
            https://bugs.webkit.org/show_bug.cgi?id=50479
    
            * platform/audio/AudioUtilities.cpp:
            (WebCore::AudioUtilities::discreteTimeConstantForSampleRate):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73294 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ec36439..fbd5794 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed build fix.
 
+        Fix M_E compile error on Chromium Win
+        https://bugs.webkit.org/show_bug.cgi?id=50479
+
+        * platform/audio/AudioUtilities.cpp:
+        (WebCore::AudioUtilities::discreteTimeConstantForSampleRate):
+
+2010-12-03  Chris Rogers  <crogers at google.com>
+
+        Unreviewed build fix.
+
         Try to fix GTK build due to recent web audio makefile changes (disable ENABLE_WEB_AUDIO explicitly)
         https://bugs.webkit.org/show_bug.cgi?id=50478
 
diff --git a/WebCore/platform/audio/AudioUtilities.cpp b/WebCore/platform/audio/AudioUtilities.cpp
index 32f4335..7a4b32e 100644
--- a/WebCore/platform/audio/AudioUtilities.cpp
+++ b/WebCore/platform/audio/AudioUtilities.cpp
@@ -24,9 +24,10 @@
 
 #include "config.h"
 
-#include "AudioUtilities.h"
+#if ENABLE(WEB_AUDIO)
 
-#include <math.h>
+#include "AudioUtilities.h"
+#include <wtf/MathExtras.h>
 
 namespace WebCore {
 
@@ -50,9 +51,13 @@ double linearToDecibels(double linear)
 
 double discreteTimeConstantForSampleRate(double timeConstant, double sampleRate)
 {
-    return 1.0 - pow(1.0 / M_E, 1.0 / (sampleRate * timeConstant));
+    // hardcoded value is temporary build fix for Windows.
+    // FIXME: replace hardcode 2.718282 with M_E until the correct MathExtras.h solution is determined.
+    return 1.0 - pow(1.0 / 2.718282, 1.0 / (sampleRate * timeConstant));
 }
     
 } // AudioUtilites
 
 } // WebCore
+
+#endif // ENABLE(WEB_AUDIO)

-- 
WebKit Debian packaging