[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 1fc82eafb6bb6e2babbaf974c67fa2074a6698f5
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 9 00:48:16 2010 +0000

    2010-11-08  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Remove obsolete PASSTHROUGH and MATRIXMIX panner mode
            https://bugs.webkit.org/show_bug.cgi?id=49087
    
            No new tests since audio API is not yet implemented.
    
            * platform/audio/Panner.cpp:
            (WebCore::Panner::create):
            * platform/audio/Panner.h:
            * webaudio/AudioPannerNode.h:
            * webaudio/AudioPannerNode.idl:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71586 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 82a8bf8..93b9425 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-08  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Remove obsolete PASSTHROUGH and MATRIXMIX panner mode
+        https://bugs.webkit.org/show_bug.cgi?id=49087
+
+        No new tests since audio API is not yet implemented.
+
+        * platform/audio/Panner.cpp:
+        (WebCore::Panner::create):
+        * platform/audio/Panner.h:
+        * webaudio/AudioPannerNode.h:
+        * webaudio/AudioPannerNode.idl:
+
 2010-11-08  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Roben.
diff --git a/WebCore/platform/audio/Panner.cpp b/WebCore/platform/audio/Panner.cpp
index a300786..5e8efca 100644
--- a/WebCore/platform/audio/Panner.cpp
+++ b/WebCore/platform/audio/Panner.cpp
@@ -34,7 +34,6 @@
 
 #include "EqualPowerPanner.h"
 #include "HRTFPanner.h"
-#include "PassThroughPanner.h"
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
@@ -52,10 +51,6 @@ PassOwnPtr<Panner> Panner::create(PanningModel model, double sampleRate)
         panner = adoptPtr(new HRTFPanner(sampleRate));
         break;
 
-    case PanningModelPassthrough:
-        panner = adoptPtr(new PassThroughPanner());
-        break;
-
     // FIXME: sound field panning is not yet implemented...
     case PanningModelSoundField:
     default:
diff --git a/WebCore/platform/audio/Panner.h b/WebCore/platform/audio/Panner.h
index c8e219b..b57ceda 100644
--- a/WebCore/platform/audio/Panner.h
+++ b/WebCore/platform/audio/Panner.h
@@ -40,10 +40,9 @@ class AudioBus;
 class Panner {
 public:
     enum {
-        PanningModelPassthrough = 0,
-        PanningModelEqualPower = 1,
-        PanningModelHRTF = 2,
-        PanningModelSoundField = 3
+        PanningModelEqualPower = 0,
+        PanningModelHRTF = 1,
+        PanningModelSoundField = 2
     };
     
     typedef unsigned PanningModel;
diff --git a/WebCore/webaudio/AudioPannerNode.h b/WebCore/webaudio/AudioPannerNode.h
index 6d0d759..4d49bc8 100644
--- a/WebCore/webaudio/AudioPannerNode.h
+++ b/WebCore/webaudio/AudioPannerNode.h
@@ -46,12 +46,11 @@ namespace WebCore {
 
 class AudioPannerNode : public AudioNode {
 public:
+    // These must be defined as in the .idl file and must match those in the Panner class.
     enum {
-        PASSTHROUGH = 0,
-        EQUALPOWER = 1,
-        HRTF = 2,
-        SOUNDFIELD = 3,
-        MATRIXMIX = 4
+        EQUALPOWER = 0,
+        HRTF = 1,
+        SOUNDFIELD = 2,
     };
 
     static PassRefPtr<AudioPannerNode> create(AudioContext* context, double sampleRate)
diff --git a/WebCore/webaudio/AudioPannerNode.idl b/WebCore/webaudio/AudioPannerNode.idl
index 595a603..2db093d 100644
--- a/WebCore/webaudio/AudioPannerNode.idl
+++ b/WebCore/webaudio/AudioPannerNode.idl
@@ -29,10 +29,9 @@ module audio {
         GenerateToJS
     ] AudioPannerNode : AudioNode {
         // Panning model
-        const unsigned short PASSTHROUGH = 0;
-        const unsigned short EQUALPOWER = 1;
-        const unsigned short HRTF = 2;
-        const unsigned short SOUNDFIELD = 3;
+        const unsigned short EQUALPOWER = 0;
+        const unsigned short HRTF = 1;
+        const unsigned short SOUNDFIELD = 2;
 
         // Default model for stereo is HRTF 
         attribute unsigned long panningModel; // FIXME: use unsigned short when glue generation supports it

-- 
WebKit Debian packaging