Merge branch 'master' into release

Post-merge synchronization to bypass rebase-shenanigans after backouts.

CLOBBER

@@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Clobber for libvpx changes
+Clobber for ICU 78.1

build/moz.configure/old.configure

@@ -127,6 +127,7 @@ def old_configure_options(*options):
     '--enable-alsa',
     '--enable-appcompat-guid',
     '--enable-av1',
+    '--enable-jxl',
     '--enable-b2g-bt',
     '--enable-b2g-camera',
     '--enable-b2g-ril',

dom/base/nsINode.cpp

@@ -16,7 +16,6 @@
 #include "mozilla/CORSMode.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventListenerManager.h"
-#include "mozilla/HTMLEditor.h"
 #include "mozilla/InternalMutationEvent.h"
 #include "mozilla/Likely.h"
 #include "mozilla/MemoryReporting.h"

dom/canvas/WebGLContextDraw.cpp

@@ -9,7 +9,6 @@
 #include "mozilla/CheckedInt.h"
 #include "mozilla/UniquePtrExtensions.h"
 #include "nsPrintfCString.h"
-#include "WebGLActiveInfo.h"
 #include "WebGLBuffer.h"
 #include "WebGLContextUtils.h"
 #include "WebGLFramebuffer.h"
@@ -28,30 +27,6 @@ namespace mozilla {
 // For a Tegra workaround.
 static const int MAX_DRAW_CALLS_SINCE_FLUSH = 100;
 
-static uint8_t
-NumUsedLocationsByElemTypeForDraw(GLenum elemType)
-{
-    switch (elemType) {
-    case LOCAL_GL_FLOAT_MAT2:
-    case LOCAL_GL_FLOAT_MAT2x3:
-    case LOCAL_GL_FLOAT_MAT2x4:
-        return 2;
-
-    case LOCAL_GL_FLOAT_MAT3x2:
-    case LOCAL_GL_FLOAT_MAT3:
-    case LOCAL_GL_FLOAT_MAT3x4:
-        return 3;
-
-    case LOCAL_GL_FLOAT_MAT4x2:
-    case LOCAL_GL_FLOAT_MAT4x3:
-    case LOCAL_GL_FLOAT_MAT4:
-        return 4;
-
-    default:
-        return 1;
-    }
-}
-
 ////////////////////////////////////////
 
 class ScopedResolveTexturesForDraw
@@ -356,7 +331,6 @@ class ScopedDrawHelper final
 {
     WebGLContext* const mWebGL;
     bool mDidFake;
-    std::vector<GLuint> mDisabledUnusedAttribs;
 
 public:
     ScopedDrawHelper(WebGLContext* webgl, const char* funcName, uint32_t firstVertex,
@@ -393,43 +367,11 @@ public:
         }
         mDidFake = true;
 
-        const auto& linkInfo = mWebGL->mActiveProgramLinkInfo;
-
-#ifdef XP_MACOSX
-        if (mWebGL->gl->WorkAroundDriverBugs()) {
-            std::vector<bool> isActiveAttrib(mWebGL->mBoundVertexArray->mAttribs.Length(),
-                                             false);
-            for (const auto& progAttrib : linkInfo->attribs) {
-                const auto loc = progAttrib.mLoc;
-                if (loc < 0) {
-                    continue;
-                }
-
-                const auto usedLocs =
-                    NumUsedLocationsByElemTypeForDraw(progAttrib.mActiveInfo->mElemType);
-                for (uint32_t i = 0; i < usedLocs; ++i) {
-                    const auto usedLoc = static_cast<uint32_t>(loc) + i;
-                    if (usedLoc < isActiveAttrib.size()) {
-                        isActiveAttrib[usedLoc] = true;
-                    }
-                }
-            }
-
-            for (uint32_t i = 0; i < mWebGL->mBoundVertexArray->mAttribs.Length(); ++i) {
-                const auto& attrib = mWebGL->mBoundVertexArray->mAttribs[i];
-                if (!attrib.mEnabled || isActiveAttrib[i]) {
-                    continue;
-                }
-
-                mWebGL->gl->fDisableVertexAttribArray(i);
-                mDisabledUnusedAttribs.push_back(i);
-            }
-        }
-#endif
-
         ////
         // Check UBO sizes.
 
+        const auto& linkInfo = mWebGL->mActiveProgramLinkInfo;
+
         for (const auto& cur : linkInfo->uniformBlocks) {
             const auto& dataSize = cur->mDataSize;
             const auto& binding = cur->mBinding;
@@ -535,10 +477,6 @@ public:
         if (mDidFake) {
             mWebGL->UndoFakeVertexAttrib0();
         }
-
-        for (const auto loc : mDisabledUnusedAttribs) {
-            mWebGL->gl->fEnableVertexAttribArray(loc);
-        }
     }
 };
 
@@ -669,12 +607,12 @@ WebGLContext::DrawArraysInstanced(GLenum mode, GLint first, GLsizei vertCount,
         return;
 
     MakeContextCurrent();
-
-    if (vertCount > mMaxVertIdsPerDraw) {
-      ErrorOutOfMemory(
-          "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
-      return;
-    }
+    
+    if (vertCount > mMaxVertIdsPerDraw) {
+      ErrorOutOfMemory(
+          "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
+      return;
+    }
 
     bool error = false;
     ScopedResolveTexturesForDraw scopedResolve(this, funcName, &error);
@@ -917,12 +855,12 @@ WebGLContext::DrawElementsInstanced(GLenum mode, GLsizei vertCount, GLenum type,
         return;
 
     MakeContextCurrent();
-
-    if (vertCount > mMaxVertIdsPerDraw) {
-      ErrorOutOfMemory(
-        "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
-      return;
-    }
+
+    if (vertCount > mMaxVertIdsPerDraw) {
+      ErrorOutOfMemory(
+        "Context's max vertCount is %u, but %u requested. [webgl.max-vert-ids-per-draw]", mMaxVertIdsPerDraw, vertCount);
+      return;
+    }
 
     bool error = false;
     ScopedResolveTexturesForDraw scopedResolve(this, funcName, &error);

dom/media/webaudio/AnalyserNode.cpp

@@ -100,45 +100,6 @@ public:
   uint32_t mChunksToProcess = 0;
 };
 
-/* static */ already_AddRefed<AnalyserNode>
-AnalyserNode::Create(AudioContext& aAudioContext,
-                     const AnalyserOptions& aOptions,
-                     ErrorResult& aRv)
-{
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<AnalyserNode> analyserNode = new AnalyserNode(&aAudioContext);
-
-  analyserNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  analyserNode->SetFftSize(aOptions.mFftSize, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  analyserNode->SetMinDecibels(aOptions.mMinDecibels, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  analyserNode->SetMaxDecibels(aOptions.mMaxDecibels, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  analyserNode->SetSmoothingTimeConstant(aOptions.mSmoothingTimeConstant, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  return analyserNode.forget();
-}
-
 AnalyserNode::AnalyserNode(AudioContext* aContext)
   : AudioNode(aContext,
               1,

dom/media/webaudio/AnalyserNode.h

@@ -14,26 +14,16 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct AnalyserOptions;
 
 class AnalyserNode final : public AudioNode
 {
 public:
-  static already_AddRefed<AnalyserNode>
-  Create(AudioContext& aAudioContext, const AnalyserOptions& aOptions,
-         ErrorResult& aRv);
+  explicit AnalyserNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
 
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  static already_AddRefed<AnalyserNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const AnalyserOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   void GetFloatFrequencyData(const Float32Array& aArray);
   void GetByteFrequencyData(const Uint8Array& aArray);
   void GetFloatTimeDomainData(const Float32Array& aArray);
@@ -71,9 +61,10 @@ public:
   virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  ~AnalyserNode() = default;
+protected:
+  ~AnalyserNode() {}
 
+private:
   friend class AnalyserNodeEngine;
   void AppendChunk(const AudioChunk& aChunk);
   bool AllocateBuffer();
@@ -82,8 +73,6 @@ private:
   void GetTimeDomainData(float* aData, size_t aLength);
 
 private:
-  explicit AnalyserNode(AudioContext* aContext);
-
   FFTBlock mAnalysisBlock;
   nsTArray<AudioChunk> mChunks;
   double mMinDecibels;

dom/media/webaudio/AudioBuffer.cpp

@@ -178,24 +178,6 @@ AudioBuffer::~AudioBuffer()
   mozilla::DropJSObjects(this);
 }
 
-/* static */ already_AddRefed<AudioBuffer>
-AudioBuffer::Constructor(const GlobalObject& aGlobal,
-                         AudioContext& aAudioContext,
-                         const AudioBufferOptions& aOptions,
-                         ErrorResult& aRv)
-{
-  if (!aOptions.mNumberOfChannels) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return nullptr;
-  }
-
-  float sampleRate = aOptions.mSampleRate.WasPassed()
-                       ? aOptions.mSampleRate.Value()
-                       : aAudioContext.SampleRate();
-  return Create(&aAudioContext, aOptions.mNumberOfChannels, aOptions.mLength,
-                sampleRate, aRv);
-}
-
 void
 AudioBuffer::ClearJSChannels()
 {

dom/media/webaudio/AudioBuffer.h

@@ -24,7 +24,6 @@ class ThreadSharedFloatArrayBufferList;
 
 namespace dom {
 
-struct AudioBufferOptions;
 class AudioContext;
 
 /**
@@ -57,10 +56,6 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(AudioBuffer)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(AudioBuffer)
 
-  static already_AddRefed<AudioBuffer>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const AudioBufferOptions& aOptions, ErrorResult& aRv);
-
   nsPIDOMWindowInner* GetParentObject() const
   {
     nsCOMPtr<nsPIDOMWindowInner> parentObject = do_QueryReferent(mOwnerWindow);
@@ -139,3 +134,4 @@ protected:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/AudioBufferSourceNode.cpp

@@ -607,30 +607,10 @@ AudioBufferSourceNode::AudioBufferSourceNode(AudioContext* aContext)
   mStream->AddMainThreadListener(this);
 }
 
-/* static */ already_AddRefed<AudioBufferSourceNode>
-AudioBufferSourceNode::Create(JSContext* aCx, AudioContext& aAudioContext,
-                              const AudioBufferSourceOptions& aOptions,
-                              ErrorResult& aRv)
+AudioBufferSourceNode::~AudioBufferSourceNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<AudioBufferSourceNode> audioNode = new AudioBufferSourceNode(&aAudioContext);
-
-  if (aOptions.mBuffer.WasPassed()) {
-    MOZ_ASSERT(aCx);
-    audioNode->SetBuffer(aCx, aOptions.mBuffer.Value());
-  }
-
-  audioNode->Detune()->SetValue(aOptions.mDetune);
-  audioNode->SetLoop(aOptions.mLoop);
-  audioNode->SetLoopEnd(aOptions.mLoopEnd);
-  audioNode->SetLoopStart(aOptions.mLoopStart);
-  audioNode->PlaybackRate()->SetValue(aOptions.mPlaybackRate);
-
-  return audioNode.forget();
 }
+
 void
 AudioBufferSourceNode::DestroyMediaStream()
 {

dom/media/webaudio/AudioBufferSourceNode.h

@@ -12,16 +12,13 @@
 namespace mozilla {
 namespace dom {
 
-struct AudioBufferSourceOptions;
 class AudioParam;
 
-class AudioBufferSourceNode final : public AudioNode
-                                  , public MainThreadMediaStreamListener
+class AudioBufferSourceNode final : public AudioNode,
+                                    public MainThreadMediaStreamListener
 {
 public:
-  static already_AddRefed<AudioBufferSourceNode>
-  Create(JSContext* aCx, AudioContext& aAudioContext,
-         const AudioBufferSourceOptions& aOptions, ErrorResult& aRv);
+  explicit AudioBufferSourceNode(AudioContext* aContext);
 
   void DestroyMediaStream() override;
 
@@ -36,13 +33,6 @@ public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(AudioBufferSourceNode, AudioNode)
 
-  static already_AddRefed<AudioBufferSourceNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const AudioBufferSourceOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aGlobal.Context(), aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void Start(double aWhen, double aOffset,
@@ -108,10 +98,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit AudioBufferSourceNode(AudioContext* aContext);
-  ~AudioBufferSourceNode() = default;
+protected:
+  virtual ~AudioBufferSourceNode();
 
+private:
   friend class AudioBufferSourceNodeEngine;
   // START is sent during Start().
   // STOP is sent during Stop().
@@ -139,6 +129,7 @@ private:
   void SendBufferParameterToStream(JSContext* aCx);
   void SendOffsetAndDurationParametersToStream(AudioNodeStream* aStream);
 
+private:
   double mLoopStart;
   double mLoopEnd;
   double mOffset;
@@ -154,3 +145,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/AudioContext.cpp

@@ -11,26 +11,10 @@
 #include "mozilla/OwningNonNull.h"
 
 #include "mozilla/dom/AnalyserNode.h"
-#include "mozilla/dom/AnalyserNodeBinding.h"
-#include "mozilla/dom/AudioBufferSourceNodeBinding.h"
 #include "mozilla/dom/AudioContextBinding.h"
-#include "mozilla/dom/BiquadFilterNodeBinding.h"
-#include "mozilla/dom/ChannelMergerNodeBinding.h"
-#include "mozilla/dom/ChannelSplitterNodeBinding.h"
-#include "mozilla/dom/ConvolverNodeBinding.h"
-#include "mozilla/dom/DelayNodeBinding.h"
-#include "mozilla/dom/DynamicsCompressorNodeBinding.h"
-#include "mozilla/dom/GainNodeBinding.h"
-#include "mozilla/dom/IIRFilterNodeBinding.h"
 #include "mozilla/dom/HTMLMediaElement.h"
-#include "mozilla/dom/MediaElementAudioSourceNodeBinding.h"
-#include "mozilla/dom/MediaStreamAudioSourceNodeBinding.h"
 #include "mozilla/dom/OfflineAudioContextBinding.h"
-#include "mozilla/dom/OscillatorNodeBinding.h"
-#include "mozilla/dom/PannerNodeBinding.h"
 #include "mozilla/dom/Promise.h"
-#include "mozilla/dom/StereoPannerNodeBinding.h"
-#include "mozilla/dom/WaveShaperNodeBinding.h"
 
 #include "AudioBuffer.h"
 #include "AudioBufferSourceNode.h"
@@ -261,9 +245,13 @@ bool AudioContext::CheckClosed(ErrorResult& aRv)
 already_AddRefed<AudioBufferSourceNode>
 AudioContext::CreateBufferSource(ErrorResult& aRv)
 {
-  return AudioBufferSourceNode::Create(nullptr, *this,
-                                       AudioBufferSourceOptions(),
-                                       aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<AudioBufferSourceNode> bufferNode =
+    new AudioBufferSourceNode(this);
+  return bufferNode.forget();
 }
 
 already_AddRefed<ConstantSourceNode>
@@ -315,8 +303,18 @@ bool IsValidBufferSize(uint32_t aBufferSize) {
 already_AddRefed<MediaStreamAudioDestinationNode>
 AudioContext::CreateMediaStreamDestination(ErrorResult& aRv)
 {
-  return MediaStreamAudioDestinationNode::Create(*this, AudioNodeOptions(),
-                                                 aRv);
+  if (mIsOffline) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<MediaStreamAudioDestinationNode> node =
+      new MediaStreamAudioDestinationNode(this);
+  return node.forget();
 }
 
 already_AddRefed<ScriptProcessorNode>
@@ -346,93 +344,181 @@ AudioContext::CreateScriptProcessor(uint32_t aBufferSize,
 already_AddRefed<AnalyserNode>
 AudioContext::CreateAnalyser(ErrorResult& aRv)
 {
-  return AnalyserNode::Create(*this, AnalyserOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<AnalyserNode> analyserNode = new AnalyserNode(this);
+  return analyserNode.forget();
 }
 
 already_AddRefed<StereoPannerNode>
 AudioContext::CreateStereoPanner(ErrorResult& aRv)
 {
-  return StereoPannerNode::Create(*this, StereoPannerOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<StereoPannerNode> stereoPannerNode = new StereoPannerNode(this);
+  return stereoPannerNode.forget();
 }
 
 already_AddRefed<MediaElementAudioSourceNode>
 AudioContext::CreateMediaElementSource(HTMLMediaElement& aMediaElement,
                                        ErrorResult& aRv)
 {
-  MediaElementAudioSourceOptions options;
-  options.mMediaElement = aMediaElement;
+  if (mIsOffline) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
 
-  return MediaElementAudioSourceNode::Create(*this, options, aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<DOMMediaStream> stream =
+    aMediaElement.CaptureAudio(aRv, mDestination->Stream()->Graph());
+  if (aRv.Failed()) {
+    return nullptr;
+  }
+  return MediaElementAudioSourceNode::Create(this, stream, aRv);
 }
 
 already_AddRefed<MediaStreamAudioSourceNode>
 AudioContext::CreateMediaStreamSource(DOMMediaStream& aMediaStream,
                                       ErrorResult& aRv)
 {
-  MediaStreamAudioSourceOptions options;
-  options.mMediaStream = aMediaStream;
+  if (mIsOffline) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
 
-  return MediaStreamAudioSourceNode::Create(*this, options, aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  return MediaStreamAudioSourceNode::Create(this, &aMediaStream, aRv);
 }
 
 already_AddRefed<GainNode>
 AudioContext::CreateGain(ErrorResult& aRv)
 {
-  return GainNode::Create(*this, GainOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<GainNode> gainNode = new GainNode(this);
+  return gainNode.forget();
 }
 
 already_AddRefed<WaveShaperNode>
 AudioContext::CreateWaveShaper(ErrorResult& aRv)
 {
-  return WaveShaperNode::Create(*this, WaveShaperOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<WaveShaperNode> waveShaperNode = new WaveShaperNode(this);
+  return waveShaperNode.forget();
 }
 
 already_AddRefed<DelayNode>
 AudioContext::CreateDelay(double aMaxDelayTime, ErrorResult& aRv)
 {
-  DelayOptions options;
-  options.mMaxDelayTime = aMaxDelayTime;
-  return DelayNode::Create(*this, options, aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aMaxDelayTime > 0. && aMaxDelayTime < 180.) {
+    RefPtr<DelayNode> delayNode = new DelayNode(this, aMaxDelayTime);
+    return delayNode.forget();
+  }
+
+  aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+  return nullptr;
 }
 
 already_AddRefed<PannerNode>
 AudioContext::CreatePanner(ErrorResult& aRv)
 {
-  return PannerNode::Create(*this, PannerOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<PannerNode> pannerNode = new PannerNode(this);
+  mPannerNodes.PutEntry(pannerNode);
+  return pannerNode.forget();
 }
 
 already_AddRefed<ConvolverNode>
 AudioContext::CreateConvolver(ErrorResult& aRv)
 {
-  return ConvolverNode::Create(nullptr, *this, ConvolverOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<ConvolverNode> convolverNode = new ConvolverNode(this);
+  return convolverNode.forget();
 }
 
 already_AddRefed<ChannelSplitterNode>
 AudioContext::CreateChannelSplitter(uint32_t aNumberOfOutputs, ErrorResult& aRv)
 {
-  ChannelSplitterOptions options;
-  options.mNumberOfOutputs = aNumberOfOutputs;
-  return ChannelSplitterNode::Create(*this, options, aRv);
+  if (aNumberOfOutputs == 0 ||
+      aNumberOfOutputs > WebAudioUtils::MaxChannelCount) {
+    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    return nullptr;
+  }
+
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<ChannelSplitterNode> splitterNode =
+    new ChannelSplitterNode(this, aNumberOfOutputs);
+  return splitterNode.forget();
 }
 
 already_AddRefed<ChannelMergerNode>
 AudioContext::CreateChannelMerger(uint32_t aNumberOfInputs, ErrorResult& aRv)
 {
-  ChannelMergerOptions options;
-  options.mNumberOfInputs = aNumberOfInputs;
-  return ChannelMergerNode::Create(*this, options, aRv);
+  if (aNumberOfInputs == 0 ||
+      aNumberOfInputs > WebAudioUtils::MaxChannelCount) {
+    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
+    return nullptr;
+  }
+
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<ChannelMergerNode> mergerNode =
+    new ChannelMergerNode(this, aNumberOfInputs);
+  return mergerNode.forget();
 }
 
 already_AddRefed<DynamicsCompressorNode>
 AudioContext::CreateDynamicsCompressor(ErrorResult& aRv)
 {
-  return DynamicsCompressorNode::Create(*this, DynamicsCompressorOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<DynamicsCompressorNode> compressorNode =
+    new DynamicsCompressorNode(this);
+  return compressorNode.forget();
 }
 
 already_AddRefed<BiquadFilterNode>
 AudioContext::CreateBiquadFilter(ErrorResult& aRv)
 {
-  return BiquadFilterNode::Create(*this, BiquadFilterOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<BiquadFilterNode> filterNode =
+    new BiquadFilterNode(this);
+  return filterNode.forget();
 }
 
 already_AddRefed<IIRFilterNode>
@@ -440,16 +526,47 @@ AudioContext::CreateIIRFilter(const mozilla::dom::binding_detail::AutoSequence<d
                               const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback,
                               mozilla::ErrorResult& aRv)
 {
-  IIRFilterOptions options;
-  options.mFeedforward = aFeedforward;
-  options.mFeedback = aFeedback;
-  return IIRFilterNode::Create(*this, options, aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  if (aFeedforward.Length() == 0 || aFeedforward.Length() > 20) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  if (aFeedback.Length() == 0 || aFeedback.Length() > 20) {
+    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
+    return nullptr;
+  }
+
+  bool feedforwardAllZeros = true;
+  for (size_t i = 0; i < aFeedforward.Length(); ++i) {
+    if (aFeedforward.Elements()[i] != 0.0) {
+      feedforwardAllZeros = false;
+    }
+  }
+
+  if (feedforwardAllZeros || aFeedback.Elements()[0] == 0.0) {
+    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+    return nullptr;
+  }
+
+  RefPtr<IIRFilterNode> filterNode =
+    new IIRFilterNode(this, aFeedforward, aFeedback);
+  return filterNode.forget();
 }
 
 already_AddRefed<OscillatorNode>
 AudioContext::CreateOscillator(ErrorResult& aRv)
 {
-  return OscillatorNode::Create(*this, OscillatorOptions(), aRv);
+  if (CheckClosed(aRv)) {
+    return nullptr;
+  }
+
+  RefPtr<OscillatorNode> oscillatorNode =
+    new OscillatorNode(this);
+  return oscillatorNode.forget();
 }
 
 already_AddRefed<PeriodicWave>

dom/media/webaudio/AudioContext.h

@@ -316,8 +316,6 @@ public:
   IMPL_EVENT_HANDLER(mozinterruptbegin)
   IMPL_EVENT_HANDLER(mozinterruptend)
 
-  bool CheckClosed(ErrorResult& aRv);
-
 private:
   void DisconnectFromWindow();
   void RemoveFromDecodeQueue(WebAudioDecodeJob* aDecodeJob);
@@ -328,6 +326,8 @@ private:
 
   friend struct ::mozilla::WebAudioDecodeJob;
 
+  bool CheckClosed(ErrorResult& aRv);
+
   nsTArray<MediaStream*> GetAllStreams() const;
 
 private:

dom/media/webaudio/AudioNode.cpp

@@ -71,28 +71,6 @@ AudioNode::~AudioNode()
   }
 }
 
-void
-AudioNode::Initialize(const AudioNodeOptions& aOptions, ErrorResult& aRv)
-{
-  if (aOptions.mChannelCount.WasPassed()) {
-    SetChannelCount(aOptions.mChannelCount.Value(), aRv);
-    if (NS_WARN_IF(aRv.Failed())) {
-      return;
-    }
-  }
-
-  if (aOptions.mChannelCountMode.WasPassed()) {
-    SetChannelCountModeValue(aOptions.mChannelCountMode.Value(), aRv);
-    if (NS_WARN_IF(aRv.Failed())) {
-      return;
-    }
-  }
-
-  if (aOptions.mChannelInterpretation.WasPassed()) {
-    SetChannelInterpretationValue(aOptions.mChannelInterpretation.Value());
-  }
-}
-
 size_t
 AudioNode::SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const
 {

dom/media/webaudio/AudioNode.h

@@ -250,9 +250,6 @@ private:
   bool DisconnectFromOutputIfConnected(uint32_t aOutputIndex, uint32_t aInputIndex);
 
 protected:
-  // Helper for the Constructors for nodes.
-  void Initialize(const AudioNodeOptions& aOptions, ErrorResult& aRv);
-
   // Helpers for sending different value types to streams
   void SendDoubleParameterToStream(uint32_t aIndex, double aValue);
   void SendInt32ParameterToStream(uint32_t aIndex, int32_t aValue);

dom/media/webaudio/BiquadFilterNode.cpp

@@ -262,29 +262,8 @@ BiquadFilterNode::BiquadFilterNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<BiquadFilterNode>
-BiquadFilterNode::Create(AudioContext& aAudioContext,
-                         const BiquadFilterOptions& aOptions,
-                         ErrorResult& aRv)
+BiquadFilterNode::~BiquadFilterNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<BiquadFilterNode> audioNode = new BiquadFilterNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->SetType(aOptions.mType);
-  audioNode->Q()->SetValue(aOptions.mQ);
-  audioNode->Detune()->SetValue(aOptions.mDetune);
-  audioNode->Frequency()->SetValue(aOptions.mFrequency);
-  audioNode->Gain()->SetValue(aOptions.mGain);
-
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/BiquadFilterNode.h

@@ -14,25 +14,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct BiquadFilterOptions;
 
 class BiquadFilterNode final : public AudioNode
 {
 public:
-  static already_AddRefed<BiquadFilterNode>
-  Create(AudioContext& aAudioContext, const BiquadFilterOptions& aOptions,
-         ErrorResult& aRv);
+  explicit BiquadFilterNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BiquadFilterNode, AudioNode)
 
-  static already_AddRefed<BiquadFilterNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const BiquadFilterOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   BiquadFilterType Type() const
@@ -73,10 +63,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit BiquadFilterNode(AudioContext* aContext);
-  ~BiquadFilterNode() = default;
+protected:
+  virtual ~BiquadFilterNode();
 
+private:
   BiquadFilterType mType;
   RefPtr<AudioParam> mFrequency;
   RefPtr<AudioParam> mDetune;
@@ -88,3 +78,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/ChannelMergerNode.cpp

@@ -74,30 +74,8 @@ ChannelMergerNode::ChannelMergerNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<ChannelMergerNode>
-ChannelMergerNode::Create(AudioContext& aAudioContext,
-                          const ChannelMergerOptions& aOptions,
-                          ErrorResult& aRv)
+ChannelMergerNode::~ChannelMergerNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aOptions.mNumberOfInputs == 0 ||
-      aOptions.mNumberOfInputs > WebAudioUtils::MaxChannelCount) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return nullptr;
-  }
-
-  RefPtr<ChannelMergerNode> audioNode =
-    new ChannelMergerNode(&aAudioContext, aOptions.mNumberOfInputs);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  return audioNode.forget();
 }
 
 JSObject*
@@ -108,3 +86,4 @@ ChannelMergerNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 
 } // namespace dom
 } // namespace mozilla
+

dom/media/webaudio/ChannelMergerNode.h

@@ -12,24 +12,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct ChannelMergerOptions;
 
 class ChannelMergerNode final : public AudioNode
 {
 public:
-  static already_AddRefed<ChannelMergerNode>
-  Create(AudioContext& aAudioContext, const ChannelMergerOptions& aOptions,
-         ErrorResult& aRv);
+  ChannelMergerNode(AudioContext* aContext,
+                    uint16_t aInputCount);
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  static already_AddRefed<ChannelMergerNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const ChannelMergerOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfInputs() const override { return mInputCount; }
@@ -44,11 +35,10 @@ public:
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
-private:
-  ChannelMergerNode(AudioContext* aContext,
-                    uint16_t aInputCount);
-  ~ChannelMergerNode() = default;
+protected:
+  virtual ~ChannelMergerNode();
 
+private:
   const uint16_t mInputCount;
 };
 
@@ -56,3 +46,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/ChannelSplitterNode.cpp

@@ -65,30 +65,8 @@ ChannelSplitterNode::ChannelSplitterNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<ChannelSplitterNode>
-ChannelSplitterNode::Create(AudioContext& aAudioContext,
-                            const ChannelSplitterOptions& aOptions,
-                            ErrorResult& aRv)
+ChannelSplitterNode::~ChannelSplitterNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aOptions.mNumberOfOutputs == 0 ||
-      aOptions.mNumberOfOutputs > WebAudioUtils::MaxChannelCount) {
-    aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
-    return nullptr;
-  }
-
-  RefPtr<ChannelSplitterNode> audioNode =
-    new ChannelSplitterNode(&aAudioContext, aOptions.mNumberOfOutputs);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  return audioNode.forget();
 }
 
 JSObject*
@@ -99,3 +77,4 @@ ChannelSplitterNode::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProt
 
 } // namespace dom
 } // namespace mozilla
+

dom/media/webaudio/ChannelSplitterNode.h

@@ -12,24 +12,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct ChannelSplitterOptions;
 
 class ChannelSplitterNode final : public AudioNode
 {
 public:
-  static already_AddRefed<ChannelSplitterNode>
-  Create(AudioContext& aAudioContext, const ChannelSplitterOptions& aOptions,
-         ErrorResult& aRv);
+  ChannelSplitterNode(AudioContext* aContext,
+                      uint16_t aOutputCount);
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  static already_AddRefed<ChannelSplitterNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const ChannelSplitterOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfOutputs() const override { return mOutputCount; }
@@ -44,11 +35,10 @@ public:
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
-private:
-  ChannelSplitterNode(AudioContext* aContext,
-                      uint16_t aOutputCount);
-  ~ChannelSplitterNode() = default;
+protected:
+  virtual ~ChannelSplitterNode();
 
+private:
   const uint16_t mOutputCount;
 };
 
@@ -56,3 +46,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/ConvolverNode.cpp

@@ -203,34 +203,8 @@ ConvolverNode::ConvolverNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<ConvolverNode>
-ConvolverNode::Create(JSContext* aCx, AudioContext& aAudioContext,
-                      const ConvolverOptions& aOptions,
-                      ErrorResult& aRv)
+ConvolverNode::~ConvolverNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<ConvolverNode> audioNode = new ConvolverNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  // This must be done before setting the buffer.
-  audioNode->SetNormalize(!aOptions.mDisableNormalization);
-
-  if (aOptions.mBuffer.WasPassed()) {
-    MOZ_ASSERT(aCx);
-    audioNode->SetBuffer(aCx, aOptions.mBuffer.Value(), aRv);
-    if (NS_WARN_IF(aRv.Failed())) {
-      return nullptr;
-    }
-  }
-
-  return audioNode.forget();
 }
 
 size_t
@@ -317,3 +291,4 @@ ConvolverNode::SetNormalize(bool aNormalize)
 
 } // namespace dom
 } // namespace mozilla
+

dom/media/webaudio/ConvolverNode.h

@@ -12,26 +12,14 @@
 namespace mozilla {
 namespace dom {
 
-class AudioContext;
-struct ConvolverOptions;
-
 class ConvolverNode final : public AudioNode
 {
 public:
-  static already_AddRefed<ConvolverNode>
-  Create(JSContext* aCx, AudioContext& aAudioContext,
-         const ConvolverOptions& aOptions, ErrorResult& aRv);
+  explicit ConvolverNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ConvolverNode, AudioNode);
 
-  static already_AddRefed<ConvolverNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const ConvolverOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aGlobal.Context(), aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioBuffer* GetBuffer(JSContext* aCx) const
@@ -39,7 +27,7 @@ public:
     return mBuffer;
   }
 
-  void SetBuffer(JSContext* aCx, AudioBuffer* aBuffer, ErrorResult& aRv);
+  void SetBuffer(JSContext* aCx, AudioBuffer* aBufferi, ErrorResult& aRv);
 
   bool Normalize() const
   {
@@ -73,10 +61,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit ConvolverNode(AudioContext* aContext);
-  ~ConvolverNode() = default;
+protected:
+  virtual ~ConvolverNode();
 
+private:
   RefPtr<AudioBuffer> mBuffer;
   bool mNormalize;
 };
@@ -86,3 +74,4 @@ private:
 } //end namespace mozilla
 
 #endif
+

dom/media/webaudio/DelayNode.cpp

@@ -205,30 +205,8 @@ DelayNode::DelayNode(AudioContext* aContext, double aMaxDelay)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<DelayNode>
-DelayNode::Create(AudioContext& aAudioContext,
-                  const DelayOptions& aOptions,
-                  ErrorResult& aRv)
+DelayNode::~DelayNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aOptions.mMaxDelayTime <= 0. || aOptions.mMaxDelayTime >= 180.) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  RefPtr<DelayNode> audioNode = new DelayNode(&aAudioContext,
-                                              aOptions.mMaxDelayTime);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->DelayTime()->SetValue(aOptions.mDelayTime);
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/DelayNode.h

@@ -13,25 +13,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct DelayOptions;
 
 class DelayNode final : public AudioNode
 {
 public:
-  static already_AddRefed<DelayNode>
-  Create(AudioContext& aAudioContext, const DelayOptions& aOptions,
-         ErrorResult& aRv);
+  DelayNode(AudioContext* aContext, double aMaxDelay);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DelayNode, AudioNode)
 
-  static already_AddRefed<DelayNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const DelayOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* DelayTime() const
@@ -47,12 +37,13 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  DelayNode(AudioContext* aContext, double aMaxDelay);
-  ~DelayNode() = default;
+protected:
+  virtual ~DelayNode();
 
+private:
   friend class DelayNodeEngine;
 
+private:
   RefPtr<AudioParam> mDelay;
 };
 
@@ -60,3 +51,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/DynamicsCompressorNode.cpp

@@ -204,30 +204,8 @@ DynamicsCompressorNode::DynamicsCompressorNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<DynamicsCompressorNode>
-DynamicsCompressorNode::Create(AudioContext& aAudioContext,
-                               const DynamicsCompressorOptions& aOptions,
-                               ErrorResult& aRv)
+DynamicsCompressorNode::~DynamicsCompressorNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<DynamicsCompressorNode> audioNode =
-    new DynamicsCompressorNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->Attack()->SetValue(aOptions.mAttack);
-  audioNode->Knee()->SetValue(aOptions.mKnee);
-  audioNode->Ratio()->SetValue(aOptions.mRatio);
-  audioNode->GetRelease()->SetValue(aOptions.mRelease);
-  audioNode->Threshold()->SetValue(aOptions.mThreshold);
-
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/DynamicsCompressorNode.h

@@ -13,25 +13,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct DynamicsCompressorOptions;
 
 class DynamicsCompressorNode final : public AudioNode
 {
 public:
-  static already_AddRefed<DynamicsCompressorNode>
-  Create(AudioContext& aAudioContext, const DynamicsCompressorOptions& aOptions,
-         ErrorResult& aRv);
+  explicit DynamicsCompressorNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(DynamicsCompressorNode, AudioNode)
 
-  static already_AddRefed<DynamicsCompressorNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const DynamicsCompressorOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* Threshold() const
@@ -79,10 +69,10 @@ public:
     mReduction = aReduction;
   }
 
-private:
-  explicit DynamicsCompressorNode(AudioContext* aContext);
-  ~DynamicsCompressorNode() = default;
+protected:
+  virtual ~DynamicsCompressorNode();
 
+private:
   RefPtr<AudioParam> mThreshold;
   RefPtr<AudioParam> mKnee;
   RefPtr<AudioParam> mRatio;
@@ -95,3 +85,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/GainNode.cpp

@@ -128,24 +128,8 @@ GainNode::GainNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<GainNode>
-GainNode::Create(AudioContext& aAudioContext,
-                 const GainOptions& aOptions,
-                 ErrorResult& aRv)
+GainNode::~GainNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<GainNode> audioNode = new GainNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->Gain()->SetValue(aOptions.mGain);
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/GainNode.h

@@ -13,25 +13,15 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct GainOptions;
 
 class GainNode final : public AudioNode
 {
 public:
-  static already_AddRefed<GainNode>
-  Create(AudioContext& aAudioContext, const GainOptions& aOptions,
-         ErrorResult& aRv);
+  explicit GainNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(GainNode, AudioNode)
 
-  static already_AddRefed<GainNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const GainOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   AudioParam* Gain() const
@@ -47,10 +37,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit GainNode(AudioContext* aContext);
-  ~GainNode() = default;
+protected:
+  virtual ~GainNode();
 
+private:
   RefPtr<AudioParam> mGain;
 };
 
@@ -58,3 +48,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/IIRFilterNode.cpp

@@ -138,8 +138,8 @@ private:
 };
 
 IIRFilterNode::IIRFilterNode(AudioContext* aContext,
-                             const Sequence<double>& aFeedforward,
-                             const Sequence<double>& aFeedback)
+                             const mozilla::dom::binding_detail::AutoSequence<double>& aFeedforward,
+                             const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback)
   : AudioNode(aContext,
               2,
               ChannelCountMode::Max,
@@ -173,46 +173,8 @@ IIRFilterNode::IIRFilterNode(AudioContext* aContext,
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<IIRFilterNode>
-IIRFilterNode::Create(AudioContext& aAudioContext,
-                 const IIRFilterOptions& aOptions,
-                 ErrorResult& aRv)
+IIRFilterNode::~IIRFilterNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  if (aOptions.mFeedforward.Length() == 0 || aOptions.mFeedforward.Length() > 20) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (aOptions.mFeedback.Length() == 0 || aOptions.mFeedback.Length() > 20) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  bool feedforwardAllZeros = true;
-  for (size_t i = 0; i < aOptions.mFeedforward.Length(); ++i) {
-    if (aOptions.mFeedforward.Elements()[i] != 0.0) {
-      feedforwardAllZeros = false;
-    }
-  }
-
-  if (feedforwardAllZeros || aOptions.mFeedback.Elements()[0] == 0.0) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return nullptr;
-  }
-
-  RefPtr<IIRFilterNode> audioNode =
-    new IIRFilterNode(&aAudioContext, aOptions.mFeedforward, aOptions.mFeedback);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/IIRFilterNode.h

@@ -14,26 +14,19 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct IIRFilterOptions;
 
 class IIRFilterNode final : public AudioNode
 {
 public:
-  static already_AddRefed<IIRFilterNode>
-  Create(AudioContext& aAudioContext, const IIRFilterOptions& aOptions,
-         ErrorResult& aRv);
+  explicit IIRFilterNode(AudioContext* aContext,
+                         const mozilla::dom::binding_detail::AutoSequence<double>& aFeedforward,
+                         const mozilla::dom::binding_detail::AutoSequence<double>& aFeedback);
 
   NS_DECL_ISUPPORTS_INHERITED
 
-  static already_AddRefed<IIRFilterNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const IIRFilterOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
+
   void GetFrequencyResponse(const Float32Array& aFrequencyHz,
                             const Float32Array& aMagResponse,
                             const Float32Array& aPhaseResponse);
@@ -46,17 +39,16 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  IIRFilterNode(AudioContext* aContext,
-                const Sequence<double>& aFeedforward,
-                const Sequence<double>& aFeedback);
-  ~IIRFilterNode() = default;
+protected:
+  virtual ~IIRFilterNode();
 
-  nsTArray<double> mFeedback;
-  nsTArray<double> mFeedforward;
+private:
+    nsTArray<double> mFeedback;
+    nsTArray<double> mFeedforward;
 };
 
 } // namespace dom
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/MediaElementAudioSourceNode.cpp

@@ -15,29 +15,13 @@ MediaElementAudioSourceNode::MediaElementAudioSourceNode(AudioContext* aContext)
 }
 
 /* static */ already_AddRefed<MediaElementAudioSourceNode>
-MediaElementAudioSourceNode::Create(AudioContext& aAudioContext,
-                                    const MediaElementAudioSourceOptions& aOptions,
-                                    ErrorResult& aRv)
+MediaElementAudioSourceNode::Create(AudioContext* aContext,
+                                    DOMMediaStream* aStream, ErrorResult& aRv)
 {
-  if (aAudioContext.IsOffline()) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
   RefPtr<MediaElementAudioSourceNode> node =
-    new MediaElementAudioSourceNode(&aAudioContext);
+    new MediaElementAudioSourceNode(aContext);
 
-  RefPtr<DOMMediaStream> stream =
-    aOptions.mMediaElement->CaptureAudio(aRv, aAudioContext.Destination()->Stream()->Graph());
-  if (aRv.Failed()) {
-    return nullptr;
-  }
-
-  node->Init(stream, aRv);
+  node->Init(aStream, aRv);
   if (aRv.Failed()) {
     return nullptr;
   }

dom/media/webaudio/MediaElementAudioSourceNode.h

@@ -11,23 +11,11 @@
 namespace mozilla {
 namespace dom {
 
-class AudioContext;
-struct MediaElementAudioSourceOptions;
-
 class MediaElementAudioSourceNode final : public MediaStreamAudioSourceNode
 {
 public:
   static already_AddRefed<MediaElementAudioSourceNode>
-  Create(AudioContext& aAudioContext,
-         const MediaElementAudioSourceOptions& aOptions,
-         ErrorResult& aRv);
-
-  static already_AddRefed<MediaElementAudioSourceNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const MediaElementAudioSourceOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
+  Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv);
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 

dom/media/webaudio/MediaStreamAudioDestinationNode.cpp

@@ -15,7 +15,7 @@
 namespace mozilla {
 namespace dom {
 
-class AudioDestinationTrackSource final :
+class AudioDestinationTrackSource :
   public MediaStreamTrackSource
 {
 public:
@@ -49,7 +49,7 @@ public:
   }
 
 private:
-  ~AudioDestinationTrackSource() = default;
+  virtual ~AudioDestinationTrackSource() {}
 
   RefPtr<MediaStreamAudioDestinationNode> mNode;
 };
@@ -101,29 +101,8 @@ MediaStreamAudioDestinationNode::MediaStreamAudioDestinationNode(AudioContext* a
   mPort = outputStream->AllocateInputPort(mStream, AudioNodeStream::AUDIO_TRACK);
 }
 
-/* static */ already_AddRefed<MediaStreamAudioDestinationNode>
-MediaStreamAudioDestinationNode::Create(AudioContext& aAudioContext,
-                                        const AudioNodeOptions& aOptions,
-                                        ErrorResult& aRv)
+MediaStreamAudioDestinationNode::~MediaStreamAudioDestinationNode()
 {
-  if (aAudioContext.IsOffline()) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<MediaStreamAudioDestinationNode> audioNode =
-    new MediaStreamAudioDestinationNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/MediaStreamAudioDestinationNode.h

@@ -11,26 +11,14 @@
 namespace mozilla {
 namespace dom {
 
-class AudioContext;
-struct AudioNodeOptions;
-
 class MediaStreamAudioDestinationNode final : public AudioNode
 {
 public:
-  static already_AddRefed<MediaStreamAudioDestinationNode>
-  Create(AudioContext& aAudioContext, const AudioNodeOptions& aOptions,
-         ErrorResult& aRv);
+  explicit MediaStreamAudioDestinationNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamAudioDestinationNode, AudioNode)
 
-  static already_AddRefed<MediaStreamAudioDestinationNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const AudioNodeOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   uint16_t NumberOfOutputs() const final override
@@ -53,10 +41,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit MediaStreamAudioDestinationNode(AudioContext* aContext);
-  ~MediaStreamAudioDestinationNode() = default;
+protected:
+  virtual ~MediaStreamAudioDestinationNode();
 
+private:
   RefPtr<DOMMediaStream> mDOMStream;
   RefPtr<MediaInputPort> mPort;
 };

dom/media/webaudio/MediaStreamAudioSourceNode.cpp

@@ -44,23 +44,13 @@ MediaStreamAudioSourceNode::MediaStreamAudioSourceNode(AudioContext* aContext)
 }
 
 /* static */ already_AddRefed<MediaStreamAudioSourceNode>
-MediaStreamAudioSourceNode::Create(AudioContext& aAudioContext,
-                                   const MediaStreamAudioSourceOptions& aOptions,
-                                   ErrorResult& aRv)
+MediaStreamAudioSourceNode::Create(AudioContext* aContext,
+                                   DOMMediaStream* aStream, ErrorResult& aRv)
 {
-  if (aAudioContext.IsOffline()) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
   RefPtr<MediaStreamAudioSourceNode> node =
-    new MediaStreamAudioSourceNode(&aAudioContext);
+    new MediaStreamAudioSourceNode(aContext);
 
-  node->Init(aOptions.mMediaStream, aRv);
+  node->Init(aStream, aRv);
   if (aRv.Failed()) {
     return nullptr;
   }

dom/media/webaudio/MediaStreamAudioSourceNode.h

@@ -14,9 +14,6 @@ namespace mozilla {
 
 namespace dom {
 
-class AudioContext;
-struct MediaStreamAudioSourceOptions;
-
 class MediaStreamAudioSourceNodeEngine final : public AudioNodeEngine
 {
 public:
@@ -48,19 +45,11 @@ class MediaStreamAudioSourceNode : public AudioNode,
 {
 public:
   static already_AddRefed<MediaStreamAudioSourceNode>
-  Create(AudioContext& aContext, const MediaStreamAudioSourceOptions& aOptions,
-         ErrorResult& aRv);
+  Create(AudioContext* aContext, DOMMediaStream* aStream, ErrorResult& aRv);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(MediaStreamAudioSourceNode, AudioNode)
 
-  static already_AddRefed<MediaStreamAudioSourceNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const MediaStreamAudioSourceOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void DestroyMediaStream() override;

dom/media/webaudio/OscillatorNode.cpp

@@ -425,35 +425,8 @@ OscillatorNode::OscillatorNode(AudioContext* aContext)
   mStream->AddMainThreadListener(this);
 }
 
-/* static */ already_AddRefed<OscillatorNode>
-OscillatorNode::Create(AudioContext& aAudioContext,
-                       const OscillatorOptions& aOptions,
-                       ErrorResult& aRv)
+OscillatorNode::~OscillatorNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<OscillatorNode> audioNode = new OscillatorNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->SetType(aOptions.mType, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->Frequency()->SetValue(aOptions.mFrequency);
-  audioNode->Detune()->SetValue(aOptions.mDetune);
-
-  if (aOptions.mPeriodicWave.WasPassed()) {
-    audioNode->SetPeriodicWave(aOptions.mPeriodicWave.Value());
-  }
-
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/OscillatorNode.h

@@ -15,26 +15,16 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct OscillatorOptions;
 
 class OscillatorNode final : public AudioNode,
                              public MainThreadMediaStreamListener
 {
 public:
-  static already_AddRefed<OscillatorNode>
-  Create(AudioContext& aAudioContext, const OscillatorOptions& aOptions,
-         ErrorResult& aRv);
+  explicit OscillatorNode(AudioContext* aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(OscillatorNode, AudioNode)
 
-  static already_AddRefed<OscillatorNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const OscillatorOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
   void DestroyMediaStream() override;
@@ -91,13 +81,14 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit OscillatorNode(AudioContext* aContext);
-  ~OscillatorNode() = default;
+protected:
+  virtual ~OscillatorNode();
 
+private:
   void SendTypeToStream();
   void SendPeriodicWaveToStream();
 
+private:
   OscillatorType mType;
   RefPtr<PeriodicWave> mPeriodicWave;
   RefPtr<AudioParam> mFrequency;
@@ -109,3 +100,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/PannerNode.cpp

@@ -329,38 +329,6 @@ PannerNode::~PannerNode()
   }
 }
 
-/* static */ already_AddRefed<PannerNode>
-PannerNode::Create(AudioContext& aAudioContext,
-                   const PannerOptions& aOptions,
-                   ErrorResult& aRv)
-{
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<PannerNode> audioNode = new PannerNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->SetPanningModel(aOptions.mPanningModel);
-  audioNode->SetDistanceModel(aOptions.mDistanceModel);
-  audioNode->SetPosition(aOptions.mPositionX, aOptions.mPositionY,
-                         aOptions.mPositionZ);
-  audioNode->SetOrientation(aOptions.mOrientationX, aOptions.mOrientationY,
-                            aOptions.mOrientationZ);
-  audioNode->SetRefDistance(aOptions.mRefDistance);
-  audioNode->SetMaxDistance(aOptions.mMaxDistance);
-  audioNode->SetRolloffFactor(aOptions.mRolloffFactor);
-  audioNode->SetConeInnerAngle(aOptions.mConeInnerAngle);
-  audioNode->SetConeOuterAngle(aOptions.mConeOuterAngle);
-  audioNode->SetConeOuterGain(aOptions.mConeOuterGain);
-
-  return audioNode.forget();
-}
-
 void PannerNode::SetPanningModel(PanningModelType aPanningModel)
 {
   mPanningModel = aPanningModel;
@@ -816,3 +784,4 @@ PannerNode::SendDopplerToSourcesIfNeeded()
 
 } // namespace dom
 } // namespace mozilla
+

dom/media/webaudio/PannerNode.h

@@ -19,24 +19,13 @@ namespace dom {
 
 class AudioContext;
 class AudioBufferSourceNode;
-struct PannerOptions;
 
 class PannerNode final : public AudioNode,
                          public SupportsWeakPtr<PannerNode>
 {
 public:
-  static already_AddRefed<PannerNode>
-  Create(AudioContext& aAudioContext, const PannerOptions& aOptions,
-         ErrorResult& aRv);
-
   MOZ_DECLARE_WEAKREFERENCE_TYPENAME(PannerNode)
-
-  static already_AddRefed<PannerNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const PannerOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
+  explicit PannerNode(AudioContext* aContext);
 
   JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
@@ -240,10 +229,10 @@ public:
   size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit PannerNode(AudioContext* aContext);
-  ~PannerNode();
+protected:
+  virtual ~PannerNode();
 
+private:
   friend class AudioListener;
   friend class PannerNodeEngine;
   enum EngineParameters {
@@ -303,3 +292,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/PeriodicWave.cpp

@@ -43,32 +43,6 @@ PeriodicWave::PeriodicWave(AudioContext* aContext,
   mCoefficients->SetData(1, nullptr, free, buffer+aLength);
 }
 
-/* static */ already_AddRefed<PeriodicWave>
-PeriodicWave::Constructor(const GlobalObject& aGlobal,
-                          AudioContext& aAudioContext,
-                          const PeriodicWaveOptions& aOptions,
-                          ErrorResult& aRv)
-{
-  if (!aOptions.mReal.WasPassed() || !aOptions.mImag.WasPassed() ||
-      aOptions.mReal.Value().Length() != aOptions.mImag.Value().Length() ||
-      aOptions.mReal.Value().Length() == 0) {
-    aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR);
-    return nullptr;
-  }
-
-  RefPtr<PeriodicWave> wave =
-    new PeriodicWave(&aAudioContext, aOptions.mReal.Value().Elements(),
-                     aOptions.mImag.Value().Elements(),
-                     aOptions.mReal.Value().Length(),
-                     aOptions.mDisableNormalization,
-                     aRv);
-  if (aRv.Failed()) {
-    return nullptr;
-  }
-
-  return wave.forget();
-}
-
 size_t
 PeriodicWave::SizeOfExcludingThisIfNotShared(MallocSizeOf aMallocSizeOf) const
 {
@@ -96,3 +70,4 @@ PeriodicWave::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
 
 } // namespace dom
 } // namespace mozilla
+

dom/media/webaudio/PeriodicWave.h

@@ -16,9 +16,6 @@ namespace mozilla {
 
 namespace dom {
 
-class AudioContext;
-struct PeriodicWaveOptions;
-
 class PeriodicWave final : public nsWrapperCache
 {
 public:
@@ -32,10 +29,6 @@ public:
   NS_INLINE_DECL_CYCLE_COLLECTING_NATIVE_REFCOUNTING(PeriodicWave)
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_NATIVE_CLASS(PeriodicWave)
 
-  static already_AddRefed<PeriodicWave>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const PeriodicWaveOptions& aOptions, ErrorResult& aRv);
-
   AudioContext* GetParentObject() const
   {
     return mContext;
@@ -62,7 +55,7 @@ public:
   size_t SizeOfIncludingThisIfNotShared(MallocSizeOf aMallocSizeOf) const;
 
 private:
-  ~PeriodicWave() = default;
+  ~PeriodicWave() {}
 
   RefPtr<AudioContext> mContext;
   RefPtr<ThreadSharedFloatArrayBufferList> mCoefficients;

dom/media/webaudio/StereoPannerNode.cpp

@@ -182,24 +182,8 @@ StereoPannerNode::StereoPannerNode(AudioContext* aContext)
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<StereoPannerNode>
-StereoPannerNode::Create(AudioContext& aAudioContext,
-                         const StereoPannerOptions& aOptions,
-                         ErrorResult& aRv)
+StereoPannerNode::~StereoPannerNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
-
-  RefPtr<StereoPannerNode> audioNode = new StereoPannerNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  audioNode->Pan()->SetValue(aOptions.mPan);
-  return audioNode.forget();
 }
 
 size_t

dom/media/webaudio/StereoPannerNode.h

@@ -13,23 +13,12 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct StereoPannerOptions;
 
 class StereoPannerNode final : public AudioNode
 {
 public:
-  static already_AddRefed<StereoPannerNode>
-  Create(AudioContext& aAudioContext, const StereoPannerOptions& aOptions,
-         ErrorResult& aRv);
-
   MOZ_DECLARE_REFCOUNTED_TYPENAME(StereoPannerNode)
-
-  static already_AddRefed<StereoPannerNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const StereoPannerOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
+  explicit StereoPannerNode(AudioContext* aContext);
 
   virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
 
@@ -66,10 +55,10 @@ public:
   virtual size_t SizeOfExcludingThis(MallocSizeOf aMallocSizeOf) const override;
   virtual size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const override;
 
-private:
-  explicit StereoPannerNode(AudioContext* aContext);
-  ~StereoPannerNode() = default;
+protected:
+  virtual ~StereoPannerNode();
 
+private:
   RefPtr<AudioParam> mPan;
 };
 
@@ -77,3 +66,4 @@ private:
 } // namespace mozilla
 
 #endif
+

dom/media/webaudio/WaveShaperNode.cpp

@@ -18,6 +18,7 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(WaveShaperNode)
 
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(WaveShaperNode, AudioNode)
   NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER
+  tmp->ClearCurve();
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(WaveShaperNode, AudioNode)
@@ -25,6 +26,7 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
 
 NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN(WaveShaperNode)
   NS_IMPL_CYCLE_COLLECTION_TRACE_PRESERVED_WRAPPER
+  NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mCurve)
 NS_IMPL_CYCLE_COLLECTION_TRACE_END
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WaveShaperNode)
@@ -311,39 +313,27 @@ WaveShaperNode::WaveShaperNode(AudioContext* aContext)
               2,
               ChannelCountMode::Max,
               ChannelInterpretation::Speakers)
+  , mCurve(nullptr)
   , mType(OverSampleType::None)
 {
+  mozilla::HoldJSObjects(this);
+
   WaveShaperNodeEngine* engine = new WaveShaperNodeEngine(this);
   mStream = AudioNodeStream::Create(aContext, engine,
                                     AudioNodeStream::NO_STREAM_FLAGS,
                                     aContext->Graph());
 }
 
-/* static */ already_AddRefed<WaveShaperNode>
-WaveShaperNode::Create(AudioContext& aAudioContext,
-                       const WaveShaperOptions& aOptions,
-                       ErrorResult& aRv)
+WaveShaperNode::~WaveShaperNode()
 {
-  if (aAudioContext.CheckClosed(aRv)) {
-    return nullptr;
-  }
+  ClearCurve();
+}
 
-  RefPtr<WaveShaperNode> audioNode = new WaveShaperNode(&aAudioContext);
-
-  audioNode->Initialize(aOptions, aRv);
-  if (NS_WARN_IF(aRv.Failed())) {
-    return nullptr;
-  }
-
-  if (aOptions.mCurve.WasPassed()) {
-    audioNode->SetCurveInternal(aOptions.mCurve.Value(), aRv);
-    if (NS_WARN_IF(aRv.Failed())) {
-      return nullptr;
-    }
-  }
-
-  audioNode->SetOversample(aOptions.mOversample);
-  return audioNode.forget();
+void
+WaveShaperNode::ClearCurve()
+{
+  mCurve = nullptr;
+  mozilla::DropJSObjects(this);
 }
 
 JSObject*
@@ -355,85 +345,45 @@ WaveShaperNode::WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto)
 void
 WaveShaperNode::SetCurve(const Nullable<Float32Array>& aCurve, ErrorResult& aRv)
 {
-  // Let's purge the cached value for the curve attribute.
-  WaveShaperNodeBinding::ClearCachedCurveValue(this);
-
-  if (aCurve.IsNull()) {
-    CleanCurveInternal();
-    return;
-  }
-
-  const Float32Array& floats = aCurve.Value();
-
-  floats.ComputeLengthAndData();
-  if (floats.IsShared()) {
-    // Throw if the object is mapping shared memory (must opt in).
-    aRv.ThrowTypeError<MSG_TYPEDARRAY_IS_SHARED>(NS_LITERAL_STRING("Argument of WaveShaperNode.setCurve"));
-    return;
-  }
-
   nsTArray<float> curve;
-  uint32_t argLength = floats.Length();
-  if (!curve.SetLength(argLength, fallible)) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return;
+  if (!aCurve.IsNull()) {
+    const Float32Array& floats = aCurve.Value();
+
+    floats.ComputeLengthAndData();
+    if (floats.IsShared()) {
+      // Throw if the object is mapping shared memory (must opt in).
+      aRv.ThrowTypeError<MSG_TYPEDARRAY_IS_SHARED>(NS_LITERAL_STRING("Argument of WaveShaperNode.setCurve"));
+      return;
+    }
+
+    uint32_t argLength = floats.Length();
+    if (argLength < 2) {
+      aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
+      return;
+    }
+
+    if (!curve.SetLength(argLength, fallible)) {
+      aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
+      return;
+    }
+
+    PodCopy(curve.Elements(), floats.Data(), floats.Length());
+
+    mCurve = floats.Obj();
+  } else {
+    mCurve = nullptr;
   }
 
-  PodCopy(curve.Elements(), floats.Data(), argLength);
-  SetCurveInternal(curve, aRv);
-}
-
-void
-WaveShaperNode::SetCurveInternal(const nsTArray<float>& aCurve,
-                                 ErrorResult& aRv)
-{
-  if (aCurve.Length() < 2) {
-    aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
-    return;
-  }
-
-  mCurve = aCurve;
-  SendCurveToStream();
-}
-
-void
-WaveShaperNode::CleanCurveInternal()
-{
-  mCurve.Clear();
-  SendCurveToStream();
-}
-
-void
-WaveShaperNode::SendCurveToStream()
-{
   AudioNodeStream* ns = mStream;
   MOZ_ASSERT(ns, "Why don't we have a stream here?");
-
-  nsTArray<float> copyCurve(mCurve);
-  ns->SetRawArrayData(copyCurve);
-}
-
-void
-WaveShaperNode::GetCurve(JSContext* aCx,
-                         JS::MutableHandle<JSObject*> aRetval)
-{
-  // Let's return a null value if the list is empty.
-  if (mCurve.IsEmpty()) {
-    aRetval.set(nullptr);
-    return;
-  }
-
-  MOZ_ASSERT(mCurve.Length() >= 2);
-  aRetval.set(Float32Array::Create(aCx, this, mCurve.Length(),
-                                   mCurve.Elements()));
+  ns->SetRawArrayData(curve);
 }
 
 void
 WaveShaperNode::SetOversample(OverSampleType aType)
 {
   mType = aType;
-  SendInt32ParameterToStream(WaveShaperNodeEngine::TYPE,
-                             static_cast<int32_t>(aType));
+  SendInt32ParameterToStream(WaveShaperNodeEngine::TYPE, static_cast<int32_t>(aType));
 }
 
 } // namespace dom

dom/media/webaudio/WaveShaperNode.h

@@ -14,28 +14,21 @@ namespace mozilla {
 namespace dom {
 
 class AudioContext;
-struct WaveShaperOptions;
 
 class WaveShaperNode final : public AudioNode
 {
 public:
-  static already_AddRefed<WaveShaperNode>
-  Create(AudioContext& aAudioContext, const WaveShaperOptions& aOptions,
-         ErrorResult& aRv);
+  explicit WaveShaperNode(AudioContext *aContext);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(WaveShaperNode, AudioNode)
 
-  static already_AddRefed<WaveShaperNode>
-  Constructor(const GlobalObject& aGlobal, AudioContext& aAudioContext,
-              const WaveShaperOptions& aOptions, ErrorResult& aRv)
-  {
-    return Create(aAudioContext, aOptions, aRv);
-  }
-
   JSObject* WrapObject(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) override;
 
-  void GetCurve(JSContext* aCx, JS::MutableHandle<JSObject*> aRetval);
+  void GetCurve(JSContext* aCx, JS::MutableHandle<JSObject*> aRetval) const
+  {
+    aRetval.set(mCurve);
+  }
   void SetCurve(const Nullable<Float32Array>& aData, ErrorResult& aRv);
 
   OverSampleType Oversample() const
@@ -61,17 +54,14 @@ public:
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
+protected:
+  virtual ~WaveShaperNode();
+
 private:
-  explicit WaveShaperNode(AudioContext *aContext);
-  ~WaveShaperNode() = default;
+  void ClearCurve();
 
-  void SetCurveInternal(const nsTArray<float>& aCurve,
-                        ErrorResult& aRv);
-  void CleanCurveInternal();
-
-  void SendCurveToStream();
-
-  nsTArray<float> mCurve;
+private:
+  JS::Heap<JSObject*> mCurve;
   OverSampleType mType;
 };
 

dom/media/webaudio/test/test_analyserNode.html

@@ -10,7 +10,9 @@
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
-function testNode() {
+SimpleTest.waitForExplicitFinish();
+addLoadEvent(function() {
+
   var context = new AudioContext();
   var buffer = context.createBuffer(1, 2048, context.sampleRate);
   for (var i = 0; i < 2048; ++i) {
@@ -82,7 +84,7 @@ function testNode() {
     analyser.maxDecibels = -101;
   }, DOMException.INDEX_SIZE_ERR);
 
-  ok(Math.abs(analyser.smoothingTimeConstant - 0.8) < 0.001, "Correct default value for smoothingTimeConstant");
+  is(analyser.smoothingTimeConstant, 0.8, "Correct default value for smoothingTimeConstant");
   expectException(function() {
     analyser.smoothingTimeConstant = -0.1;
   }, DOMException.INDEX_SIZE_ERR);
@@ -91,83 +93,6 @@ function testNode() {
   }, DOMException.INDEX_SIZE_ERR);
   analyser.smoothingTimeConstant = 0;
   analyser.smoothingTimeConstant = 1;
-}
-
-function testConstructor() {
-  var context = new AudioContext();
-
-  var analyser = new AnalyserNode(context);
-  is(analyser.channelCount, 1, "analyser node has 1 input channels by default");
-  is(analyser.channelCountMode, "max", "Correct channelCountMode for the analyser node");
-  is(analyser.channelInterpretation, "speakers", "Correct channelCountInterpretation for the analyser node");
-
-  is(analyser.fftSize, 2048, "Correct default value for fftSize");
-  is(analyser.frequencyBinCount, 1024, "Correct default value for frequencyBinCount");
-  is(analyser.minDecibels, -100, "Correct default value for minDecibels");
-  is(analyser.maxDecibels, -30, "Correct default value for maxDecibels");
-  ok(Math.abs(analyser.smoothingTimeConstant - 0.8) < 0.001, "Correct default value for smoothingTimeConstant");
-
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 0 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 1 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 8 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 100 }); // non-power of two
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 2049 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 4097 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 8193 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 16385 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 32769 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { fftSize: 65536 });
-  }, DOMException.INDEX_SIZE_ERR);
-  analyser = new AnalyserNode(context, { fftSize: 1024 });
-  is(analyser.frequencyBinCount, 512, "Correct new value for frequencyBinCount");
-
-  expectException(function() {
-    analyser = new AnalyserNode(context, { minDecibels: -30 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { minDecibels: -29 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { maxDecibels: -100 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { maxDecibels: -101 });
-  }, DOMException.INDEX_SIZE_ERR);
-
-  expectException(function() {
-    analyser = new AnalyserNode(context, { smoothingTimeConstant: -0.1 });
-  }, DOMException.INDEX_SIZE_ERR);
-  expectException(function() {
-    analyser = new AnalyserNode(context, { smoothingTimeConstant: -1.1 });
-  }, DOMException.INDEX_SIZE_ERR);
-  analyser = new AnalyserNode(context, { smoothingTimeConstant: 0 });
-  analyser = new AnalyserNode(context, { smoothingTimeConstant: 1 });
-}
-
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
-
-  testNode();
-  testConstructor();
 
   SimpleTest.finish();
 });

dom/media/webaudio/test/test_audioBufferSourceNodeLoopStartEnd.html

@@ -19,8 +19,12 @@ var gTest = {
       buffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
     }
 
-    var source = new AudioBufferSourceNode(context, {buffer: buffer, loop: true, loopStart: buffer.duration * 0.25, loopEnd: buffer.duration * 0.75 });
+    var source = context.createBufferSource();
+    source.buffer = buffer;
     source.start(0);
+    source.loop = true;
+    source.loopStart = buffer.duration * 0.25;
+    source.loopEnd = buffer.duration * 0.75;
     return source;
   },
   createExpectedBuffers: function(context) {

dom/media/webaudio/test/test_channelMergerNode.html

@@ -24,7 +24,7 @@ var gTest = {
       buffers.push(buffer);
     }
 
-    var merger = new ChannelMergerNode(context);
+    var merger = context.createChannelMerger();
     is(merger.channelCount, 1, "merger node has 1 input channels");
     is(merger.channelCountMode, "explicit", "Correct channelCountMode for the merger node");
     is(merger.channelInterpretation, "speakers", "Correct channelCountInterpretation for the merger node");

dom/media/webaudio/test/test_channelSplitterNode.html

@@ -29,7 +29,7 @@ addLoadEvent(function() {
 
   var source = context.createBufferSource();
 
-  var splitter = new ChannelSplitterNode(context);
+  var splitter = context.createChannelSplitter();
   is(splitter.channelCount, 2, "splitter node has 2 input channels by default");
   is(splitter.channelCountMode, "max", "Correct channelCountMode for the splitter node");
   is(splitter.channelInterpretation, "speakers", "Correct channelCountInterpretation for the splitter node");

dom/media/webaudio/test/test_convolverNode.html

@@ -13,7 +13,7 @@
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
   var context = new AudioContext();
-  var conv = new ConvolverNode(context);
+  var conv = context.createConvolver();
 
   is(conv.channelCount, 2, "Convolver node has 2 input channels by default");
   is(conv.channelCountMode, "clamped-max", "Correct channelCountMode for the Convolver node");

dom/media/webaudio/test/test_delayNode.html

@@ -14,19 +14,6 @@ var gTest = {
   length: 4096,
   numberOfChannels: 1,
   createGraph: function(context) {
-    var delay = new DelayNode(context);
-    ok(delay.delayTime, "The audioparam member must exist");
-    is(delay.delayTime.value, 0, "Correct initial value");
-    is(delay.delayTime.defaultValue, 0, "Correct default value");
-    delay.delayTime.value = 0.5;
-    is(delay.delayTime.value, 0.5, "Correct initial value");
-    is(delay.delayTime.defaultValue, 0, "Correct default value");
-
-    delay = new DelayNode(context, { delayTime: 0.5 });
-    ok(delay.delayTime, "The audioparam member must exist");
-    is(delay.delayTime.value, 0.5, "Correct initial value");
-    is(delay.delayTime.defaultValue, 0, "Correct default value");
-
     var buffer = context.createBuffer(1, 2048, context.sampleRate);
     for (var i = 0; i < 2048; ++i) {
       buffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
@@ -34,7 +21,7 @@ var gTest = {
 
     var source = context.createBufferSource();
 
-    delay = context.createDelay();
+    var delay = context.createDelay();
 
     source.buffer = buffer;
 
@@ -62,20 +49,6 @@ var gTest = {
     expectException(function() {
       context.createDelay(-1);
     }, DOMException.NOT_SUPPORTED_ERR);
-
-    expectException(function() {
-      new DelayNode(context, { maxDelayTime: 0 });
-    }, DOMException.NOT_SUPPORTED_ERR);
-    expectException(function() {
-      new DelayNode(context, { maxDelayTime: 180 });
-    }, DOMException.NOT_SUPPORTED_ERR);
-    expectTypeError(function() {
-      new DelayNode(context, { maxDelayTime: NaN });
-    }, DOMException.NOT_SUPPORTED_ERR);
-    expectException(function() {
-      new DelayNode(context, { maxDelayTime: -1 });
-    }, DOMException.NOT_SUPPORTED_ERR);
-
     context.createDelay(1); // should not throw
 
     // Delay the source stream by 2048 frames

dom/media/webaudio/test/test_dynamicsCompressorNode.html

@@ -20,7 +20,7 @@ addLoadEvent(function() {
   var osc = context.createOscillator();
   var sp = context.createScriptProcessor();
 
-  var compressor = new DynamicsCompressorNode(context);
+  var compressor = context.createDynamicsCompressor();
 
   osc.connect(compressor);
   osc.connect(sp);

dom/media/webaudio/test/test_gainNode.html

@@ -14,32 +14,17 @@ var gTest = {
   length: 2048,
   numberOfChannels: 1,
   createGraph: function(context) {
-
-    var gain = new GainNode(context);
-    ok(gain.gain, "The audioparam member must exist");
-    is(gain.gain.value, 1.0, "Correct initial value");
-    is(gain.gain.defaultValue, 1.0, "Correct default value");
-    gain.gain.value = 0.5;
-    is(gain.gain.value, 0.5, "Correct initial value");
-    is(gain.gain.defaultValue, 1.0, "Correct default value");
-
-    gain = new GainNode(context, { gain: 0.5 });
-    ok(gain.gain, "The audioparam member must exist");
-    is(gain.gain.value, 0.5, "Correct initial value");
-    is(gain.gain.defaultValue, 1.0, "Correct default value");
-    gain.gain.value = 0.5;
-    is(gain.gain.value, 0.5, "Correct initial value");
-    is(gain.gain.defaultValue, 1.0, "Correct default value");
-
     var buffer = context.createBuffer(1, 2048, context.sampleRate);
     for (var i = 0; i < 2048; ++i) {
       buffer.getChannelData(0)[i] = Math.sin(440 * 2 * Math.PI * i / context.sampleRate);
     }
 
     var source = context.createBufferSource();
+
+    var gain = context.createGain();
+
     source.buffer = buffer;
 
-    gain = context.createGain();
     source.connect(gain);
 
     ok(gain.gain, "The audioparam member must exist");

dom/media/webaudio/test/test_mediaElementAudioSourceNode.html

@@ -56,7 +56,7 @@ function test() {
   }
 
   audio.onloadedmetadata = function() {
-    var node = new MediaElementAudioSourceNode(context, { mediaElement: audio });
+    var node = context.createMediaElementSource(audio);
     var sp = context.createScriptProcessor(2048, 1);
     node.connect(sp);
     // Use a fuzz factor of 100 to account for samples that just happen to be zero

dom/media/webaudio/test/test_mediaStreamAudioDestinationNode.html

@@ -23,7 +23,7 @@ addLoadEvent(function() {
   var source = context.createBufferSource();
   source.buffer = buffer;
 
-  var dest = new MediaStreamAudioDestinationNode(context);
+  var dest = context.createMediaStreamDestination();
   source.connect(dest);
 
   var elem = document.getElementById('audioelem');

dom/media/webaudio/test/test_mediaStreamAudioSourceNode.html

@@ -31,7 +31,7 @@ var gTest = {
     source.connect(dest);
     source.start(0);
 
-    var mediaStreamSource = new MediaStreamAudioSourceNode(context, { mediaStream: dest.stream });
+    var mediaStreamSource = context.createMediaStreamSource(dest.stream);
     // channelCount and channelCountMode should have no effect
     mediaStreamSource.channelCount = 1;
     mediaStreamSource.channelCountMode = "explicit";

dom/media/webaudio/test/test_oscillatorNode.html

@@ -14,7 +14,7 @@ SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
 
   var context = new AudioContext();
-  var osc = new OscillatorNode(context);
+  var osc = context.createOscillator();
 
   is(osc.channelCount, 2, "Oscillator node has 2 input channels by default");
   is(osc.channelCountMode, "max", "Correct channelCountMode for the Oscillator node");

dom/media/webaudio/test/test_pannerNode.html

@@ -25,7 +25,7 @@ addLoadEvent(function() {
 
   var source = context.createBufferSource();
 
-  var panner = new PannerNode(context);
+  var panner = context.createPanner();
 
   source.buffer = buffer;
 

dom/media/webaudio/test/test_stereoPannerNode.html

@@ -49,7 +49,7 @@ function applyMonoToStereoPanning(c, panning) {
 
 // Test the DOM interface
 var context = new OfflineAudioContext(1, 1, SR);
-var stereoPanner = new StereoPannerNode(context);
+var stereoPanner = context.createStereoPanner();
 ok(stereoPanner.pan, "The AudioParam member must exist");
 is(stereoPanner.pan.value, 0.0, "Correct initial value");
 is(stereoPanner.pan.defaultValue, 0.0, "Correct default value");
@@ -70,11 +70,8 @@ function sine(t) {
 
 // A couple mono and stereo buffers: the StereoPannerNode equation is different
 // if the input is mono or stereo
-var stereoBuffer = new AudioBuffer(context, { numberOfChannels: 2,
-                                              length: BUF_SIZE });
-var monoBuffer = new AudioBuffer(context, { numberOfChannels: 1,
-                                            length: BUF_SIZE,
-                                            sampleRate: context.sampleRate });
+var stereoBuffer = context.createBuffer(2, BUF_SIZE, context.sampleRate);
+var monoBuffer = context.createBuffer(1, BUF_SIZE, context.sampleRate);
 for (var i = 0; i < BUF_SIZE; ++i) {
   monoBuffer.getChannelData(0)[i]   =
   stereoBuffer.getChannelData(0)[i] =
@@ -84,9 +81,7 @@ for (var i = 0; i < BUF_SIZE; ++i) {
 // Expected test vectors
 function expectedBufferNoop(gain) {
   gain = gain || 1.0;
-  var expectedBuffer = new AudioBuffer(context, { numberOfChannels: 2,
-                                                  length: BUF_SIZE,
-                                                  sampleRate: SR });
+  var expectedBuffer = context.createBuffer(2, BUF_SIZE, SR);
   for (var i = 0; i < BUF_SIZE; i++) {
     expectedBuffer.getChannelData(0)[i] = gain * sine(i);
     expectedBuffer.getChannelData(1)[i] = gain * sine(i);
@@ -96,9 +91,7 @@ function expectedBufferNoop(gain) {
 
 function expectedBufferForStereo(gain) {
   gain = gain || 1.0;
-  var expectedBuffer = new AudioBuffer(context, { numberOfChannels: 2,
-                                                  length: BUF_SIZE,
-                                                  sampleRate: SR });
+  var expectedBuffer = context.createBuffer(2, BUF_SIZE, SR);
   var gainPanning = gainForPanningStereoToStereo(PANNING);
   gainPanning[0] *= gain;
   gainPanning[1] *= gain;
@@ -113,9 +106,7 @@ function expectedBufferForStereo(gain) {
 
 function expectedBufferForMono(gain) {
   gain = gain || 1.0;
-  var expectedBuffer = new AudioBuffer(context, { numberOfChannels: 2,
-                                                  length: BUF_SIZE,
-                                                  sampleRate: SR });
+  var expectedBuffer = context.createBuffer(2, BUF_SIZE, SR);
   var gainPanning = gainForPanningMonoToStereo(PANNING);
   gainPanning[0] *= gain;
   gainPanning[1] *= gain;

dom/media/webaudio/test/test_waveShaper.html

@@ -17,7 +17,7 @@ var gTest = {
     var source = context.createBufferSource();
     source.buffer = this.buffer;
 
-    var shaper = new WaveShaperNode(context);
+    var shaper = context.createWaveShaper();
     shaper.curve = this.curve;
 
     source.connect(shaper);

dom/script/ScriptLoader.cpp

@@ -613,6 +613,14 @@ ScriptLoader::CreateModuleScript(ModuleLoadRequest* aRequest)
 
   nsresult rv;
   {
+    // Update our current script.
+    Maybe<AutoCurrentScriptUpdater> masterScriptUpdater;
+    nsCOMPtr<nsIDocument> master = mDocument->MasterDocument();
+    if (master != mDocument) {
+      masterScriptUpdater.emplace(master->ScriptLoader(),
+                                  aRequest->Element());
+    }
+
     JSContext* cx = aes.cx();
     JS::Rooted<JSObject*> module(cx);
 
@@ -2315,14 +2323,8 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
     return NS_ERROR_FAILURE;
   }
 
-  // Update our current script.
-  // This must be destroyed after destroying nsAutoMicroTask.
-  nsIScriptElement* currentScript =
-      aRequest->IsModuleRequest() ? nullptr : aRequest->Element();
-  AutoCurrentScriptUpdater scriptUpdater(this, currentScript);
-
   // New script entry point required, due to the "Create a script" sub-step of
-  // http://html.spec.whatwg.org/multipage/#execute-the-script-block
+  // http://www.whatwg.org/specs/web-apps/current-work/#execute-the-script-block
   nsAutoMicroTask mt;
   AutoEntryScript aes(globalObject, "<script> element", true);
   JSContext* cx = aes.cx();
@@ -2380,6 +2382,9 @@ ScriptLoader::EvaluateScript(ScriptLoadRequest* aRequest)
         FinishDynamicImport(cx, request, rv);
       }
     } else {
+      // Update our current script.
+      AutoCurrentScriptUpdater scriptUpdater(this, aRequest->Element());
+
       JS::CompileOptions options(cx);
       rv = FillCompileOptionsForRequest(aes, aRequest, global, &options);
 

dom/script/ScriptLoader.h

@@ -324,9 +324,7 @@ class ScriptLoader final : public nsISupports
       : mOldScript(aScriptLoader->mCurrentScript)
       , mScriptLoader(aScriptLoader)
     {
-      nsCOMPtr<nsINode> node = do_QueryInterface(aCurrentScript);
-      mScriptLoader->mCurrentScript =
-        node && !node->IsInShadowTree() ? aCurrentScript : nullptr;
+      mScriptLoader->mCurrentScript = aCurrentScript;
     }
     ~AutoCurrentScriptUpdater()
     {

dom/url/URL.cpp

@@ -57,84 +57,7 @@ CreateObjectURLInternal(const GlobalObject& aGlobal, T aObject,
   CopyASCIItoUTF16(url, aResult);
 }
 
-bool
-IsRootRelativePathInput(const nsAString& aURL)
-{
-  return !aURL.IsEmpty() && aURL.CharAt(0) == '/' &&
-         (aURL.Length() == 1 || aURL.CharAt(1) != '/');
-}
-
-bool
-BuildRootRelativeFallbackSpec(const nsAString& aURL, nsIURI* aBase,
-                              nsACString& aFallbackSpec)
-{
-  MOZ_ASSERT(aBase);
-  MOZ_ASSERT(IsRootRelativePathInput(aURL));
-
-  nsAutoCString baseSpec;
-  if (NS_FAILED(aBase->GetSpec(baseSpec)) || baseSpec.IsEmpty()) {
-    return false;
-  }
-
-  int32_t colon = baseSpec.FindChar(':');
-  if (colon <= 0) {
-    return false;
-  }
-
-  uint32_t afterColon = static_cast<uint32_t>(colon + 1);
-  if (afterColon >= baseSpec.Length() || baseSpec.CharAt(afterColon) != '/') {
-    // Opaque paths (for example mailto:test@example.com) are not valid bases
-    // for root-relative URL input.
-    return false;
-  }
-
-  nsAutoCString input;
-  if (!AppendUTF16toUTF8(aURL, input, fallible)) {
-    return false;
-  }
-
-  // Preserve authority when present (scheme://authority/path -> scheme://authority/input)
-  if (afterColon + 1 < baseSpec.Length() && baseSpec.CharAt(afterColon + 1) == '/') {
-    uint32_t authorityEnd = afterColon + 2;
-    while (authorityEnd < baseSpec.Length()) {
-      char c = baseSpec.CharAt(authorityEnd);
-      if (c == '/' || c == '?' || c == '#') {
-        break;
-      }
-      ++authorityEnd;
-    }
-
-    aFallbackSpec.Assign(Substring(baseSpec, 0, authorityEnd));
-    aFallbackSpec.Append(input);
-    return true;
-  }
-
-  // Single-slash hierarchical base (scheme:/path -> scheme:/input)
-  aFallbackSpec.Assign(Substring(baseSpec, 0, afterColon));
-  aFallbackSpec.Append(input);
-  return true;
-}
-
-bool
-TryResolveRootRelativeAgainstBase(const nsAString& aURL, nsIURI* aBase,
-                                  nsIURI** aOutURI)
-{
-  MOZ_ASSERT(aOutURI);
-
-  if (!aBase || !IsRootRelativePathInput(aURL)) {
-    return false;
-  }
-
-  nsAutoCString fallbackSpec;
-  if (!BuildRootRelativeFallbackSpec(aURL, aBase, fallbackSpec)) {
-    return false;
-  }
-
-  nsresult rv = NS_NewURI(aOutURI, fallbackSpec, nullptr, nullptr,
-                          nsContentUtils::GetIOService());
-  return NS_SUCCEEDED(rv);
-}
-
+// The URL implementation for the main-thread
 class URLMainThread final : public URL
 {
 public:
@@ -306,8 +229,7 @@ URLMainThread::Constructor(nsISupports* aParent, const nsAString& aURL,
   nsCOMPtr<nsIURI> uri;
   nsresult rv = NS_NewURI(getter_AddRefs(uri), aURL, nullptr, aBase,
                           nsContentUtils::GetIOService());
-  if (NS_FAILED(rv) &&
-      !TryResolveRootRelativeAgainstBase(aURL, aBase, getter_AddRefs(uri))) {
+  if (NS_FAILED(rv)) {
     // No need to warn in this case. It's common to use the URL constructor
     // to determine if a URL is valid and an exception will be propagated.
     aRv.ThrowTypeError<MSG_INVALID_URL>(aURL);
@@ -1792,14 +1714,30 @@ URL::IsValidURL(const GlobalObject& aGlobal, const nsAString& aURL,
 bool
 URL::CanParse(const GlobalObject& aGlobal, const nsAString& aURL,
               const Optional<nsAString>& aBase) {
-  ErrorResult rv;
-  RefPtr<URL> parsed = URL::Constructor(aGlobal, aURL, aBase, rv);
-  if (rv.Failed() || !parsed) {
-    rv.SuppressException();
+  nsCOMPtr<nsIURI> baseUri;
+  if (aBase.WasPassed()) {
+    // Don't use NS_ConvertUTF16toUTF8 because that doesn't let us handle OOM.
+    nsAutoCString base;
+    if (!AppendUTF16toUTF8(aBase.Value(), base, fallible)) {
+      // Just return false with OOM errors as no ErrorResult.
+      return false;
+    }
+
+    nsresult rv = NS_NewURI(getter_AddRefs(baseUri), base);
+    if (NS_FAILED(rv)) {
+      // Invalid base URL, return false.
+      return false;
+    }
+  }
+
+  nsAutoCString urlStr;
+  if (!AppendUTF16toUTF8(aURL, urlStr, fallible)) {
+    // Just return false with OOM errors as no ErrorResult.
     return false;
   }
 
-  return true;
+  nsCOMPtr<nsIURI> uri;
+  return NS_SUCCEEDED(NS_NewURI(getter_AddRefs(uri), urlStr, nullptr, baseUri));
 }
 
 URLSearchParams*

dom/url/tests/test_url.html

@@ -1,462 +1,460 @@
-<!doctype html>
+<!DOCTYPE HTML>
 <html>
-    <head>
-        <meta charset="utf-8" />
-        <title>Test URL API</title>
-        <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-        <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-    </head>
-    <body>
-        <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=887364">Mozilla Bug 887364</a>
-        <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=991471">Mozilla Bug 991471</a>
-        <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=996055">Mozilla Bug 996055</a>
-        <p id="display"></p>
-        <div id="content" style="display: none">
-            <iframe name="x" id="x"></iframe>
-            <iframe name="y" id="y"></iframe>
-        </div>
-        <pre id="test"></pre>
-        <script type="application/javascript">
-            /** Test for Bug 887364 **/
-            ok("URL" in window, "window.URL exists");
+<head>
+  <meta charset="utf-8">
+  <title>Test URL API</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+</head>
+<body>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=887364">Mozilla Bug 887364</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=991471">Mozilla Bug 991471</a>
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=996055">Mozilla Bug 996055</a>
+<p id="display"></p>
+<div id="content" style="display: none">
+  <iframe name="x" id="x"></iframe>
+  <iframe name="y" id="y"></iframe>
+</div>
+<pre id="test">
+</pre>
+  <script type="application/javascript">
 
-            var tests = [
-                {
-                    url: "http://www.abc.com",
-                    base: undefined,
-                    error: false,
-                    href: "http://www.abc.com/",
-                    origin: "http://www.abc.com",
-                    protocol: "http:",
-                    username: "",
-                    password: "",
-                    host: "www.abc.com",
-                    hostname: "www.abc.com",
-                    port: "",
-                    pathname: "/",
-                    search: "",
-                    hash: "",
-                },
-                {
-                    url: "ftp://auser:apw@www.abc.com",
-                    base: undefined,
-                    error: false,
-                    href: "ftp://auser:apw@www.abc.com/",
-                    origin: "ftp://www.abc.com",
-                    protocol: "ftp:",
-                    username: "auser",
-                    password: "apw",
-                    host: "www.abc.com",
-                    hostname: "www.abc.com",
-                    port: "",
-                    pathname: "/",
-                    search: "",
-                    hash: "",
-                },
-                {
-                    url: "http://www.abc.com:90/apath/",
-                    base: undefined,
-                    error: false,
-                    href: "http://www.abc.com:90/apath/",
-                    origin: "http://www.abc.com:90",
-                    protocol: "http:",
-                    username: "",
-                    password: "",
-                    host: "www.abc.com:90",
-                    hostname: "www.abc.com",
-                    port: "90",
-                    pathname: "/apath/",
-                    search: "",
-                    hash: "",
-                },
-                {
-                    url: "http://www.abc.com/apath/afile.txt#ahash",
-                    base: undefined,
-                    error: false,
-                    href: "http://www.abc.com/apath/afile.txt#ahash",
-                    origin: "http://www.abc.com",
-                    protocol: "http:",
-                    username: "",
-                    password: "",
-                    host: "www.abc.com",
-                    hostname: "www.abc.com",
-                    port: "",
-                    pathname: "/apath/afile.txt",
-                    search: "",
-                    hash: "#ahash",
-                },
-                {
-                    url: "http://example.com/?test#hash",
-                    base: undefined,
-                    error: false,
-                    href: "http://example.com/?test#hash",
-                    origin: "http://example.com",
-                    protocol: "http:",
-                    username: "",
-                    password: "",
-                    host: "example.com",
-                    hostname: "example.com",
-                    port: "",
-                    pathname: "/",
-                    search: "?test",
-                    hash: "#hash",
-                },
-                {
-                    url: "http://example.com/?test",
-                    base: undefined,
-                    error: false,
-                    href: "http://example.com/?test",
-                    origin: "http://example.com",
-                    protocol: "http:",
-                    username: "",
-                    password: "",
-                    host: "example.com",
-                    hostname: "example.com",
-                    port: "",
-                    pathname: "/",
-                    search: "?test",
-                    hash: "",
-                },
-                { url: "http://example.com/carrot#question%3f", base: undefined, error: false, hash: "#question%3f" },
-                {
-                    url: "https://example.com:4443?",
-                    base: undefined,
-                    error: false,
-                    protocol: "https:",
-                    port: "4443",
-                    pathname: "/",
-                    hash: "",
-                    search: "",
-                },
-                {
-                    url: "http://www.abc.com/apath/afile.txt#ahash?asearch",
-                    base: undefined,
-                    error: false,
-                    href: "http://www.abc.com/apath/afile.txt#ahash?asearch",
-                    protocol: "http:",
-                    pathname: "/apath/afile.txt",
-                    hash: "#ahash?asearch",
-                    search: "",
-                },
-                {
-                    url: "http://www.abc.com/apath/afile.txt?asearch#ahash",
-                    base: undefined,
-                    error: false,
-                    href: "http://www.abc.com/apath/afile.txt?asearch#ahash",
-                    protocol: "http:",
-                    pathname: "/apath/afile.txt",
-                    hash: "#ahash",
-                    search: "?asearch",
-                },
-                {
-                    url: "http://abc.com/apath/afile.txt?#ahash",
-                    base: undefined,
-                    error: false,
-                    pathname: "/apath/afile.txt",
-                    hash: "#ahash",
-                    search: "",
-                },
-                {
-                    url: "http://auser:apassword@www.abc.com:90/apath/afile.txt?asearch#ahash",
-                    base: undefined,
-                    error: false,
-                    protocol: "http:",
-                    username: "auser",
-                    password: "apassword",
-                    host: "www.abc.com:90",
-                    hostname: "www.abc.com",
-                    port: "90",
-                    pathname: "/apath/afile.txt",
-                    hash: "#ahash",
-                    search: "?asearch",
-                    origin: "http://www.abc.com:90",
-                },
+  /** Test for Bug 887364 **/
+  ok("URL" in window, "window.URL exists");
 
-                { url: "/foo#bar", base: "www.test.org", error: true },
-                { url: "/foo#bar", base: null, error: true },
-                { url: "/foo#bar", base: 42, error: true },
-                { url: "ftp://ftp.something.net", base: undefined, error: false, protocol: "ftp:" },
-                { url: "file:///tmp/file", base: undefined, error: false, protocol: "file:" },
-                { url: "gopher://gopher.something.net", base: undefined, error: false, protocol: "gopher:" },
-                { url: "ws://ws.something.net", base: undefined, error: false, protocol: "ws:" },
-                { url: "wss://ws.something.net", base: undefined, error: false, protocol: "wss:" },
-                { url: "foo://foo.something.net", base: undefined, error: false, protocol: "foo:" },
+  var tests = [
+    { url: 'http://www.abc.com',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
+    },
+    { url: 'ftp://auser:apw@www.abc.com',
+      base: undefined,
+      error: false,
+      href: 'ftp://auser:apw@www.abc.com/',
+      origin: 'ftp://www.abc.com',
+      protocol: 'ftp:',
+      username: 'auser',
+      password: 'apw',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
+    },
+    { url: 'http://www.abc.com:90/apath/',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com:90/apath/',
+      origin: 'http://www.abc.com:90',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/',
+      search: '',
+      hash: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt#ahash',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt#ahash',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/apath/afile.txt',
+      search: '',
+      hash: '#ahash'
+    },
+    { url: 'http://example.com/?test#hash',
+      base: undefined,
+      error: false,
+      href: 'http://example.com/?test#hash',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: '#hash'
+    },
+    { url: 'http://example.com/?test',
+      base: undefined,
+      error: false,
+      href: 'http://example.com/?test',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: ''
+    },
+    { url: 'http://example.com/carrot#question%3f',
+      base: undefined,
+      error: false,
+      hash: '#question%3f'
+    },
+    { url: 'https://example.com:4443?',
+      base: undefined,
+      error: false,
+      protocol: 'https:',
+      port: '4443',
+      pathname: '/',
+      hash: '',
+      search: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash?asearch',
+      search: ''
+    },
+    { url: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
+      base: undefined,
+      error: false,
+      href: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch'
+    },
+    { url: 'http://abc.com/apath/afile.txt?#ahash',
+      base: undefined,
+      error: false,
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: ''
+    },
+    { url: 'http://auser:apassword@www.abc.com:90/apath/afile.txt?asearch#ahash',
+      base: undefined,
+      error: false,
+      protocol: 'http:',
+      username: 'auser',
+      password: 'apassword',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch',
+      origin: 'http://www.abc.com:90'
+    },
 
-                {
-                    url: "about:blank",
-                    base: undefined,
-                    error: false,
-                    protocol: "about:",
-                    pathname: "blank",
-                    skip_setters: false,
-                },
+    { url: '/foo#bar',
+      base: 'www.test.org',
+      error: true,
+    },
+    { url: '/foo#bar',
+      base: null,
+      error: true,
+    },
+    { url: '/foo#bar',
+      base: 42,
+      error: true,
+    },
+    { url: 'ftp://ftp.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'ftp:',
+    },
+    { url: 'file:///tmp/file',
+      base: undefined,
+      error: false,
+      protocol: 'file:',
+    },
+    { url: 'gopher://gopher.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'gopher:',
+    },
+    { url: 'ws://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'ws:',
+    },
+    { url: 'wss://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'wss:',
+    },
+    { url: 'foo://foo.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'foo:',
+    },
 
-                {
-                    url: "foo:bar?what#yeah",
-                    base: undefined,
-                    error: false,
-                    protocol: "foo:",
-                    pathname: "bar",
-                    search: "?what",
-                    hash: "#yeah",
-                    skip_setters: false,
-                },
-            ];
+    { url: 'about:blank',
+      base: undefined,
+      error: false,
+      protocol: 'about:',
+      pathname: 'blank',
+      skip_setters: false,
+    },
 
-            while (tests.length) {
-                var test = tests.shift();
+    { url: 'foo:bar?what#yeah',
+      base: undefined,
+      error: false,
+      protocol: 'foo:',
+      pathname: 'bar',
+      search: '?what',
+      hash: '#yeah',
+      skip_setters: false,
+    },
+  ];
 
-                var error = false;
-                var url;
-                try {
-                    if (test.base) {
-                        url = new URL(test.url, test.base);
-                    } else {
-                        url = new URL(test.url);
-                    }
-                } catch (e) {
-                    error = true;
-                }
+  while(tests.length) {
+    var test = tests.shift();
 
-                is(test.error, error, "Error creating URL");
-                if (test.error) {
-                    continue;
-                }
+    var error = false;
+    var url;
+    try {
+      if (test.base) {
+        url = new URL(test.url, test.base);
+      } else {
+        url = new URL(test.url);
+      }
+    } catch(e) {
+      error = true;
+    }
 
-                if ("href" in test) is(url.href, test.href, "href");
-                if ("origin" in test) is(url.origin, test.origin, "origin");
-                if ("protocol" in test) is(url.protocol, test.protocol, "protocol");
-                if ("username" in test) is(url.username, test.username, "username");
-                if ("password" in test) is(url.password, test.password, "password");
-                if ("host" in test) is(url.host, test.host, "host");
-                if ("hostname" in test) is(url.hostname, test.hostname, "hostname");
-                if ("port" in test) is(url.port, test.port, "port");
-                if ("pathname" in test) is(url.pathname, test.pathname, "pathname");
-                if ("search" in test) is(url.search, test.search, "search");
-                if ("hash" in test) is(url.hash, test.hash, "hash");
+    is(test.error, error, "Error creating URL");
+    if (test.error) {
+      continue;
+    }
 
-                if ("skip_setters" in test && test.skip_setters == false) {
-                    info("Skip setter methods for URL: " + test);
-                    continue;
-                }
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(url.hostname, test.hostname, "hostname");
+    if ('port' in test) is(url.port, test.port, "port");
+    if ('pathname' in test) is(url.pathname, test.pathname, "pathname");
+    if ('search' in test) is(url.search, test.search, "search");
+    if ('hash' in test) is(url.hash, test.hash, "hash");
 
-                url = new URL("https://www.example.net/what#foo?bar");
-                ok(url, "Url exists!");
+    if ('skip_setters' in test && test.skip_setters == false) {
+      info("Skip setter methods for URL: " + test);
+      continue;
+    }
 
-                if ("href" in test) url.href = test.href;
-                if ("protocol" in test) url.protocol = test.protocol;
-                if ("username" in test && test.username) url.username = test.username;
-                if ("password" in test && test.password) url.password = test.password;
-                if ("host" in test) url.host = test.host;
-                if ("hostname" in test) url.hostname = test.hostname;
-                if ("port" in test) url.port = test.port;
-                if ("pathname" in test) url.pathname = test.pathname;
-                if ("search" in test) url.search = test.search;
-                if ("hash" in test) url.hash = test.hash;
+    url = new URL('https://www.example.net/what#foo?bar');
+    ok(url, "Url exists!");
 
-                if ("href" in test) is(url.href, test.href, "href");
-                if ("origin" in test) is(url.origin, test.origin, "origin");
-                if ("protocol" in test) is(url.protocol, test.protocol, "protocol");
-                if ("username" in test) is(url.username, test.username, "username");
-                if ("password" in test) is(url.password, test.password, "password");
-                if ("host" in test) is(url.host, test.host, "host");
-                if ("hostname" in test) is(test.hostname, url.hostname, "hostname");
-                if ("port" in test) is(test.port, url.port, "port");
-                if ("pathname" in test) is(test.pathname, url.pathname, "pathname");
-                if ("search" in test) is(test.search, url.search, "search");
-                if ("hash" in test) is(test.hash, url.hash, "hash");
+    if ('href' in test) url.href = test.href;
+    if ('protocol' in test) url.protocol = test.protocol;
+    if ('username' in test && test.username) url.username = test.username;
+    if ('password' in test && test.password) url.password = test.password;
+    if ('host' in test) url.host = test.host;
+    if ('hostname' in test) url.hostname = test.hostname;
+    if ('port' in test) url.port = test.port;
+    if ('pathname' in test) url.pathname = test.pathname;
+    if ('search' in test) url.search = test.search;
+    if ('hash' in test) url.hash = test.hash;
 
-                if ("href" in test) is(test.href, url + "", "stringify works");
-            }
-        </script>
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(test.hostname, url.hostname, "hostname");
+    if ('port' in test) is(test.port, url.port, "port");
+    if ('pathname' in test) is(test.pathname, url.pathname, "pathname");
+    if ('search' in test) is(test.search, url.search, "search");
+    if ('hash' in test) is(test.hash, url.hash, "hash");
 
-        <script>
-            /** Test for Bug 991471 **/
-            var url = new URL("http://localhost/");
-            url.hostname = "";
-            url.username = "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt";
-            url.hostname = "www.mozilla.org";
-            url.username = "";
-            url.hostname = "www.mozilla.org";
-            is(url.href, "http://www.mozilla.org/", "No parsing error with empty host");
-        </script>
+    if ('href' in test) is (test.href, url + '', 'stringify works');
+  }
 
-        <script>
-            /** Test for Bug 996055 **/
-            var url = new URL("http://localhost/");
-            url.hostname = "";
-            is(url.href, "http://localhost/", "Empty hostname is ignored");
-        </script>
+  </script>
 
-        <script>
-            /** Test for Bug 960014 **/
-            var url = new URL("http://localhost/");
-            url.hostname = "[2001::1]";
-            is(url.hostname, "[2001::1]", "IPv6 hostname");
-            is(url.href, "http://[2001::1]/");
+  <script>
+    /** Test for Bug 991471 **/
+    var url = new URL("http://localhost/");
+    url.hostname = "";
+    url.username = "tttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt";
+    url.hostname = "www.mozilla.org";
+    url.username = "";
+    url.hostname = "www.mozilla.org";
+    is(url.href, "http://www.mozilla.org/", "No parsing error with empty host");
+  </script>
 
-            url.hostname = "[::192.9.5.5]";
-            is(url.hostname, "[::192.9.5.5]", "IPv6 hostname");
-            is(url.href, "http://[::192.9.5.5]/");
+  <script>
+    /** Test for Bug 996055 **/
+    var url = new URL("http://localhost/");
+    url.hostname = "";
+    is(url.href, "http://localhost/", "Empty hostname is ignored");
+  </script>
 
-            url = new URL("http://localhost/");
-            url.hostname = "[::]";
-            is(url.hostname, "[::]", "IPv6 hostname");
+  <script>
+    /** Test for Bug 960014 **/
+    var url = new URL("http://localhost/");
+    url.hostname = "[2001::1]";
+    is(url.hostname, "[2001::1]", "IPv6 hostname");
+    is(url.href, "http://[2001::1]/");
 
-            url = new URL("http://localhost/");
-            url.host = "[2001::1]:30";
-            is(url.hostname, "[2001::1]", "IPv6 hostname");
-            is(url.port, "30", "Port");
-            is(url.host, "[2001::1]:30", "IPv6 host");
+    url.hostname = "[::192.9.5.5]";
+    is(url.hostname, "[::192.9.5.5]", "IPv6 hostname");
+    is(url.href, "http://[::192.9.5.5]/");
 
-            url = new URL("http://localhost/");
-            // This should silently fail since it's missing the brackets
-            url.hostname = "2001::1";
-            is(url.hostname, "localhost", "Setting bad hostname fails");
-        </script>
+    url = new URL("http://localhost/");
+    url.hostname = "[::]";
+    is(url.hostname, "[::]", "IPv6 hostname");
 
-        <script>
-            var blob = new Blob(["a"]);
-            var url = URL.createObjectURL(blob);
+    url = new URL("http://localhost/");
+    url.host = "[2001::1]:30";
+    is(url.hostname, "[2001::1]", "IPv6 hostname");
+    is(url.port, "30", "Port");
+    is(url.host, "[2001::1]:30", "IPv6 host");
 
-            var u = new URL(url);
-            ok(u.origin, "http://mochi.test:8888", "The URL generated from a blob URI has an origin");
-        </script>
+    url = new URL("http://localhost/");
+    // This should silently fail since it's missing the brackets
+    url.hostname = "2001::1";
+    is(url.hostname, "localhost", "Setting bad hostname fails");
+  </script>
 
-        <script>
-            var blob = new Blob(["a"]);
-            var url = URL.createObjectURL(blob);
+  <script>
+    var blob = new Blob(['a']);
+    var url = URL.createObjectURL(blob);
 
-            var a = document.createElement("A");
-            a.href = url;
-            ok(a.origin, "http://mochi.test:8888", "The 'a' element has the correct origin");
-        </script>
+    var u = new URL(url);
+    ok(u.origin, 'http://mochi.test:8888', "The URL generated from a blob URI has an origin");
+  </script>
 
-        <script>
-            var blob = new Blob(["a"]);
-            var url = URL.createObjectURL(blob);
-            URL.revokeObjectURL(url);
-            URL.revokeObjectURL(url);
-            ok(true, "Calling revokeObjectURL twice should be ok");
-        </script>
+  <script>
+    var blob = new Blob(['a']);
+    var url = URL.createObjectURL(blob);
 
-        <script>
-            URL.revokeObjectURL("blob:something");
-            ok(true, "This should not throw.");
-        </script>
+    var a = document.createElement('A');
+    a.href = url;
+    ok(a.origin, 'http://mochi.test:8888', "The 'a' element has the correct origin");
+  </script>
 
-        <script>
-            var base = new URL("http:\\\\test.com\\path/to\\file?query\\backslash#hash\\");
-            is(base.href, "http://test.com/path/to/file?query\\backslash#hash\\");
+  <script>
+    var blob = new Blob(['a']);
+    var url = URL.createObjectURL(blob);
+    URL.revokeObjectURL(url);
+    URL.revokeObjectURL(url);
+    ok(true, "Calling revokeObjectURL twice should be ok");
+  </script>
 
-            var url = new URL("..\\", base);
-            is(url.href, "http://test.com/path/");
+  <script>
+    URL.revokeObjectURL('blob:something');
+    ok(true, "This should not throw.");
+  </script>
 
-            url = new URL("\\test", base);
-            is(url.href, "http://test.com/test");
+  <script>
+    var base = new URL("http:\\\\test.com\\path/to\\file?query\\backslash#hash\\");
+    is(base.href, "http://test.com/path/to/file?query\\backslash#hash\\");
 
-            url = new URL("\\test\\", base);
-            is(url.href, "http://test.com/test/");
+    var url = new URL("..\\", base);
+    is(url.href, "http://test.com/path/");
 
-            url = new URL("http://example.org/test", base);
-            is(url.href, "http://example.org/test");
+    url = new URL("\\test", base);
+    is(url.href, "http://test.com/test");
 
-            url = new URL("ftp://tmp/test", base);
-            is(url.href, "ftp://tmp/test");
+    url = new URL("\\test\\", base);
+    is(url.href, "http://test.com/test/");
 
-            url = new URL("ftp:\\\\tmp\\test", base);
-            is(url.href, "ftp://tmp/test");
+    url = new URL("http://example.org/test", base);
+    is(url.href, "http://example.org/test");
 
-            url = new URL("scheme://tmp\\test", base);
-            is(url.href, "scheme://tmp\\test");
-        </script>
+    url = new URL("ftp://tmp/test", base);
+    is(url.href, "ftp://tmp/test");
 
-        <script>
-            /** Test for Bug 1275746 **/
-            SimpleTest.doesThrow(() => {
-                var url = new URL("http:");
-            }, "http: is not a valid URL");
-            SimpleTest.doesThrow(() => {
-                var url = new URL("http:///");
-            }, "http: is not a valid URL");
+    url = new URL("ftp:\\\\tmp\\test", base);
+    is(url.href, "ftp://tmp/test");
 
-            var url = new URL("file:");
-            is(url.href, "file:///", "Parsing file: should work.");
+    url = new URL("scheme://tmp\\test", base);
+    is(url.href, "scheme://tmp\\test");
+  </script>
 
-            url = new URL("file:///");
-            is(url.href, "file:///", "Parsing file:/// should work.");
-        </script>
+  <script>
+    /** Test for Bug 1275746 **/
+    SimpleTest.doesThrow(() => { var url = new URL("http:"); }, "http: is not a valid URL");
+    SimpleTest.doesThrow(() => { var url = new URL("http:///"); }, "http: is not a valid URL");
 
-        <script>
-            var url = new URL("scheme:path/to/file?query#hash");
-            is(url.href, "scheme:path/to/file?query#hash");
-            is(url.pathname, "path/to/file");
-            is(url.search, "?query");
-            is(url.hash, "#hash");
+    var url = new URL("file:");
+    is(url.href, "file:///", "Parsing file: should work.");
 
-            // pathname cannot be overwritten.
-            url.pathname = "new/path?newquery#newhash";
-            is(url.href, "scheme:path/to/file?query#hash");
+    url = new URL("file:///");
+    is(url.href, "file:///", "Parsing file:/// should work.");
+  </script>
 
-            // don't escape '#' until we implement a spec-compliant parser.
-            url.search = "?newquery#newhash";
-            is(url.href, "scheme:path/to/file?newquery#newhash#hash");
+  <script>
+    var url = new URL("scheme:path/to/file?query#hash");
+    is(url.href, "scheme:path/to/file?query#hash");
+    is(url.pathname, "path/to/file");
+    is(url.search, "?query");
+    is(url.hash, "#hash");
 
-            // nulls get encoded, whitespace gets stripped
-            url = new URL("scheme:pa\0\nth/to/fi\0\nle?qu\0\nery#ha\0\nsh");
-            is(url.href, "scheme:pa%00th/to/fi%00le?qu%00ery#ha%00sh");
+    // pathname cannot be overwritten.
+    url.pathname = "new/path?newquery#newhash";
+    is(url.href, "scheme:path/to/file?query#hash");
 
-            url.search = "new\0\nquery";
-            is(url.href, "scheme:pa%00th/to/fi%00le?new%00%0Aquery#ha%00sh");
-            url.hash = "new\0\nhash";
-            is(url.href, "scheme:pa%00th/to/fi%00le?new%00%0Aquery#new%00%0Ahash");
+    // don't escape '#' until we implement a spec-compliant parser.
+    url.search = "?newquery#newhash";
+    is(url.href, "scheme:path/to/file?newquery#newhash#hash");
 
-            url = new URL("scheme:path#hash");
-            is(url.href, "scheme:path#hash");
-            url.search = "query";
-            is(url.href, "scheme:path?query#hash");
-            url.hash = "";
-            is(url.href, "scheme:path?query");
-            url.hash = "newhash";
-            is(url.href, "scheme:path?query#newhash");
-            url.search = "";
-            is(url.href, "scheme:path#newhash");
+    // nulls get encoded, whitespace gets stripped
+    url = new URL("scheme:pa\0\nth/to/fi\0\nle?qu\0\nery#ha\0\nsh");
+    is(url.href, "scheme:pa%00th/to/fi%00le?qu%00ery#ha%00sh");
 
-            // we don't implement a spec-compliant parser yet.
-            // make sure we are bug compatible with existing implementations.
-            url = new URL('data:text/html,<a href="http://example.org/?q">Link</a>');
-            is(url.href, 'data:text/html,<a%20href="http://example.org/?q">Link</a>');
-        </script>
+    url.search = "new\0\nquery";
+    is(url.href, "scheme:pa%00th/to/fi%00le?new%00%0Aquery#ha%00sh");
+    url.hash = "new\0\nhash";
+    is(url.href, "scheme:pa%00th/to/fi%00le?new%00%0Aquery#new%00%0Ahash");
 
-        <script>
-            is(
-                new URL("/static/client/runtime.js", "x:/").href,
-                "x:/static/client/runtime.js",
-                "URL constructor accepts root-relative input with x:/ base",
-            );
-            ok("canParse" in URL, "URL.canParse exists");
-            ok(
-                URL.canParse("/static/client/runtime.js", "x:/"),
-                "URL.canParse accepts root-relative input with x:/ base",
-            );
-            ok(
-                URL.canParse("/static/client/runtime.js", document.baseURI),
-                "URL.canParse accepts root-relative input with document base",
-            );
-            ok(!URL.canParse("/static/client/runtime.js"), "URL.canParse rejects root-relative input without base");
-            ok(
-                !URL.canParse("/static/client/runtime.js", "mailto:test@example.com"),
-                "URL.canParse rejects root-relative input against opaque mailto: base",
-            );
-            SimpleTest.doesThrow(() => {
-                new URL("/static/client/runtime.js", "mailto:test@example.com");
-            }, "constructor rejects root-relative input against opaque mailto: base");
-        </script>
+    url = new URL("scheme:path#hash");
+    is(url.href, "scheme:path#hash");
+    url.search = "query";
+    is(url.href, "scheme:path?query#hash");
+    url.hash = "";
+    is(url.href, "scheme:path?query");
+    url.hash = "newhash";
+    is(url.href, "scheme:path?query#newhash");
+    url.search = "";
+    is(url.href, "scheme:path#newhash");
 
-        <script>
-            var u = new URL("http://www.example.org");
-            ok(u.toJSON(), "http://www.example.org", "URL.toJSON()");
-            is(JSON.stringify(u), '"http://www.example.org/"', "JSON.stringify(u) works");
-        </script>
-    </body>
+    // we don't implement a spec-compliant parser yet.
+    // make sure we are bug compatible with existing implementations.
+    url = new URL("data:text/html,<a href=\"http://example.org/?q\">Link</a>");
+    is(url.href, "data:text/html,<a%20href=\"http://example.org/?q\">Link</a>");
+  </script>
+
+  <script>
+    var u = new URL('http://www.example.org');
+    ok(u.toJSON(), 'http://www.example.org', "URL.toJSON()");
+    is(JSON.stringify(u), "\"http://www.example.org/\"", "JSON.stringify(u) works");
+  </script>
+</body>
 </html>

dom/url/tests/urlApi_worker.js

@@ -1,224 +1,212 @@
 function ok(a, msg) {
   dump("OK: " + !!a + "  =>  " + a + " " + msg + "\n");
-  postMessage({ type: "status", status: !!a, msg: a + ": " + msg });
+  postMessage({type: 'status', status: !!a, msg: a + ": " + msg });
 }
 
 function is(a, b, msg) {
-  dump("IS: " + (a === b) + "  =>  " + a + " | " + b + " " + msg + "\n");
-  postMessage({
-    type: "status",
-    status: a === b,
-    msg: a + " === " + b + ": " + msg,
-  });
+  dump("IS: " + (a===b) + "  =>  " + a + " | " + b + " " + msg + "\n");
+  postMessage({type: 'status', status: a === b, msg: a + " === " + b + ": " + msg });
 }
 
-onmessage = function () {
+onmessage = function() {
   status = false;
   try {
-    if (URL instanceof Object) {
+    if ((URL instanceof Object)) {
       status = true;
     }
-  } catch (e) {}
+  } catch(e) {
+  }
 
   var tests = [
-    {
-      url: "http://www.abc.com",
+    { url: 'http://www.abc.com',
       base: undefined,
       error: false,
-      href: "http://www.abc.com/",
-      origin: "http://www.abc.com",
-      protocol: "http:",
-      username: "",
-      password: "",
-      host: "www.abc.com",
-      hostname: "www.abc.com",
-      port: "",
-      pathname: "/",
-      search: "",
-      hash: "",
+      href: 'http://www.abc.com/',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
     },
-    {
-      url: "ftp://auser:apw@www.abc.com",
+    { url: 'ftp://auser:apw@www.abc.com',
       base: undefined,
       error: false,
-      href: "ftp://auser:apw@www.abc.com/",
-      origin: "ftp://www.abc.com",
-      protocol: "ftp:",
-      username: "auser",
-      password: "apw",
-      host: "www.abc.com",
-      hostname: "www.abc.com",
-      port: "",
-      pathname: "/",
-      search: "",
-      hash: "",
+      href: 'ftp://auser:apw@www.abc.com/',
+      origin: 'ftp://www.abc.com',
+      protocol: 'ftp:',
+      username: 'auser',
+      password: 'apw',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/',
+      search: '',
+      hash: ''
     },
-    {
-      url: "http://www.abc.com:90/apath/",
+    { url: 'http://www.abc.com:90/apath/',
       base: undefined,
       error: false,
-      href: "http://www.abc.com:90/apath/",
-      origin: "http://www.abc.com:90",
-      protocol: "http:",
-      username: "",
-      password: "",
-      host: "www.abc.com:90",
-      hostname: "www.abc.com",
-      port: "90",
-      pathname: "/apath/",
-      search: "",
-      hash: "",
+      href: 'http://www.abc.com:90/apath/',
+      origin: 'http://www.abc.com:90',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/',
+      search: '',
+      hash: ''
     },
-    {
-      url: "http://www.abc.com/apath/afile.txt#ahash",
+    { url: 'http://www.abc.com/apath/afile.txt#ahash',
       base: undefined,
       error: false,
-      href: "http://www.abc.com/apath/afile.txt#ahash",
-      origin: "http://www.abc.com",
-      protocol: "http:",
-      username: "",
-      password: "",
-      host: "www.abc.com",
-      hostname: "www.abc.com",
-      port: "",
-      pathname: "/apath/afile.txt",
-      search: "",
-      hash: "#ahash",
+      href: 'http://www.abc.com/apath/afile.txt#ahash',
+      origin: 'http://www.abc.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'www.abc.com',
+      hostname: 'www.abc.com',
+      port: '',
+      pathname: '/apath/afile.txt',
+      search: '',
+      hash: '#ahash'
     },
-    {
-      url: "http://example.com/?test#hash",
+    { url: 'http://example.com/?test#hash',
       base: undefined,
       error: false,
-      href: "http://example.com/?test#hash",
-      origin: "http://example.com",
-      protocol: "http:",
-      username: "",
-      password: "",
-      host: "example.com",
-      hostname: "example.com",
-      port: "",
-      pathname: "/",
-      search: "?test",
-      hash: "#hash",
+      href: 'http://example.com/?test#hash',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: '#hash'
     },
-    {
-      url: "http://example.com/?test",
+    { url: 'http://example.com/?test',
       base: undefined,
       error: false,
-      href: "http://example.com/?test",
-      origin: "http://example.com",
-      protocol: "http:",
-      username: "",
-      password: "",
-      host: "example.com",
-      hostname: "example.com",
-      port: "",
-      pathname: "/",
-      search: "?test",
-      hash: "",
+      href: 'http://example.com/?test',
+      origin: 'http://example.com',
+      protocol: 'http:',
+      username: '',
+      password: '',
+      host: 'example.com',
+      hostname: 'example.com',
+      port: '',
+      pathname: '/',
+      search: '?test',
+      hash: ''
     },
-    {
-      url: "http://example.com/carrot#question%3f",
+    { url: 'http://example.com/carrot#question%3f',
       base: undefined,
       error: false,
-      hash: "#question%3f",
+      hash: '#question%3f'
     },
-    {
-      url: "https://example.com:4443?",
+    { url: 'https://example.com:4443?',
       base: undefined,
       error: false,
-      protocol: "https:",
-      port: "4443",
-      pathname: "/",
-      hash: "",
-      search: "",
+      protocol: 'https:',
+      port: '4443',
+      pathname: '/',
+      hash: '',
+      search: ''
     },
-    {
-      url: "http://www.abc.com/apath/afile.txt#ahash?asearch",
+    { url: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
       base: undefined,
       error: false,
-      href: "http://www.abc.com/apath/afile.txt#ahash?asearch",
-      protocol: "http:",
-      pathname: "/apath/afile.txt",
-      hash: "#ahash?asearch",
-      search: "",
+      href: 'http://www.abc.com/apath/afile.txt#ahash?asearch',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash?asearch',
+      search: ''
     },
-    {
-      url: "http://www.abc.com/apath/afile.txt?asearch#ahash",
+    { url: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
       base: undefined,
       error: false,
-      href: "http://www.abc.com/apath/afile.txt?asearch#ahash",
-      protocol: "http:",
-      pathname: "/apath/afile.txt",
-      hash: "#ahash",
-      search: "?asearch",
+      href: 'http://www.abc.com/apath/afile.txt?asearch#ahash',
+      protocol: 'http:',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch'
     },
-    {
-      url: "http://abc.com/apath/afile.txt?#ahash",
+    { url: 'http://abc.com/apath/afile.txt?#ahash',
       base: undefined,
       error: false,
-      pathname: "/apath/afile.txt",
-      hash: "#ahash",
-      search: "",
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: ''
     },
-    {
-      url: "http://auser:apassword@www.abc.com:90/apath/afile.txt?asearch#ahash",
+    { url: 'http://auser:apassword@www.abc.com:90/apath/afile.txt?asearch#ahash',
       base: undefined,
       error: false,
-      protocol: "http:",
-      username: "auser",
-      password: "apassword",
-      host: "www.abc.com:90",
-      hostname: "www.abc.com",
-      port: "90",
-      pathname: "/apath/afile.txt",
-      hash: "#ahash",
-      search: "?asearch",
-      origin: "http://www.abc.com:90",
+      protocol: 'http:',
+      username: 'auser',
+      password: 'apassword',
+      host: 'www.abc.com:90',
+      hostname: 'www.abc.com',
+      port: '90',
+      pathname: '/apath/afile.txt',
+      hash: '#ahash',
+      search: '?asearch',
+      origin: 'http://www.abc.com:90'
     },
 
-    { url: "/foo#bar", base: "www.test.org", error: true },
-    { url: "/foo#bar", base: null, error: true },
-    { url: "/foo#bar", base: 42, error: true },
-    {
-      url: "ftp://ftp.something.net",
-      base: undefined,
-      error: false,
-      protocol: "ftp:",
+    { url: '/foo#bar',
+      base: 'www.test.org',
+      error: true,
     },
-    {
-      url: "file:///tmp/file",
-      base: undefined,
-      error: false,
-      protocol: "file:",
+    { url: '/foo#bar',
+      base: null,
+      error: true,
     },
-    {
-      url: "gopher://gopher.something.net",
-      base: undefined,
-      error: false,
-      protocol: "gopher:",
+    { url: '/foo#bar',
+      base: 42,
+      error: true,
     },
-    {
-      url: "ws://ws.something.net",
+    { url: 'ftp://ftp.something.net',
       base: undefined,
       error: false,
-      protocol: "ws:",
+      protocol: 'ftp:',
     },
-    {
-      url: "wss://ws.something.net",
+    { url: 'file:///tmp/file',
       base: undefined,
       error: false,
-      protocol: "wss:",
+      protocol: 'file:',
     },
-    {
-      url: "foo://foo.something.net",
+    { url: 'gopher://gopher.something.net',
       base: undefined,
       error: false,
-      protocol: "foo:",
+      protocol: 'gopher:',
+    },
+    { url: 'ws://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'ws:',
+    },
+    { url: 'wss://ws.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'wss:',
+    },
+    { url: 'foo://foo.something.net',
+      base: undefined,
+      error: false,
+      protocol: 'foo:',
     },
   ];
 
-  while (tests.length) {
+  while(tests.length) {
     var test = tests.shift();
 
     var error = false;
@@ -229,7 +217,7 @@ onmessage = function () {
       } else {
         url = new URL(test.url);
       }
-    } catch (e) {
+    } catch(e) {
       error = true;
     }
 
@@ -238,79 +226,47 @@ onmessage = function () {
       continue;
     }
 
-    if ("href" in test) is(url.href, test.href, "href");
-    if ("origin" in test) is(url.origin, test.origin, "origin");
-    if ("protocol" in test) is(url.protocol, test.protocol, "protocol");
-    if ("username" in test) is(url.username, test.username, "username");
-    if ("password" in test) is(url.password, test.password, "password");
-    if ("host" in test) is(url.host, test.host, "host");
-    if ("hostname" in test) is(url.hostname, test.hostname, "hostname");
-    if ("port" in test) is(url.port, test.port, "port");
-    if ("pathname" in test) is(url.pathname, test.pathname, "pathname");
-    if ("search" in test) is(url.search, test.search, "search");
-    if ("hash" in test) is(url.hash, test.hash, "hash");
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(url.hostname, test.hostname, "hostname");
+    if ('port' in test) is(url.port, test.port, "port");
+    if ('pathname' in test) is(url.pathname, test.pathname, "pathname");
+    if ('search' in test) is(url.search, test.search, "search");
+    if ('hash' in test) is(url.hash, test.hash, "hash");
 
-    url = new URL("https://www.example.net/what#foo?bar");
+    url = new URL('https://www.example.net/what#foo?bar');
     ok(url, "Url exists!");
 
-    if ("href" in test) url.href = test.href;
-    if ("protocol" in test) url.protocol = test.protocol;
-    if ("username" in test && test.username) url.username = test.username;
-    if ("password" in test && test.password) url.password = test.password;
-    if ("host" in test) url.host = test.host;
-    if ("hostname" in test) url.hostname = test.hostname;
-    if ("port" in test) url.port = test.port;
-    if ("pathname" in test) url.pathname = test.pathname;
-    if ("search" in test) url.search = test.search;
-    if ("hash" in test) url.hash = test.hash;
+    if ('href' in test) url.href = test.href;
+    if ('protocol' in test) url.protocol = test.protocol;
+    if ('username' in test && test.username) url.username = test.username;
+    if ('password' in test && test.password) url.password = test.password;
+    if ('host' in test) url.host = test.host;
+    if ('hostname' in test) url.hostname = test.hostname;
+    if ('port' in test) url.port = test.port;
+    if ('pathname' in test) url.pathname = test.pathname;
+    if ('search' in test) url.search = test.search;
+    if ('hash' in test) url.hash = test.hash;
 
-    if ("href" in test) is(url.href, test.href, "href");
-    if ("origin" in test) is(url.origin, test.origin, "origin");
-    if ("protocol" in test) is(url.protocol, test.protocol, "protocol");
-    if ("username" in test) is(url.username, test.username, "username");
-    if ("password" in test) is(url.password, test.password, "password");
-    if ("host" in test) is(url.host, test.host, "host");
-    if ("hostname" in test) is(test.hostname, url.hostname, "hostname");
-    if ("port" in test) is(test.port, url.port, "port");
-    if ("pathname" in test) is(test.pathname, url.pathname, "pathname");
-    if ("search" in test) is(test.search, url.search, "search");
-    if ("hash" in test) is(test.hash, url.hash, "hash");
+    if ('href' in test) is(url.href, test.href, "href");
+    if ('origin' in test) is(url.origin, test.origin, "origin");
+    if ('protocol' in test) is(url.protocol, test.protocol, "protocol");
+    if ('username' in test) is(url.username, test.username, "username");
+    if ('password' in test) is(url.password, test.password, "password");
+    if ('host' in test) is(url.host, test.host, "host");
+    if ('hostname' in test) is(test.hostname, url.hostname, "hostname");
+    if ('port' in test) is(test.port, url.port, "port");
+    if ('pathname' in test) is(test.pathname, url.pathname, "pathname");
+    if ('search' in test) is(test.search, url.search, "search");
+    if ('hash' in test) is(test.hash, url.hash, "hash");
 
-    if ("href" in test) is(test.href, url + "", "stringify works");
+    if ('href' in test) is (test.href, url + '', 'stringify works');
   }
 
-  is(
-    new URL("/static/client/runtime.js", "x:/").href,
-    "x:/static/client/runtime.js",
-    "URL constructor accepts root-relative input with x:/ base",
-  );
-  ok("canParse" in URL, "URL.canParse exists");
-  ok(
-    URL.canParse("/static/client/runtime.js", "x:/"),
-    "URL.canParse accepts root-relative input with x:/ base",
-  );
-  ok(
-    URL.canParse("/static/client/runtime.js", self.location.href),
-    "URL.canParse accepts root-relative input with worker location base",
-  );
-  ok(
-    !URL.canParse("/static/client/runtime.js"),
-    "URL.canParse rejects root-relative input without base",
-  );
-  ok(
-    !URL.canParse("/static/client/runtime.js", "mailto:test@example.com"),
-    "URL.canParse rejects root-relative input against opaque mailto: base",
-  );
-  let mailtoRelativeFailed = false;
-  try {
-    new URL("/static/client/runtime.js", "mailto:test@example.com");
-  } catch (e) {
-    mailtoRelativeFailed = true;
-  }
-  ok(
-    mailtoRelativeFailed,
-    "constructor rejects root-relative input against opaque mailto: base",
-  );
+  postMessage({type: 'finish' });
+}
 
-  postMessage({ type: "finish" });
-};

dom/webidl/AnalyserNode.webidl

@@ -10,15 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary AnalyserOptions : AudioNodeOptions {
-             unsigned long fftSize = 2048;
-             float         maxDecibels = -30;
-             float         minDecibels = -100;
-             float         smoothingTimeConstant = 0.8;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional AnalyserOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface AnalyserNode : AudioNode {
 
     // Real-time frequency-domain data
@@ -46,3 +38,4 @@ interface AnalyserNode : AudioNode {
 
 // Mozilla extension
 AnalyserNode implements AudioNodePassThrough;
+

dom/webidl/AudioBuffer.webidl

@@ -10,14 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary AudioBufferOptions {
-             unsigned long numberOfChannels = 1;
-    required unsigned long length;
-             float         sampleRate;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, AudioBufferOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface AudioBuffer {
 
     readonly attribute float sampleRate;
@@ -36,3 +29,4 @@ interface AudioBuffer {
     [Throws]
     void copyToChannel(Float32Array source, long channelNumber, optional unsigned long startInChannel = 0);
 };
+

dom/webidl/AudioBufferSourceNode.webidl

@@ -10,17 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary AudioBufferSourceOptions {
-             AudioBuffer? buffer;
-             float        detune = 0;
-             boolean      loop = false;
-             double       loopEnd = 0;
-             double       loopStart = 0;
-             float        playbackRate = 1;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional AudioBufferSourceOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface AudioBufferSourceNode : AudioNode {
 
     attribute AudioBuffer? buffer;

dom/webidl/AudioNode.webidl

@@ -21,12 +21,6 @@ enum ChannelInterpretation {
     "discrete"
 };
 
-dictionary AudioNodeOptions {
-             unsigned long         channelCount;
-             ChannelCountMode      channelCountMode;
-             ChannelInterpretation channelInterpretation;
-};
-
 [Pref="dom.webaudio.enabled"]
 interface AudioNode : EventTarget {
 

dom/webidl/BiquadFilterNode.webidl

@@ -21,16 +21,7 @@ enum BiquadFilterType {
   "allpass"
 };
 
-dictionary BiquadFilterOptions : AudioNodeOptions {
-             BiquadFilterType type = "lowpass";
-             float            Q = 1;
-             float            detune = 0;
-             float            frequency = 350;
-             float            gain = 0;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional BiquadFilterOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface BiquadFilterNode : AudioNode {
 
     attribute BiquadFilterType type;

dom/webidl/ChannelMergerNode.webidl

@@ -10,11 +10,8 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary ChannelMergerOptions : AudioNodeOptions {
-             unsigned long numberOfInputs = 6;
+[Pref="dom.webaudio.enabled"]
+interface ChannelMergerNode : AudioNode {
+
 };
 
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ChannelMergerOptions options)]
-interface ChannelMergerNode : AudioNode {
-};

dom/webidl/ChannelSplitterNode.webidl

@@ -10,12 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary ChannelSplitterOptions : AudioNodeOptions {
-             unsigned long numberOfOutputs = 6;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ChannelSplitterOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface ChannelSplitterNode : AudioNode {
 
 };

dom/webidl/ConvolverNode.webidl

@@ -10,13 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary ConvolverOptions : AudioNodeOptions {
-             AudioBuffer? buffer;
-             boolean      disableNormalization = false;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional ConvolverOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface ConvolverNode : AudioNode {
 
       [SetterThrows]

dom/webidl/DelayNode.webidl

@@ -10,13 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary DelayOptions : AudioNodeOptions {
-             double maxDelayTime = 1;
-             double delayTime = 0;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional DelayOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface DelayNode : AudioNode {
 
     readonly attribute AudioParam delayTime;

dom/webidl/DynamicsCompressorNode.webidl

@@ -10,16 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary DynamicsCompressorOptions : AudioNodeOptions {
-             float attack = 0.003;
-             float knee = 30;
-             float ratio = 12;
-             float release = 0.25;
-             float threshold = -24;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional DynamicsCompressorOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface DynamicsCompressorNode : AudioNode {
 
     readonly attribute AudioParam threshold; // in Decibels

dom/webidl/GainNode.webidl

@@ -10,12 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary GainOptions : AudioNodeOptions {
-             float gain = 1.0;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional GainOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface GainNode : AudioNode {
 
     readonly attribute AudioParam gain;

dom/webidl/IIRFilterNode.webidl

@@ -9,13 +9,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary IIRFilterOptions : AudioNodeOptions {
-    required sequence<double> feedforward;
-    required sequence<double> feedback;
-};
-
-[Pref="dom.webaudio.enabled",
-Constructor(AudioContext context, IIRFilterOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface IIRFilterNode : AudioNode {
     void getFrequencyResponse(Float32Array frequencyHz, Float32Array magResponse, Float32Array phaseResponse);
 };

dom/webidl/MediaElementAudioSourceNode.webidl

@@ -10,12 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary MediaElementAudioSourceOptions {
-    required HTMLMediaElement mediaElement;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, MediaElementAudioSourceOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface MediaElementAudioSourceNode : AudioNode {
 
 };

dom/webidl/MediaStreamAudioDestinationNode.webidl

@@ -10,8 +10,9 @@
  * liability, trademark and document use rules apply.
  */
 
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional AudioNodeOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface MediaStreamAudioDestinationNode : AudioNode {
+
     readonly attribute MediaStream stream;
+
 };

dom/webidl/MediaStreamAudioSourceNode.webidl

@@ -10,12 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary MediaStreamAudioSourceOptions {
-    required MediaStream mediaStream;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, MediaStreamAudioSourceOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface MediaStreamAudioSourceNode : AudioNode {
 
 };

dom/webidl/OscillatorNode.webidl

@@ -18,15 +18,7 @@ enum OscillatorType {
   "custom"
 };
 
-dictionary OscillatorOptions : AudioNodeOptions {
-             OscillatorType type = "sine";
-             float          frequency = 440;
-             float          detune = 0;
-             PeriodicWave   periodicWave;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional OscillatorOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface OscillatorNode : AudioNode {
 
     [SetterThrows]
@@ -47,3 +39,4 @@ interface OscillatorNode : AudioNode {
 
 // Mozilla extensions
 OscillatorNode implements AudioNodePassThrough;
+

dom/webidl/PannerNode.webidl

@@ -21,25 +21,7 @@ enum DistanceModelType {
   "exponential"
 };
 
-dictionary PannerOptions : AudioNodeOptions {
-             PanningModelType  panningModel = "equalpower";
-             DistanceModelType distanceModel = "inverse";
-             float             positionX = 0;
-             float             positionY = 0;
-             float             positionZ = 0;
-             float             orientationX = 1;
-             float             orientationY = 0;
-             float             orientationZ = 0;
-             double            refDistance = 1;
-             double            maxDistance = 10000;
-             double            rolloffFactor = 1;
-             double            coneInnerAngle = 360;
-             double            coneOuterAngle = 360;
-             double            coneOuterGain = 0;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional PannerOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface PannerNode : AudioNode {
 
     // Default for stereo is equalpower

dom/webidl/PeriodicWave.webidl

@@ -10,12 +10,8 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary PeriodicWaveOptions : PeriodicWaveConstraints {
-             sequence<float> real;
-             sequence<float> imag;
+[Pref="dom.webaudio.enabled"]
+interface PeriodicWave {
+
 };
 
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, PeriodicWaveOptions options)]
-interface PeriodicWave {
-};

dom/webidl/StereoPannerNode.webidl

@@ -10,12 +10,7 @@
  * liability, trademark and document use rules apply.
  */
 
-dictionary StereoPannerOptions : AudioNodeOptions {
-             float pan = 0;
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional StereoPannerOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface StereoPannerNode : AudioNode {
   readonly attribute AudioParam pan;
 };

dom/webidl/WaveShaperNode.webidl

@@ -16,16 +16,10 @@ enum OverSampleType {
   "4x"
 };
 
-dictionary WaveShaperOptions : AudioNodeOptions {
-             sequence<float> curve;
-             OverSampleType  oversample = "none";
-};
-
-[Pref="dom.webaudio.enabled",
- Constructor(AudioContext context, optional WaveShaperOptions options)]
+[Pref="dom.webaudio.enabled"]
 interface WaveShaperNode : AudioNode {
 
-      [Cached, Pure, SetterThrows]
+      [SetterThrows]
       attribute Float32Array? curve;
       attribute OverSampleType oversample;
 

editor/libeditor/EditorBase.cpp

@@ -142,7 +142,6 @@ EditorBase::EditorBase()
   , mDispatchInputEvent(true)
   , mIsInEditAction(false)
   , mHidingCaret(false)
-  , mIsHTMLEditorClass(false)
 {
 }
 

editor/libeditor/EditorBase.h

@@ -114,7 +114,6 @@ class DeleteNodeTransaction;
 class DeleteTextTransaction;
 class EditAggregateTransaction;
 class ErrorResult;
-class HTMLEditor;
 class InsertNodeTransaction;
 class InsertTextTransaction;
 class JoinNodeTransaction;
@@ -122,7 +121,6 @@ class PlaceholderTransaction;
 class RemoveStyleSheetTransaction;
 class SplitNodeTransaction;
 class TextComposition;
-class TextEditor;
 struct EditorDOMPoint;
 
 namespace dom {
@@ -1115,32 +1113,14 @@ protected:
   bool mIsInEditAction;
   // Whether caret is hidden forcibly.
   bool mHidingCaret;
-  // Whether we are an HTML editor class.
-  bool mIsHTMLEditorClass;
 
   friend bool NSCanUnload(nsISupports* serviceMgr);
   friend class AutoRules;
   friend class AutoSelectionRestorer;
   friend class AutoTransactionsConserveSelection;
   friend class RangeUpdater;
-  friend class nsIEditor;
 };
 
 } // namespace mozilla
 
-// nsIEditor helper functions.
-// Here because of code context.
-mozilla::EditorBase*
-nsIEditor::AsEditorBase()
-{
-  return static_cast<mozilla::EditorBase*>(this);
-}
-
-const mozilla::EditorBase*
-nsIEditor::AsEditorBase() const
-{
-  return static_cast<const mozilla::EditorBase*>(this);
-}
-
-
 #endif // #ifndef mozilla_EditorBase_h

editor/libeditor/HTMLEditRules.cpp

@@ -233,16 +233,9 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLEditRules, TextEditRules,
 NS_IMETHODIMP
 HTMLEditRules::Init(TextEditor* aTextEditor)
 {
-  if (NS_WARN_IF(!aTextEditor)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
   InitFields();
 
-  mHTMLEditor = aTextEditor->AsHTMLEditor();
-  if (NS_WARN_IF(!mHTMLEditor)) {
-    return NS_ERROR_INVALID_ARG;
-  }
+  mHTMLEditor = static_cast<HTMLEditor*>(aTextEditor);
 
   // call through to base class Init
   nsresult rv = TextEditRules::Init(aTextEditor);

editor/libeditor/HTMLEditor.cpp

@@ -132,7 +132,6 @@ HTMLEditor::HTMLEditor()
   , mPositionedObjectBorderTop(0)
   , mGridSize(0)
 {
-  mIsHTMLEditorClass = true;
 }
 
 HTMLEditor::~HTMLEditor()
@@ -502,7 +501,7 @@ HTMLEditor::InitRules()
     // instantiate the rules for the html editor
     mRules = new HTMLEditRules();
   }
-  return mRules->Init(this);
+  return mRules->Init(static_cast<TextEditor*>(this));
 }
 
 NS_IMETHODIMP

editor/libeditor/HTMLEditor.h

@@ -1108,20 +1108,4 @@ private:
 
 } // namespace mozilla
 
-// nsIEditor helper functions.
-// Here because of code context.
-mozilla::HTMLEditor*
-nsIEditor::AsHTMLEditor()
-{
-  return static_cast<mozilla::EditorBase*>(this)->mIsHTMLEditorClass ?
-           static_cast<mozilla::HTMLEditor*>(this) : nullptr;
-}
-
-const mozilla::HTMLEditor*
-nsIEditor::AsHTMLEditor() const
-{
-  return static_cast<const mozilla::EditorBase*>(this)->mIsHTMLEditorClass ?
-           static_cast<const mozilla::HTMLEditor*>(this) : nullptr;
-}
-
 #endif // #ifndef mozilla_HTMLEditor_h

editor/libeditor/HTMLEditorEventListener.cpp

@@ -30,18 +30,24 @@ namespace mozilla {
 
 using namespace dom;
 
+#ifdef DEBUG
 nsresult
 HTMLEditorEventListener::Connect(EditorBase* aEditorBase)
 {
-  if (NS_WARN_IF(!aEditorBase)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-  // Guarantee that mEditorBase is always HTMLEditor.
-  HTMLEditor* htmlEditor = aEditorBase->AsHTMLEditor();
-  if (NS_WARN_IF(!htmlEditor)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-  return EditorEventListener::Connect(htmlEditor);
+  nsCOMPtr<nsIHTMLEditor> htmlEditor = do_QueryObject(aEditorBase);
+  nsCOMPtr<nsIHTMLInlineTableEditor> htmlInlineTableEditor =
+    do_QueryObject(aEditorBase);
+  NS_PRECONDITION(htmlEditor && htmlInlineTableEditor,
+                  "Set HTMLEditor or its sub class");
+  return EditorEventListener::Connect(aEditorBase);
+}
+#endif
+
+HTMLEditor*
+HTMLEditorEventListener::GetHTMLEditor()
+{
+  // mEditor must be HTMLEditor or its subclass.
+  return static_cast<HTMLEditor*>(mEditorBase);
 }
 
 nsresult
@@ -53,8 +59,7 @@ HTMLEditorEventListener::MouseUp(nsIDOMMouseEvent* aMouseEvent)
 
   // FYI: We need to notify HTML editor of mouseup even if it's consumed
   //      because HTML editor always needs to release grabbing resizer.
-  HTMLEditor* htmlEditor = mEditorBase->AsHTMLEditor();
-  MOZ_ASSERT(htmlEditor);
+  HTMLEditor* htmlEditor = GetHTMLEditor();
 
   nsCOMPtr<nsIDOMEventTarget> target;
   nsresult rv = aMouseEvent->AsEvent()->GetTarget(getter_AddRefs(target));
@@ -80,9 +85,7 @@ HTMLEditorEventListener::MouseDown(nsIDOMMouseEvent* aMouseEvent)
   WidgetMouseEvent* mousedownEvent =
     aMouseEvent->AsEvent()->WidgetEventPtr()->AsMouseEvent();
 
-  HTMLEditor* htmlEditor = mEditorBase->AsHTMLEditor();
-  MOZ_ASSERT(htmlEditor);
-
+  HTMLEditor* htmlEditor = GetHTMLEditor();
   // Contenteditable should disregard mousedowns outside it.
   // IsAcceptableInputEvent() checks it for a mouse event.
   if (!htmlEditor->IsAcceptableInputEvent(mousedownEvent)) {
@@ -218,19 +221,13 @@ HTMLEditorEventListener::MouseDown(nsIDOMMouseEvent* aMouseEvent)
 nsresult
 HTMLEditorEventListener::MouseClick(nsIDOMMouseEvent* aMouseEvent)
 {
-  if (NS_WARN_IF(DetachedFromEditor())) {
-    return NS_OK;
-  }
-
   nsCOMPtr<nsIDOMEventTarget> target;
   nsresult rv = aMouseEvent->AsEvent()->GetTarget(getter_AddRefs(target));
   NS_ENSURE_SUCCESS(rv, rv);
   NS_ENSURE_TRUE(target, NS_ERROR_NULL_POINTER);
   nsCOMPtr<nsIDOMElement> element = do_QueryInterface(target);
 
-  HTMLEditor* htmlEditor = mEditorBase->AsHTMLEditor();
-  MOZ_ASSERT(htmlEditor);
-  htmlEditor->DoInlineTableEditingAction(element);
+  GetHTMLEditor()->DoInlineTableEditingAction(element);
 
   return EditorEventListener::MouseClick(aMouseEvent);
 }

editor/libeditor/HTMLEditorEventListener.h

@@ -25,13 +25,17 @@ public:
   {
   }
 
-  // Connect() fails if aEditorBase isn't an HTMLEditor instance.
+#ifdef DEBUG
+  // WARNING: You must be use HTMLEditor or its sub class for this class.
   virtual nsresult Connect(EditorBase* aEditorBase) override;
+#endif
 
 protected:
   virtual nsresult MouseDown(nsIDOMMouseEvent* aMouseEvent) override;
   virtual nsresult MouseUp(nsIDOMMouseEvent* aMouseEvent) override;
   virtual nsresult MouseClick(nsIDOMMouseEvent* aMouseEvent) override;
+
+  inline HTMLEditor* GetHTMLEditor();
 };
 
 } // namespace mozilla

editor/libeditor/TextEditor.cpp

@@ -10,7 +10,6 @@
 #include "gfxFontUtils.h"
 #include "mozilla/Assertions.h"
 #include "mozilla/EditorUtils.h" // AutoEditBatch, AutoRules
-#include "mozilla/HTMLEditor.h"
 #include "mozilla/mozalloc.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/TextEditRules.h"

editor/libeditor/TextEditor.h

@@ -247,18 +247,4 @@ protected:
 
 } // namespace mozilla
 
-// nsIEditor helper functions.
-// Here because of code context.
-mozilla::TextEditor*
-nsIEditor::AsTextEditor()
-{
-  return static_cast<mozilla::TextEditor*>(this);
-}
-
-const mozilla::TextEditor*
-nsIEditor::AsTextEditor() const
-{
-  return static_cast<const mozilla::TextEditor*>(this);
-}
-
 #endif // #ifndef mozilla_TextEditor_h

editor/nsIEditor.idl

@@ -21,14 +21,6 @@ interface nsIEditActionListener;
 interface nsIInlineSpellChecker;
 interface nsITransferable;
 
-%{C++
-namespace mozilla {
-class EditorBase;
-class HTMLEditor;
-class TextEditor;
-} // namespace mozilla
-%}
- 
 [scriptable, uuid(094be624-f0bf-400f-89e2-6a84baab9474)]
 interface nsIEditor  : nsISupports
 {
@@ -572,34 +564,4 @@ interface nsIEditor  : nsISupports
    * or nsIEditorObserver::CancelEditAction().  Otherwise, false.
    */
   [noscript] readonly attribute boolean isInEditAction;
-
-%{C++
-  /**
-   * AsEditorBase() returns a pointer to EditorBase class.
-   *
-   * In order to avoid circular dependency issues, this method is defined
-   * in mozilla/EditorBase.h.  Consumers need to #include that header.
-   */
-  inline mozilla::EditorBase* AsEditorBase();
-  inline const mozilla::EditorBase* AsEditorBase() const;
-
-  /**
-   * AsTextEditor() returns a pointer to TextEditor class.
-   *
-   * In order to avoid circular dependency issues, this method is defined
-   * in mozilla/TextEditor.h.  Consumers need to #include that header.
-   */
-  inline mozilla::TextEditor* AsTextEditor();
-  inline const mozilla::TextEditor* AsTextEditor() const;
-
-  /**
-   * AsHTMLEditor() returns a pointer to HTMLEditor class.
-   *
-   * In order to avoid circular dependency issues, this method is defined
-   * in mozilla/HTMLEditor.h.  Consumers need to #include that header.
-   */
-  inline mozilla::HTMLEditor* AsHTMLEditor();
-  inline const mozilla::HTMLEditor* AsHTMLEditor() const;
-%}
-
 };

extensions/spellcheck/src/mozInlineSpellChecker.cpp

@@ -97,6 +97,9 @@ using namespace mozilla::dom;
 #define INLINESPELL_STARTED_TOPIC "inlineSpellChecker-spellCheck-started"
 #define INLINESPELL_ENDED_TOPIC "inlineSpellChecker-spellCheck-ended"
 
+static bool ContentIsDescendantOf(nsINode* aPossibleDescendant,
+                                    nsINode* aPossibleAncestor);
+
 static const char kMaxSpellCheckSelectionSize[] = "extensions.spellcheck.inline.max-misspellings";
 
 mozInlineSpellStatus::mozInlineSpellStatus(mozInlineSpellChecker* aSpellChecker)
@@ -235,7 +238,7 @@ mozInlineSpellStatus::InitForNavigation(
   NS_ENSURE_SUCCESS(rv, rv);
   nsCOMPtr<nsINode> currentAnchor = do_QueryInterface(aOldAnchorNode, &rv);
   NS_ENSURE_SUCCESS(rv, rv);
-  if (root && currentAnchor && !nsContentUtils::ContentIsShadowIncludingDescendantOf(currentAnchor, root)) {
+  if (root && currentAnchor && ! ContentIsDescendantOf(currentAnchor, root)) {
     *aContinue = false;
     return NS_OK;
   }
@@ -1487,11 +1490,8 @@ nsresult mozInlineSpellChecker::DoSpellCheck(mozInlineSpellWordUtil& aWordUtil,
       return NS_OK;
     }
 
-    nsresult rv = aWordUtil.SetPositionAndEnd(beginNode, beginOffset, endNode, endOffset);
-    if (NS_FAILED(rv)) {
-      // Just bail out and don't try to spell-check this
-      return NS_OK;
-    }
+    aWordUtil.SetEnd(endNode, endOffset);
+    aWordUtil.SetPosition(beginNode, beginOffset);
   }
 
   // aWordUtil.SetPosition flushes pending notifications, check editor again.
@@ -1840,6 +1840,24 @@ nsresult mozInlineSpellChecker::SaveCurrentSelectionPosition()
   return NS_OK;
 }
 
+// This is a copy of nsContentUtils::ContentIsDescendantOf. Another crime
+// for XPCOM's rap sheet
+bool // static
+ContentIsDescendantOf(nsINode* aPossibleDescendant,
+                      nsINode* aPossibleAncestor)
+{
+  NS_PRECONDITION(aPossibleDescendant, "The possible descendant is null!");
+  NS_PRECONDITION(aPossibleAncestor, "The possible ancestor is null!");
+
+  do {
+    if (aPossibleDescendant == aPossibleAncestor)
+      return true;
+    aPossibleDescendant = aPossibleDescendant->GetParentNode();
+  } while (aPossibleDescendant);
+
+  return false;
+}
+
 // mozInlineSpellChecker::HandleNavigationEvent
 //
 //    Acts upon mouse clicks and keyboard navigation changes, spell checking

extensions/spellcheck/src/mozInlineSpellWordUtil.cpp

@@ -23,8 +23,6 @@
 #include "nsIFrame.h"
 #include <algorithm>
 #include "mozilla/BinarySearch.h"
-#include "mozilla/HTMLEditor.h"
-#include "mozilla/dom/ShadowRoot.h"
 
 using namespace mozilla;
 
@@ -71,10 +69,8 @@ mozInlineSpellWordUtil::Init(nsWeakPtr aWeakEditor)
   mDOMDocument = domDoc;
   mDocument = do_QueryInterface(domDoc);
 
-  mIsContentEditableOrDesignMode = !!editor->AsHTMLEditor();
-
-  // Find the root node for the editor. For contenteditable the mRootNode could
-  // change to shadow root if the begin and end are inside the shadowDOM.
+  // Find the root node for the editor. For contenteditable we'll need something
+  // cleverer here.
   nsCOMPtr<nsIDOMElement> rootElt;
   rv = editor->GetRootElement(getter_AddRefs(rootElt));
   NS_ENSURE_SUCCESS(rv, rv);
@@ -158,7 +154,7 @@ FindNextTextNode(nsINode* aNode, int32_t aOffset, nsINode* aRoot)
   return checkNode;
 }
 
-// mozInlineSpellWordUtil::SetPositionAndEnd
+// mozInlineSpellWordUtil::SetEnd
 //
 //    We have two ranges "hard" and "soft". The hard boundary is simply
 //    the scope of the root node. The soft boundary is that which is set
@@ -176,44 +172,34 @@ FindNextTextNode(nsINode* aNode, int32_t aOffset, nsINode* aRoot)
 //    position.
 
 nsresult
-mozInlineSpellWordUtil::SetPositionAndEnd(nsINode* aPositionNode,
-                                          int32_t aPositionOffset,
-                                          nsINode* aEndNode,
-                                          int32_t aEndOffset)
+mozInlineSpellWordUtil::SetEnd(nsINode* aEndNode, int32_t aEndOffset)
 {
-  MOZ_ASSERT(aPositionNode, "Null begin node?");
   NS_PRECONDITION(aEndNode, "Null end node?");
 
   NS_ASSERTION(mRootNode, "Not initialized");
 
-  // Find a appropriate root if we are dealing with contenteditable nodes which
-  // are in the shadow DOM. See UXP Issue #3011
-  if (mIsContentEditableOrDesignMode) {
-    nsINode* rootNode = aPositionNode->SubtreeRoot();
-    if (rootNode != aEndNode->SubtreeRoot()) {
-      return NS_ERROR_FAILURE;
-    }
-
-    if (mozilla::dom::ShadowRoot::FromNode(rootNode)) {
-      mRootNode = rootNode;
-    }
-  }
-
   InvalidateWords();
 
-  if (!IsTextNode(aPositionNode)) {
-    // Start at the start of the first text node after aNode/aOffset.
-    aPositionNode = FindNextTextNode(aPositionNode, aPositionOffset, mRootNode);
-    aPositionOffset = 0;
-  }
-  mSoftBegin = NodeOffset(aPositionNode, aPositionOffset);
-
   if (!IsTextNode(aEndNode)) {
     // End at the start of the first text node after aEndNode/aEndOffset.
     aEndNode = FindNextTextNode(aEndNode, aEndOffset, mRootNode);
     aEndOffset = 0;
   }
   mSoftEnd = NodeOffset(aEndNode, aEndOffset);
+  return NS_OK;
+}
+
+nsresult
+mozInlineSpellWordUtil::SetPosition(nsINode* aNode, int32_t aOffset)
+{
+  InvalidateWords();
+
+  if (!IsTextNode(aNode)) {
+    // Start at the start of the first text node after aNode/aOffset.
+    aNode = FindNextTextNode(aNode, aOffset, mRootNode);
+    aOffset = 0;
+  }
+  mSoftBegin = NodeOffset(aNode, aOffset);
 
   nsresult rv = EnsureWords();
   if (NS_FAILED(rv)) {
@@ -221,10 +207,8 @@ mozInlineSpellWordUtil::SetPositionAndEnd(nsINode* aPositionNode,
   }
   
   int32_t textOffset = MapDOMPositionToSoftTextOffset(mSoftBegin);
-  if (textOffset < 0) {
+  if (textOffset < 0)
     return NS_OK;
-  }
-
   mNextWordIndex = FindRealWordContaining(textOffset, HINT_END, true);
   return NS_OK;
 }

extensions/spellcheck/src/mozInlineSpellWordUtil.h

@@ -29,11 +29,12 @@ class nsINode;
  *    The basic operation is:
  *
  *    1. Call Init with the weak pointer to the editor that you're using.
- *    2. Call SetPositionAndEnd to to initialize the current position inside the
- *       previously given range and set where you want to stop spellchecking. 
- *       We'll stop at the word boundary after that. If SetEnd is not called,
- *       we'll stop at the end of the root element.
- *    3. Call GetNextWord over and over until it returns false.
+ *    2. Call SetEnd to set where you want to stop spellchecking. We'll stop
+ *       at the word boundary after that. If SetEnd is not called, we'll stop
+ *       at the end of the document's root element.
+ *    3. Call SetPosition to initialize the current position inside the
+ *       previously given range.
+ *    4. Call GetNextWord over and over until it returns false.
  */
 
 class mozInlineSpellWordUtil
@@ -56,22 +57,17 @@ public:
   };
 
   mozInlineSpellWordUtil()
-    : mIsContentEditableOrDesignMode(false)
-    , mRootNode(nullptr)
-    , mSoftBegin(nullptr, 0)
-    , mSoftEnd(nullptr, 0)
-    , mNextWordIndex(-1)
-    , mSoftTextValid(false)
-  {}
+    : mRootNode(nullptr),
+      mSoftBegin(nullptr, 0), mSoftEnd(nullptr, 0),
+      mNextWordIndex(-1), mSoftTextValid(false) {}
 
   nsresult Init(nsWeakPtr aWeakEditor);
 
-  // Sets the current position and end. This should be inside the range.
-  // If we are in the middle of a word, we'll move to its start.
-  nsresult SetPositionAndEnd(nsINode* aPositionNode,
-                             int32_t aPositionOffset,
-                             nsINode* aEndNode,
-                             int32_t aEndOffset);
+  nsresult SetEnd(nsINode* aEndNode, int32_t aEndOffset);
+
+  // sets the current position, this should be inside the range. If we are in
+  // the middle of a word, we'll move to its start.
+  nsresult SetPosition(nsINode* aNode, int32_t aOffset);
 
   // Given a point inside or immediately following a word, this returns the
   // DOM range that exactly encloses that word's characters. The current
@@ -104,8 +100,7 @@ private:
 
   // cached stuff for the editor, set by Init
   nsCOMPtr<nsIDOMDocument> mDOMDocument;
-  nsCOMPtr<nsIDocument> mDocument;
-  bool mIsContentEditableOrDesignMode;
+  nsCOMPtr<nsIDocument>         mDocument;
 
   // range to check, see SetPosition and SetEnd
   nsINode*    mRootNode;

gfx/angle/src/compiler/preprocessor/MacroExpander.cpp

@@ -220,8 +220,7 @@ bool MacroExpander::expandMacro(const Macro &macro,
         assert(macro.type == Macro::kTypeFunc);
         std::vector<MacroArg> args;
         args.reserve(macro.parameters.size());
-        if (replacements->size() == 0 ||
-            !collectMacroArgs(macro, identifier, &args, &replacementLocation))
+        if (!collectMacroArgs(macro, identifier, &args, &replacementLocation))
             return false;
 
         replaceMacroParams(macro, args, replacements);