Changeset 202645 in webkit

Timestamp:

Jun 29, 2016 1:17:44 PM (8 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r202617.

The LayoutTest from this change crashes under GuardMalloc

Reverted changeset:

"Throw exceptions for invalid number of channels for
ConvolverNode"
​https://bugs.webkit.org/show_bug.cgi?id=159238
​http://trac.webkit.org/changeset/202617

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webaudio/convolver-channels-expected.txt (deleted)
• LayoutTests/webaudio/convolver-channels.html (deleted)
• LayoutTests/webaudio/resources/compatibility.js (deleted)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/ConvolverNode.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-29  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r202617.
+
+        The LayoutTest from this change crashes under GuardMalloc
+
+        Reverted changeset:
+
+        "Throw exceptions for invalid number of channels for
+        ConvolverNode"
+        https://bugs.webkit.org/show_bug.cgi?id=159238
+        http://trac.webkit.org/changeset/202617
+
 2016-06-29  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-29  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r202617.
+
+        The LayoutTest from this change crashes under GuardMalloc
+
+        Reverted changeset:
+
+        "Throw exceptions for invalid number of channels for
+        ConvolverNode"
+        https://bugs.webkit.org/show_bug.cgi?id=159238
+        http://trac.webkit.org/changeset/202617
+
 2016-06-29  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2010, Google Inc. All rights reserved.
- * Copyright (C) 2016, Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -133 +132 @@
     size_t bufferLength = buffer->length();
 
-    // The current implementation supports only 1-, 2-, or 4-channel impulse responses, with the
-    // 4-channel response being interpreted as true-stereo (see Reverb class).
-    bool isChannelCountGood = numberOfChannels == 1 || numberOfChannels == 2 || numberOfChannels == 4;
-
-    if (!isChannelCountGood) {
-        ec = NOT_SUPPORTED_ERR;
+    // The current implementation supports up to four channel impulse responses, which are interpreted as true-stereo (see Reverb class).
+    bool isBufferGood = numberOfChannels > 0 && numberOfChannels <= 4 && bufferLength;
+    ASSERT(isBufferGood);
+    if (!isBufferGood)
         return;
-    }
 
     // Wrap the AudioBuffer by an AudioBus. It's an efficient pointer set and not a memcpy().