Backed out 2 changesets (bug 894150) for crashtest orange.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Jul 2013 12:33:56 -0400
changeset 138698 2bc7b329583d0e66648b1dec72324193b2f5a8fe
parent 138697 130d254e9e44bbc168650ce3d318f34f90e16d52
child 138699 5fe88df5c3761ccb534721c8698725f981c64ebf
push id24964
push userryanvm@gmail.com
push dateTue, 16 Jul 2013 20:04:09 +0000
treeherderautoland@fd10ead17ace [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs894150
milestone25.0a1
backs out80ce41a4e6ee705064a192dbfb0fcd2438ef8dd7
b41c7f2ddda5f28f29818f24216e7db16ac86460
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 2 changesets (bug 894150) for crashtest orange. Backed out changeset 80ce41a4e6ee (bug 894150) Backed out changeset b41c7f2ddda5 (bug 894150)
content/media/webaudio/AudioContext.cpp
content/media/webaudio/AudioListener.cpp
content/media/webaudio/AudioListener.h
content/media/webaudio/PannerNode.cpp
content/media/webaudio/PannerNode.h
content/media/webaudio/test/Makefile.in
content/media/webaudio/test/test_bug894150.html
--- a/content/media/webaudio/AudioContext.cpp
+++ b/content/media/webaudio/AudioContext.cpp
@@ -396,17 +396,16 @@ AudioContext::UnregisterAudioBufferSourc
   mAudioBufferSourceNodes.RemoveEntry(aNode);
   UpdatePannerSource();
 }
 
 void
 AudioContext::UnregisterPannerNode(PannerNode* aNode)
 {
   mPannerNodes.RemoveEntry(aNode);
-  mListener->UnregisterPannerNode(aNode);
 }
 
 void
 AudioContext::UnregisterScriptProcessorNode(ScriptProcessorNode* aNode)
 {
   mScriptProcessorNodes.RemoveEntry(aNode);
 }
 
--- a/content/media/webaudio/AudioListener.cpp
+++ b/content/media/webaudio/AudioListener.cpp
@@ -47,21 +47,16 @@ AudioListener::RegisterPannerNode(Panner
   aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_ORIENTATION, mOrientation);
   aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_UPVECTOR, mUpVector);
   aPannerNode->SendThreeDPointParameterToStream(PannerNode::LISTENER_VELOCITY, mVelocity);
   aPannerNode->SendDoubleParameterToStream(PannerNode::LISTENER_DOPPLER_FACTOR, mDopplerFactor);
   aPannerNode->SendDoubleParameterToStream(PannerNode::LISTENER_SPEED_OF_SOUND, mSpeedOfSound);
   UpdatePannersVelocity();
 }
 
-void AudioListener::UnregisterPannerNode(PannerNode* aPannerNode)
-{
-  mPanners.RemoveElement(aPannerNode);
-}
-
 void
 AudioListener::SendDoubleParameterToStream(uint32_t aIndex, double aValue)
 {
   for (uint32_t i = 0; i < mPanners.Length(); ++i) {
     if (mPanners[i]) {
       mPanners[i]->SendDoubleParameterToStream(aIndex, aValue);
     }
   }
--- a/content/media/webaudio/AudioListener.h
+++ b/content/media/webaudio/AudioListener.h
@@ -122,17 +122,16 @@ public:
     mVelocity.x = aX;
     mVelocity.y = aY;
     mVelocity.z = aZ;
     SendThreeDPointParameterToStream(PannerNode::LISTENER_VELOCITY, mVelocity);
     UpdatePannersVelocity();
   }
 
   void RegisterPannerNode(PannerNode* aPannerNode);
-  void UnregisterPannerNode(PannerNode* aPannerNode);
 
 private:
   void SendDoubleParameterToStream(uint32_t aIndex, double aValue);
   void SendThreeDPointParameterToStream(uint32_t aIndex, const ThreeDPoint& aValue);
   void UpdatePannersVelocity();
 
 private:
   friend class PannerNode;
--- a/content/media/webaudio/PannerNode.cpp
+++ b/content/media/webaudio/PannerNode.cpp
@@ -207,24 +207,16 @@ PannerNode::~PannerNode()
 }
 
 JSObject*
 PannerNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aScope)
 {
   return PannerNodeBinding::Wrap(aCx, aScope, this);
 }
 
-void PannerNode::DestroyMediaStream()
-{
-  if (Context()) {
-    Context()->UnregisterPannerNode(this);
-  }
-  AudioNode::DestroyMediaStream();
-}
-
 // Those three functions are described in the spec.
 float
 PannerNodeEngine::LinearGainFunction(float aDistance)
 {
   return 1 - mRolloffFactor * (aDistance - mRefDistance) / (mMaxDistance - mRefDistance);
 }
 
 float
--- a/content/media/webaudio/PannerNode.h
+++ b/content/media/webaudio/PannerNode.h
@@ -26,22 +26,19 @@ class AudioBufferSourceNode;
 
 class PannerNode : public AudioNode,
                    public SupportsWeakPtr<PannerNode>
 {
 public:
   explicit PannerNode(AudioContext* aContext);
   virtual ~PannerNode();
 
-
   virtual JSObject* WrapObject(JSContext* aCx,
                                JS::Handle<JSObject*> aScope) MOZ_OVERRIDE;
 
-  virtual void DestroyMediaStream() MOZ_OVERRIDE;
-
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(PannerNode, AudioNode)
 
   PanningModelType PanningModel() const
   {
     return mPanningModel;
   }
   void SetPanningModel(PanningModelType aPanningModel)
--- a/content/media/webaudio/test/Makefile.in
+++ b/content/media/webaudio/test/Makefile.in
@@ -22,17 +22,16 @@ MOCHITEST_FILES := \
   test_bug866570.html \
   test_bug866737.html \
   test_bug867089.html \
   test_bug867104.html \
   test_bug867174.html \
   test_bug867203.html \
   test_bug875221.html \
   test_bug875402.html \
-  test_bug894150.html \
   test_analyserNode.html \
   test_AudioBuffer.html \
   test_AudioContext.html \
   test_AudioListener.html \
   test_AudioParam.html \
   test_audioParamExponentialRamp.html \
   test_audioParamLinearRamp.html \
   test_audioParamSetCurveAtTime.html \
deleted file mode 100644
--- a/content/media/webaudio/test/test_bug894150.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <title>Crashtest for bug 894150</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<script>
-
-var ac = AudioContext();
-ac.createPanner();
-var listener = ac.listener;
-SpecialPowers.forceGC();
-SpecialPowers.forceCC();
-listener.setOrientation(0, 0, -1, 0, 0, 0);
-
-ok(true, "No crashes should happen!");
-
-</script>
-</body>