Diff
Modified: trunk/Source/WebCore/ChangeLog (265292 => 265293)
--- trunk/Source/WebCore/ChangeLog 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/ChangeLog 2020-08-05 17:51:47 UTC (rev 265293)
@@ -1,5 +1,48 @@
2020-08-05 Chris Dumez <[email protected]>
+ REGRESSION (r265266) DumpRenderTree crash at WebKitAudioListener::dopplerFactor
+ https://bugs.webkit.org/show_bug.cgi?id=215171
+ <rdar://problem/66556999>
+
+ Reviewed by Eric Carlson.
+
+ We were calling the isWebKitAudioContext() virtual function from the BaseAudioContext
+ constructor, which was not OK. We now initialize the listener lazily so that we can
+ know if we are a WebKitAudioContext or not at the time of creation.
+
+ Also use downcast<> instead of static_cast<> to cast from AudioListener to
+ WebKitAudioListener for extra safety. Finally, AudioListener was missing a virtual
+ destructor even though we were using polymorphism.
+
+ No new tests, covered by existing tests that are crashing on the bots.
+
+ * Modules/webaudio/AudioListener.h:
+ (WebCore::AudioListener::isWebKitAudioListener const):
+ * Modules/webaudio/AudioListener.idl:
+ * Modules/webaudio/BaseAudioContext.cpp:
+ (WebCore::BaseAudioContext::constructCommon):
+ (WebCore::WebCore::BaseAudioContext::listener):
+ * Modules/webaudio/BaseAudioContext.h:
+ (WebCore::BaseAudioContext::listener): Deleted.
+ * Modules/webaudio/PannerNode.cpp:
+ (WebCore::PannerNode::listener):
+ (WebCore::PannerNode::getAzimuthElevation):
+ (WebCore::PannerNode::distanceConeGain):
+ * Modules/webaudio/PannerNode.h:
+ * Modules/webaudio/WebKitAudioContext.h:
+ (WebCore::WebKitAudioContext::listener):
+ * Modules/webaudio/WebKitAudioListener.h:
+ (isType):
+ * Modules/webaudio/WebKitAudioListener.idl:
+ * Modules/webaudio/WebKitAudioPannerNode.cpp:
+ (WebCore::WebKitAudioPannerNode::listener):
+ (WebCore::WebKitAudioPannerNode::getAzimuthElevation):
+ (WebCore::WebKitAudioPannerNode::dopplerRate):
+ (WebCore::WebKitAudioPannerNode::distanceConeGain):
+ * Modules/webaudio/WebKitAudioPannerNode.h:
+
+2020-08-05 Chris Dumez <[email protected]>
+
Align BiquadFilterNode.getFrequencyResponse() with the specification
https://bugs.webkit.org/show_bug.cgi?id=215148
Modified: trunk/Source/WebCore/Modules/webaudio/AudioListener.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/AudioListener.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/AudioListener.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -46,7 +46,7 @@
{
return adoptRef(*new AudioListener(context));
}
- ~AudioListener();
+ virtual ~AudioListener();
AudioParam& positionX() { return m_positionX.get(); }
AudioParam& positionY() { return m_positionY.get(); }
@@ -68,6 +68,8 @@
FloatPoint3D upVector() const;
+ virtual bool isWebKitAudioListener() const { return false; }
+
protected:
explicit AudioListener(BaseAudioContext&);
Modified: trunk/Source/WebCore/Modules/webaudio/AudioListener.idl (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/AudioListener.idl 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/AudioListener.idl 2020-08-05 17:51:47 UTC (rev 265293)
@@ -29,7 +29,6 @@
[
Conditional=WEB_AUDIO,
- ImplementationLacksVTable,
EnabledBySetting=ModernUnprefixedWebAudio,
] interface AudioListener {
readonly attribute AudioParam positionX;
Modified: trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.cpp 2020-08-05 17:51:47 UTC (rev 265293)
@@ -159,11 +159,6 @@
void BaseAudioContext::constructCommon()
{
FFTFrame::initialize();
-
- if (isWebKitAudioContext())
- m_listener = WebKitAudioListener::create(*this);
- else
- m_listener = AudioListener::create(*this);
ASSERT(document());
if (document()->audioPlaybackRequiresUserGesture())
@@ -411,6 +406,17 @@
m_audioDecoder->decodeAsync(WTFMove(audioData), sampleRate(), WTFMove(successCallback), WTFMove(errorCallback));
}
+AudioListener& WebCore::BaseAudioContext::listener()
+{
+ if (!m_listener) {
+ if (isWebKitAudioContext())
+ m_listener = WebKitAudioListener::create(*this);
+ else
+ m_listener = AudioListener::create(*this);
+ }
+ return *m_listener;
+}
+
ExceptionOr<Ref<AudioBufferSourceNode>> BaseAudioContext::createBufferSource()
{
ALWAYS_LOG(LOGIDENTIFIER);
Modified: trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/BaseAudioContext.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -128,7 +128,7 @@
// Asynchronous audio file data decoding.
void decodeAudioData(Ref<ArrayBuffer>&&, RefPtr<AudioBufferCallback>&&, RefPtr<AudioBufferCallback>&&);
- AudioListener* listener() { return m_listener.get(); }
+ AudioListener& listener();
void suspendRendering(DOMPromiseDeferred<void>&&);
void resumeRendering(DOMPromiseDeferred<void>&&);
Modified: trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/PannerNode.cpp 2020-08-05 17:51:47 UTC (rev 265293)
@@ -221,7 +221,7 @@
AudioNode::uninitialize();
}
-AudioListener* PannerNode::listener()
+AudioListener& PannerNode::listener()
{
return context().listener();
}
@@ -332,7 +332,7 @@
double azimuth = 0.0;
// Calculate the source-listener vector
- FloatPoint3D listenerPosition = listener()->position();
+ FloatPoint3D listenerPosition = listener().position();
FloatPoint3D sourceListener = position() - listenerPosition;
if (sourceListener.isZero()) {
@@ -345,8 +345,8 @@
sourceListener.normalize();
// Align axes
- FloatPoint3D listenerFront = listener()->orientation();
- FloatPoint3D listenerUp = listener()->upVector();
+ FloatPoint3D listenerFront = listener().orientation();
+ FloatPoint3D listenerUp = listener().upVector();
FloatPoint3D listenerRight = listenerFront.cross(listenerUp);
listenerRight.normalize();
@@ -396,7 +396,7 @@
float PannerNode::distanceConeGain()
{
- FloatPoint3D listenerPosition = listener()->position();
+ FloatPoint3D listenerPosition = listener().position();
FloatPoint3D sourcePosition = position();
double listenerDistance = sourcePosition.distanceTo(listenerPosition);
Modified: trunk/Source/WebCore/Modules/webaudio/PannerNode.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/PannerNode.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/PannerNode.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -79,7 +79,7 @@
void uninitialize() override;
// Listener
- AudioListener* listener();
+ AudioListener& listener();
// Panning model
PanningModelType panningModel() const { return m_panningModel; }
Modified: trunk/Source/WebCore/Modules/webaudio/WebKitAudioContext.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/WebKitAudioContext.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/WebKitAudioContext.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -55,7 +55,7 @@
void close(DOMPromiseDeferred<void>&&);
- WebKitAudioListener* listener() { return static_cast<WebKitAudioListener*>(BaseAudioContext::listener()); }
+ WebKitAudioListener& listener() { return downcast<WebKitAudioListener>(BaseAudioContext::listener()); }
// The AudioNode create methods are called on the main thread (from _javascript_).
#if ENABLE(VIDEO)
Modified: trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -58,6 +58,8 @@
, m_velocity(0, 0, 0)
{ }
+ bool isWebKitAudioListener() const final { return true; }
+
FloatPoint3D m_velocity;
double m_dopplerFactor { 1.0 };
double m_speedOfSound { 343.3 };
@@ -64,3 +66,7 @@
};
} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::WebKitAudioListener)
+ static bool isType(const WebCore::AudioListener& listener) { return listener.isWebKitAudioListener(); }
+SPECIALIZE_TYPE_TRAITS_END()
Modified: trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.idl (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.idl 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/WebKitAudioListener.idl 2020-08-05 17:51:47 UTC (rev 265293)
@@ -28,7 +28,6 @@
[
Conditional=WEB_AUDIO,
- ImplementationLacksVTable,
EnabledBySetting=PrefixedWebAudio,
NoInterfaceObject,
] interface WebKitAudioListener {
Modified: trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.cpp (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.cpp 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.cpp 2020-08-05 17:51:47 UTC (rev 265293)
@@ -173,7 +173,7 @@
AudioNode::uninitialize();
}
-WebKitAudioListener* WebKitAudioPannerNode::listener()
+WebKitAudioListener& WebKitAudioPannerNode::listener()
{
return context().listener();
}
@@ -206,7 +206,7 @@
double azimuth = 0.0;
// Calculate the source-listener vector
- FloatPoint3D listenerPosition = listener()->position();
+ FloatPoint3D listenerPosition = listener().position();
FloatPoint3D sourceListener = position() - listenerPosition;
if (sourceListener.isZero()) {
@@ -219,8 +219,8 @@
sourceListener.normalize();
// Align axes
- FloatPoint3D listenerFront = listener()->orientation();
- FloatPoint3D listenerUp = listener()->upVector();
+ FloatPoint3D listenerFront = listener().orientation();
+ FloatPoint3D listenerUp = listener().upVector();
FloatPoint3D listenerRight = listenerFront.cross(listenerUp);
listenerRight.normalize();
@@ -268,13 +268,13 @@
double dopplerShift = 1.0;
// FIXME: optimize for case when neither source nor listener has changed...
- double dopplerFactor = listener()->dopplerFactor();
+ double dopplerFactor = listener().dopplerFactor();
if (dopplerFactor > 0.0) {
- double speedOfSound = listener()->speedOfSound();
+ double speedOfSound = listener().speedOfSound();
- const FloatPoint3D &sourceVelocity = m_velocity;
- const FloatPoint3D &listenerVelocity = listener()->velocity();
+ const FloatPoint3D& sourceVelocity = m_velocity;
+ const FloatPoint3D& listenerVelocity = listener().velocity();
// Don't bother if both source and listener have no velocity
bool sourceHasVelocity = !sourceVelocity.isZero();
@@ -282,7 +282,7 @@
if (sourceHasVelocity || listenerHasVelocity) {
// Calculate the source to listener vector
- FloatPoint3D listenerPosition = listener()->position();
+ FloatPoint3D listenerPosition = listener().position();
FloatPoint3D sourceToListener = position() - listenerPosition;
double sourceListenerMagnitude = sourceToListener.length();
@@ -313,7 +313,7 @@
float WebKitAudioPannerNode::distanceConeGain()
{
- FloatPoint3D listenerPosition = listener()->position();
+ FloatPoint3D listenerPosition = listener().position();
FloatPoint3D sourcePosition = position();
double listenerDistance = sourcePosition.distanceTo(listenerPosition);
Modified: trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.h (265292 => 265293)
--- trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.h 2020-08-05 17:22:18 UTC (rev 265292)
+++ trunk/Source/WebCore/Modules/webaudio/WebKitAudioPannerNode.h 2020-08-05 17:51:47 UTC (rev 265293)
@@ -71,7 +71,7 @@
void uninitialize() override;
// Listener
- WebKitAudioListener* listener();
+ WebKitAudioListener& listener();
// Panning model
PanningModelType panningModel() const { return m_panningModel; }