Diff
Modified: trunk/LayoutTests/ChangeLog (202644 => 202645)
--- trunk/LayoutTests/ChangeLog 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/LayoutTests/ChangeLog 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,3 +1,16 @@
+2016-06-29 Ryan Haddad <ryanhad...@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.no...@apple.com>
Cannot clear a MediaSource SourceBuffer in Safari 9 and WebKit nightly
Deleted: trunk/LayoutTests/webaudio/convolver-channels-expected.txt (202644 => 202645)
--- trunk/LayoutTests/webaudio/convolver-channels-expected.txt 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/LayoutTests/webaudio/convolver-channels-expected.txt 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,41 +0,0 @@
-Test Supported Number of Channels for ConvolverNode
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS ConvolverNode with buffer of 1 channels did not throw exception.
-PASS ConvolverNode with buffer of 2 channels did not throw exception.
-PASS ConvolverNode with buffer of 3 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 4 channels did not throw exception.
-PASS ConvolverNode with buffer of 5 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 6 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 7 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 8 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 9 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 10 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 11 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 12 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 13 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 14 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 15 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 16 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 17 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 18 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 19 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 20 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 21 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 22 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 23 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 24 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 25 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 26 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 27 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 28 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 29 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 30 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 31 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS ConvolverNode with buffer of 32 channels threw exception Error: NotSupportedError: DOM Exception 9.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/webaudio/convolver-channels.html (202644 => 202645)
--- trunk/LayoutTests/webaudio/convolver-channels.html 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/LayoutTests/webaudio/convolver-channels.html 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,42 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<script src=""
-<script src=""
-<script src=""
-<title>Test Supported Number of Channels for ConvolverNode</title>
-</head>
-<body>
-<script>
-description("Test Supported Number of Channels for ConvolverNode");
-window.jsTestIsAsync = true;
-
-function runTest() {
- // Just need a context to create nodes on, so any allowed length and rate is ok.
- var context = new OfflineAudioContext(1, 1, 48000);
-
- for (var count = 1; count <= 32; ++count) {
- var convolver = context.createConvolver();
- var buffer = context.createBuffer(count, 1, context.sampleRate);
- var message = "ConvolverNode with buffer of " + count + " channels";
-
- if (count == 1 || count == 2 || count == 4) {
- // These are the only valid channel counts for the buffer.
- shouldNotThrow(function () {
- convolver.buffer = buffer;
- }, message);
- } else {
- shouldThrow(function() {
- convolver.buffer = buffer;
- }, "'Error: NotSupportedError: DOM Exception 9'", message);
- }
- }
-
- finishJSTest();
-}
-
-runTest();
-successfullyParsed = true;
-</script>
-</body>
-</html>
Deleted: trunk/LayoutTests/webaudio/resources/compatibility.js (202644 => 202645)
--- trunk/LayoutTests/webaudio/resources/compatibility.js 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/LayoutTests/webaudio/resources/compatibility.js 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,8 +0,0 @@
-// This will prevent work to update tests to use unprefixed objects in
-// the future. It wll also make it possible to bisect builds using
-// a WebKit that only supports prefixed objects.
-
-if (window.hasOwnProperty('webkitAudioContext') && !window.hasOwnProperty('AudioContext')) {
- window.AudioContext = webkitAudioContext;
- window.OfflineAudioContext = webkitOfflineAudioContext;
-}
Modified: trunk/Source/WebCore/ChangeLog (202644 => 202645)
--- trunk/Source/WebCore/ChangeLog 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/Source/WebCore/ChangeLog 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,3 +1,16 @@
+2016-06-29 Ryan Haddad <ryanhad...@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 <ander...@apple.com>
Rename addressFields to contactFields
Modified: trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp (202644 => 202645)
--- trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-06-29 20:14:30 UTC (rev 202644)
+++ trunk/Source/WebCore/Modules/webaudio/ConvolverNode.cpp 2016-06-29 20:17:44 UTC (rev 202645)
@@ -1,6 +1,5 @@
/*
* 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
* modification, are permitted provided that the following conditions
@@ -132,14 +131,11 @@
unsigned numberOfChannels = buffer->numberOfChannels();
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().
// This memory is simply used in the Reverb constructor and no reference to it is kept for later use in that class.
