Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Throw errors for invalid values in panner node constructor

Browse source
This commit is contained in:
Manish Goregaokar 2018-08-31 01:18:25 -07:00
parent 1ee3deea27
commit 303b62ae8d
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/script/dom/pannernode.rs
View file

@ -54,16 +54,29 @@ impl PannerNode {
) -> Fallible<PannerNode> { ) -> Fallible<PannerNode> {
let count = options.parent.channelCount.unwrap_or(2); let count = options.parent.channelCount.unwrap_or(2);
let mode = options.parent.channelCountMode.unwrap_or(ChannelCountMode::Clamped_max); let mode = options.parent.channelCountMode.unwrap_or(ChannelCountMode::Clamped_max);
let interpretation = options.parent.channelInterpretation.unwrap_or(ChannelInterpretation::Speakers);
if mode == ChannelCountMode::Max { if mode == ChannelCountMode::Max {
return Err(Error::NotSupported) return Err(Error::NotSupported)
} }
if count > 2 { if count > 2 || count == 0 {
return Err(Error::NotSupported) return Err(Error::NotSupported)
} }
if *options.maxDistance <= 0. {
return Err(Error::Range("maxDistance should be positive".into()))
}
if *options.refDistance < 0. {
return Err(Error::Range("refDistance should be non-negative".into()))
}
if *options.rolloffFactor < 0. {
return Err(Error::Range("rolloffFactor should be non-negative".into()))
}
if *options.coneOuterGain < 0. || *options.coneOuterGain > 1. {
return Err(Error::InvalidState)
}
let mut node_options = AudioNodeOptions::empty(); let mut node_options = AudioNodeOptions::empty();
node_options.channelCount = Some(count); node_options.channelCount = Some(count);
node_options.channelCountMode = Some(mode); node_options.channelCountMode = Some(mode);
node_options.channelInterpretation = Some(ChannelInterpretation::Speakers); node_options.channelInterpretation = Some(interpretation);
let options = options.into(); let options = options.into();
let node = AudioNode::new_inherited( let node = AudioNode::new_inherited(
AudioNodeInit::PannerNode(options), AudioNodeInit::PannerNode(options),
@ -230,10 +243,14 @@ impl PannerNodeMethods for PannerNode {
Finite::wrap(self.ref_distance.get()) Finite::wrap(self.ref_distance.get())
} }
// https://webaudio.github.io/web-audio-api/#dom-pannernode-refdistance // https://webaudio.github.io/web-audio-api/#dom-pannernode-refdistance
fn SetRefDistance(&self, val: Finite<f64>) { fn SetRefDistance(&self, val: Finite<f64>) -> Fallible<()> {
if *val < 0. {
return Err(Error::Range("value should be non-negative".into()))
}
self.ref_distance.set(*val); self.ref_distance.set(*val);
let msg = PannerNodeMessage::SetRefDistance(self.ref_distance.get()); let msg = PannerNodeMessage::SetRefDistance(self.ref_distance.get());
self.upcast::<AudioNode>().message(AudioNodeMessage::PannerNode(msg)); self.upcast::<AudioNode>().message(AudioNodeMessage::PannerNode(msg));
Ok(())
} }
// https://webaudio.github.io/web-audio-api/#dom-pannernode-maxdistance // https://webaudio.github.io/web-audio-api/#dom-pannernode-maxdistance
fn MaxDistance(&self) -> Finite<f64> { fn MaxDistance(&self) -> Finite<f64> {
@ -241,8 +258,8 @@ impl PannerNodeMethods for PannerNode {
} }
// https://webaudio.github.io/web-audio-api/#dom-pannernode-maxdistance // https://webaudio.github.io/web-audio-api/#dom-pannernode-maxdistance
fn SetMaxDistance(&self, val: Finite<f64>) -> Fallible<()> { fn SetMaxDistance(&self, val: Finite<f64>) -> Fallible<()> {
if *val < 0. { if *val <= 0. {
return Err(Error::NotSupported) return Err(Error::Range("value should be positive".into()))
} }
self.max_distance.set(*val); self.max_distance.set(*val);
let msg = PannerNodeMessage::SetMaxDistance(self.max_distance.get()); let msg = PannerNodeMessage::SetMaxDistance(self.max_distance.get());
@ -256,7 +273,7 @@ impl PannerNodeMethods for PannerNode {
// https://webaudio.github.io/web-audio-api/#dom-pannernode-rollofffactor // https://webaudio.github.io/web-audio-api/#dom-pannernode-rollofffactor
fn SetRolloffFactor(&self, val: Finite<f64>) -> Fallible<()> { fn SetRolloffFactor(&self, val: Finite<f64>) -> Fallible<()> {
if *val < 0. { if *val < 0. {
return Err(Error::Range("value should be positive".into())) return Err(Error::Range("value should be non-negative".into()))
} }
self.rolloff_factor.set(*val); self.rolloff_factor.set(*val);
let msg = PannerNodeMessage::SetRolloff(self.rolloff_factor.get()); let msg = PannerNodeMessage::SetRolloff(self.rolloff_factor.get());
@ -289,7 +306,7 @@ impl PannerNodeMethods for PannerNode {
} }
// https://webaudio.github.io/web-audio-api/#dom-pannernode-coneoutergain // https://webaudio.github.io/web-audio-api/#dom-pannernode-coneoutergain
fn SetConeOuterGain(&self, val: Finite<f64>) -> Fallible<()> { fn SetConeOuterGain(&self, val: Finite<f64>) -> Fallible<()> {
if *val < 0. || *val > 360. { if *val < 0. || *val > 1. {
return Err(Error::InvalidState) return Err(Error::InvalidState)
} }
self.cone_outer_gain.set(*val); self.cone_outer_gain.set(*val);

2
components/script/dom/webidls/PannerNode.webidl
View file

@ -45,7 +45,7 @@ interface PannerNode : AudioNode {
readonly attribute AudioParam orientationY; readonly attribute AudioParam orientationY;
readonly attribute AudioParam orientationZ; readonly attribute AudioParam orientationZ;
attribute DistanceModelType distanceModel; attribute DistanceModelType distanceModel;
attribute double refDistance; [SetterThrows] attribute double refDistance;
[SetterThrows] attribute double maxDistance; [SetterThrows] attribute double maxDistance;
[SetterThrows] attribute double rolloffFactor; [SetterThrows] attribute double rolloffFactor;
attribute double coneInnerAngle; attribute double coneInnerAngle;