From e9be17995226b445ec9c83b9b21d84b4c87a0838 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Fri, 14 Sep 2018 18:29:11 +0530
Subject: [PATCH] Set default channel count for AnalyserNode to 2

This was deliberately changed
(https://github.com/WebAudio/web-audio-api/pull/1397 ) but the tests
have not been updated
---
 components/script/dom/analysernode.rs         |  2 +-
 tests/wpt/metadata/MANIFEST.json              |  4 ++--
 .../ctor-analyser.html.ini                    | 19 -------------------
 .../ctor-analyser.html                        |  2 +-
 .../test-analysernode.html                    |  8 ++++----
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html.ini

diff --git a/components/script/dom/analysernode.rs b/components/script/dom/analysernode.rs
index 50951021c430..27f2f27b386d 100644
--- a/components/script/dom/analysernode.rs
+++ b/components/script/dom/analysernode.rs
@@ -38,7 +38,7 @@ impl AnalyserNode {
         options: &AnalyserOptions,
     ) -> Fallible<(AnalyserNode, IpcReceiver<Block>)> {
         let node_options = options.parent
-                                  .unwrap_or(1, ChannelCountMode::Max,
+                                  .unwrap_or(2, ChannelCountMode::Max,
                                              ChannelInterpretation::Speakers);
 
         if options.fftSize > 32768 || options.fftSize < 32 ||
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0c1e05dbb222..5cc59d1ac9b1 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -658118,7 +658118,7 @@
    "support"
   ],
   "webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html": [
-   "4e27f842ddeda3e2bdd78da7b8ee3f67062d1a9f",
+   "a9aa4831516c6a5cefa7c8b4f67f3ef246d24777",
    "testharness"
   ],
   "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html": [
@@ -658150,7 +658150,7 @@
    "testharness"
   ],
   "webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html": [
-   "52d3829cff3dfceef64a34669bc8e0d6e08883a9",
+   "a8b5a7154e94479460c1085c6b5cb584e9b6976c",
    "testharness"
   ],
   "webaudio/the-audio-api/the-audiobuffer-interface/.gitkeep": [
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html.ini
deleted file mode 100644
index 5f2600f8dd69..000000000000
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html.ini
+++ /dev/null
@@ -1,19 +0,0 @@
-[ctor-analyser.html]
-  [X node0 = new AnalyserNode(context) incorrectly threw TypeError: "window[name\] is not a constructor".]
-    expected: FAIL
-
-  [X node0.channelCount is not equal to 1. Got 2.]
-    expected: FAIL
-
-  [# AUDIT TASK RUNNER FINISHED: 1 out of 7 tasks were failed.]
-    expected: FAIL
-
-  [< [default constructor\] 2 out of 12 assertions were failed.]
-    expected: FAIL
-
-  [X node0.smoothingTimeConstant is not equal to 0.8. Got 0.800000011920929.]
-    expected: FAIL
-
-  [< [default constructor\] 1 out of 12 assertions were failed.]
-    expected: FAIL
-
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html
index 4e27f842dded..a9aa4831516c 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/ctor-analyser.html
@@ -32,7 +32,7 @@
           prefix: prefix,
           numberOfInputs: 1,
           numberOfOutputs: 1,
-          channelCount: 1,
+          channelCount: 2,
           channelCountMode: 'max',
           channelInterpretation: 'speakers'
         });
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html
index 52d3829cff3d..a8b5a7154e94 100644
--- a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/test-analysernode.html
@@ -27,8 +27,8 @@
 
       assert_equals(
         analyser.channelCount,
-        1,
-        "analyser node has 1 input channels by default"
+        2,
+        "analyser node has 2 input channels by default"
       );
       assert_equals(
         analyser.channelCountMode,
@@ -131,8 +131,8 @@
       var analyser = new AnalyserNode(context);
       assert_equals(
         analyser.channelCount,
-        1,
-        "analyser node has 1 input channels by default"
+        2,
+        "analyser node has 2 input channels by default"
       );
       assert_equals(
         analyser.channelCountMode,