Changeset 269081 in webkit

Timestamp:

Oct 27, 2020 5:06:03 PM (21 months ago)

Author:

Chris Dumez

Message:

AudioBuffer.getChannelData(x) should keep returning the same JS wrapper for a given channel
​https://bugs.webkit.org/show_bug.cgi?id=218265

Reviewed by Geoff Garen.

LayoutTests/imported/w3c:

Rebaseline WPT test that is now fully passing. I have verified that this test passes in Chrome and Firefox
as well.

• web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData-expected.txt:

Source/WebCore:

AudioBuffer.getChannelData(x) should keep returning the same JS wrapper for a given channel.
This is the behavior of Chrome & Firefox and is covered by Web-Platform-Tests.

No new tests, rebaselined existing test.

• Modules/webaudio/AudioBuffer.cpp:

(WebCore::AudioBuffer::AudioBuffer):
(WebCore::AudioBuffer::releaseMemory):
(WebCore::AudioBuffer::getChannelData):
(WebCore::AudioBuffer::visitChannelWrappers):

• Modules/webaudio/AudioBuffer.h:
• Modules/webaudio/AudioBuffer.idl:
• Sources.txt:
• WebCore.xcodeproj/project.pbxproj:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webaudio/AudioBuffer.cpp (modified) (3 diffs)
• Source/WebCore/Modules/webaudio/AudioBuffer.h (modified) (4 diffs)
• Source/WebCore/Modules/webaudio/AudioBuffer.idl (modified) (2 diffs)
• Source/WebCore/Sources.txt (modified) (1 diff)
• Source/WebCore/WebCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• Source/WebCore/bindings/js/JSAudioBufferCustom.cpp (added)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        AudioBuffer.getChannelData(x) should keep returning the same JS wrapper for a given channel
+        https://bugs.webkit.org/show_bug.cgi?id=218265
+
+        Reviewed by Geoff Garen.
+
+        Rebaseline WPT test that is now fully passing. I have verified that this test passes in Chrome and Firefox
+        as well.
+
+        * web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData-expected.txt:
+
 2020-10-27  Noam Rosenthal  <noam@webkit.org>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData-expected.txt

@@ -5 +5 @@
 PASS Audit report
 PASS > [buffer-eq]
-FAIL X buffer.getChannelData(0) === buffer.getChannelData(0) is not equal to true. Got false. assert_true: expected true got false
-FAIL X buffer.getChannelData(1) === buffer.getChannelData(1) is not equal to true. Got false. assert_true: expected true got false
-FAIL < [buffer-eq] 2 out of 2 assertions were failed. assert_true: expected true got false
+PASS   buffer.getChannelData(0) === buffer.getChannelData(0) is equal to true.
+PASS   buffer.getChannelData(1) === buffer.getChannelData(1) is equal to true.
+PASS < [buffer-eq] All assertions passed. (total 2 assertions)
 PASS > [buffer-not-eq]
 PASS   buffer1.getChannelData(0) === buffer2.getChannelData(0) is equal to false.
 PASS   buffer1.getChannelData(1) === buffer2.getChannelData(1) is equal to false.
 PASS < [buffer-not-eq] All assertions passed. (total 2 assertions)
-FAIL # AUDIT TASK RUNNER FINISHED: 1 out of 2 tasks were failed. assert_true: expected true got false
+PASS # AUDIT TASK RUNNER FINISHED: 2 tasks ran successfully.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-27  Chris Dumez  <cdumez@apple.com>
+
+        AudioBuffer.getChannelData(x) should keep returning the same JS wrapper for a given channel
+        https://bugs.webkit.org/show_bug.cgi?id=218265
+
+        Reviewed by Geoff Garen.
+
+        AudioBuffer.getChannelData(x) should keep returning the same JS wrapper for a given channel.
+        This is the behavior of Chrome & Firefox and is covered by Web-Platform-Tests.
+
+        No new tests, rebaselined existing test.
+
+        * Modules/webaudio/AudioBuffer.cpp:
+        (WebCore::AudioBuffer::AudioBuffer):
+        (WebCore::AudioBuffer::releaseMemory):
+        (WebCore::AudioBuffer::getChannelData):
+        (WebCore::AudioBuffer::visitChannelWrappers):
+        * Modules/webaudio/AudioBuffer.h:
+        * Modules/webaudio/AudioBuffer.idl:
+        * Sources.txt:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2020-10-27  Brent Fulgham  <bfulgham@apple.com>
 

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

@@ -98 +98 @@
         m_channels.append(WTFMove(channelDataArray));
     }
+    m_channelWrappers.resize(m_channels.size());
 }
 
@@ -118 +119 @@
         m_channels.append(WTFMove(channelDataArray));
     }
+    m_channelWrappers.resize(m_channels.size());
 }
 
@@ -130 +132 @@
     auto locker = holdLock(m_channelsLock);
     m_channels.clear();
-}
-
-ExceptionOr<Ref<Float32Array>> AudioBuffer::getChannelData(unsigned channelIndex)
-{
-    if (channelIndex >= m_channels.size())
+    m_channelWrappers.clear();
+}
+
+ExceptionOr<JSC::JSValue> AudioBuffer::getChannelData(JSDOMGlobalObject& globalObject, unsigned channelIndex)
+{
+    ASSERT(m_channelWrappers.size() == m_channels.size());
+    if (channelIndex >= m_channelWrappers.size())
         return Exception { IndexSizeError, "Index must be less than number of channels."_s };
-    auto& channelData = *m_channels[channelIndex];
-    return Float32Array::create(channelData.unsharedBuffer(), channelData.byteOffset(), channelData.length());
+
+    auto& channelData = m_channels[channelIndex];
+    auto constructJSArray = [&] {
+        return JSC::JSFloat32Array::create(globalObject.vm(), globalObject.typedArrayStructure(JSC::TypeFloat32), channelData.copyRef());
+    };
+
+    if (globalObject.worldIsNormal()) {
+        if (!m_channelWrappers[channelIndex])
+            m_channelWrappers[channelIndex] = { constructJSArray() };
+        return static_cast<JSC::JSValue>(m_channelWrappers[channelIndex]);
+    }
+    return constructJSArray();
+}
+
+void AudioBuffer::visitChannelWrappers(JSC::SlotVisitor& visitor)
+{
+    for (auto& channelWrapper : m_channelWrappers)
+        channelWrapper.visit(visitor);
 }
 

trunk/Source/WebCore/Modules/webaudio/AudioBuffer.h

@@ -32 +32 @@
 #include "AudioBufferOptions.h"
 #include "ExceptionOr.h"
+#include "JSValueInWrappedObject.h"
 #include <JavaScriptCore/Float32Array.h>
 #include <wtf/Lock.h>
@@ -54 +55 @@
     // Channel data access
     unsigned numberOfChannels() const { return m_channels.size(); }
-    ExceptionOr<Ref<Float32Array>> getChannelData(unsigned channelIndex);
+    ExceptionOr<JSC::JSValue> getChannelData(JSDOMGlobalObject&, unsigned channelIndex);
     ExceptionOr<void> copyFromChannel(Ref<Float32Array>&&, unsigned channelNumber, unsigned bufferOffset);
     ExceptionOr<void> copyToChannel(Ref<Float32Array>&&, unsigned channelNumber, unsigned startInChannel);
@@ -66 +67 @@
 
     size_t memoryCost() const;
+
+    void visitChannelWrappers(JSC::SlotVisitor&);
     
 private:
@@ -77 +80 @@
     size_t m_length;
     Vector<RefPtr<Float32Array>> m_channels;
+    Vector<JSValueInWrappedObject> m_channelWrappers;
 };
 

trunk/Source/WebCore/Modules/webaudio/AudioBuffer.idl

@@ -30 +30 @@
     Conditional=WEB_AUDIO,
     ImplementationLacksVTable,
+    JSCustomMarkFunction,
     JSGenerateToJSObject,
     ReportExtraMemoryCost,
@@ -41 +42 @@
 
     // Channel access
-    [MayThrowException] Float32Array getChannelData(unsigned long channelIndex);
+    [MayThrowException, CallWith=GlobalObject] any getChannelData(unsigned long channelIndex);
     [MayThrowException, EnabledBySetting=ModernUnprefixedWebAudio] undefined copyFromChannel(Float32Array destination, unsigned long channelNumber, optional unsigned long bufferOffset = 0);
     [MayThrowException, EnabledBySetting=ModernUnprefixedWebAudio] undefined copyToChannel(Float32Array source, unsigned long channelNumber, optional unsigned long bufferOffset = 0);

trunk/Source/WebCore/Sources.txt

@@ -481 +481 @@
 bindings/js/JSAnimationTimelineCustom.cpp
 bindings/js/JSAttrCustom.cpp
+bindings/js/JSAudioBufferCustom.cpp
 bindings/js/JSAudioTrackCustom.cpp
 bindings/js/JSAudioTrackListCustom.cpp

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -8026 +8026 @@
                 46C3765F2085176C00C73829 /* JSRemoteDOMWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRemoteDOMWindow.cpp; sourceTree = "<group>"; };
                 46C376612085176D00C73829 /* JSRemoteDOMWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRemoteDOMWindow.h; sourceTree = "<group>"; };
+                46C3A8D32548D4B700C8C53A /* JSAudioBufferCustom.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSAudioBufferCustom.cpp; sourceTree = "<group>"; };
                 46C696C91E7205E400597937 /* CPUMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPUMonitor.h; sourceTree = "<group>"; };
                 46C696CA1E7205E400597937 /* CPUMonitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CPUMonitor.cpp; sourceTree = "<group>"; };
@@ -22328 +22329 @@
                                 71025ED51F99F147004A250C /* JSAnimationTimelineCustom.cpp */,
                                 BC2ED6BB0C6BD2F000920BFF /* JSAttrCustom.cpp */,
+                                46C3A8D32548D4B700C8C53A /* JSAudioBufferCustom.cpp */,
                                 BE6DF70E171CA2DA00DD52B8 /* JSAudioTrackCustom.cpp */,
                                 BE6DF710171CA2DA00DD52B8 /* JSAudioTrackListCustom.cpp */,