diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index d2867e4dc00..c8d91cdfbe4 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -1543,16 +1543,14 @@ DOMInterfaces = {
 'WebGLRenderingContext': {
     'nativeType': 'mozilla::WebGLContext',
     'headerFile': 'WebGLContext.h',
-    'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension',
-                           'getAttachedShaders' ],
+    'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension' ],
     'implicitJSContext': [ 'getSupportedExtensions' ],
 },
 
 'WebGL2RenderingContext': {
     'nativeType': 'mozilla::WebGLContext',
     'headerFile': 'WebGLContext.h',
-    'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension',
-                           'getAttachedShaders' ],
+    'resultNotAddRefed': [ 'canvas', 'getContextAttributes', 'getExtension' ],
     'implicitJSContext': [ 'getSupportedExtensions' ],
 },
 
@@ -1719,11 +1717,7 @@ DOMInterfaces = {
                                'receiveWeakOther', 'receiveWeakNullableOther',
                                'receiveWeakExternal', 'receiveWeakNullableExternal',
                                'ReceiveWeakCallbackInterface',
-                               'ReceiveWeakNullableCallbackInterface',
-                               'receiveWeakCastableObjectSequence',
-                               'receiveWeakNullableCastableObjectSequence',
-                               'receiveWeakCastableObjectNullableSequence',
-                               'receiveWeakNullableCastableObjectNullableSequence' ],
+                               'ReceiveWeakNullableCallbackInterface' ],
         'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
                          'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
                          'attributeRenamedFrom': 'attributeRenamedTo' }
@@ -1757,11 +1751,7 @@ DOMInterfaces = {
                                'receiveWeakOther', 'receiveWeakNullableOther',
                                'receiveWeakExternal', 'receiveWeakNullableExternal',
                                'ReceiveWeakCallbackInterface',
-                               'ReceiveWeakNullableCallbackInterface',
-                               'receiveWeakCastableObjectSequence',
-                               'receiveWeakNullableCastableObjectSequence',
-                               'receiveWeakCastableObjectNullableSequence',
-                               'receiveWeakNullableCastableObjectNullableSequence' ],
+                               'ReceiveWeakNullableCallbackInterface' ],
         'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
                          'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
                          'attributeRenamedFrom': 'attributeRenamedTo' }
@@ -1952,11 +1942,7 @@ DOMInterfaces = {
                                'receiveWeakOther', 'receiveWeakNullableOther',
                                'receiveWeakExternal', 'receiveWeakNullableExternal',
                                'ReceiveWeakCallbackInterface',
-                               'ReceiveWeakNullableCallbackInterface',
-                               'receiveWeakCastableObjectSequence',
-                               'receiveWeakNullableCastableObjectSequence',
-                               'receiveWeakCastableObjectNullableSequence',
-                               'receiveWeakNullableCastableObjectNullableSequence' ],
+                               'ReceiveWeakNullableCallbackInterface' ],
         'binaryNames': { 'methodRenamedFrom': 'methodRenamedTo',
                          'attributeGetterRenamedFrom': 'attributeGetterRenamedTo',
                          'attributeRenamedFrom': 'attributeRenamedTo' }
diff --git a/dom/bindings/test/TestBindingHeader.h b/dom/bindings/test/TestBindingHeader.h
index 6821639744e..619b4bc3cfe 100644
--- a/dom/bindings/test/TestBindingHeader.h
+++ b/dom/bindings/test/TestBindingHeader.h
@@ -379,10 +379,10 @@ public:
   void ReceiveNullableCallbackObjectSequence(nsTArray< nsRefPtr<TestCallbackInterface> > &);
   void ReceiveCastableObjectNullableSequence(Nullable< nsTArray< nsRefPtr<TestInterface> > >&);
   void ReceiveNullableCastableObjectNullableSequence(Nullable< nsTArray< nsRefPtr<TestInterface> > >&);
-  void ReceiveWeakCastableObjectSequence(nsTArray<TestInterface*> &);
-  void ReceiveWeakNullableCastableObjectSequence(nsTArray<TestInterface*> &);
-  void ReceiveWeakCastableObjectNullableSequence(Nullable< nsTArray<TestInterface*> >&);
-  void ReceiveWeakNullableCastableObjectNullableSequence(Nullable< nsTArray<TestInterface*> >&);
+  void ReceiveWeakCastableObjectSequence(nsTArray<nsRefPtr<TestInterface>> &);
+  void ReceiveWeakNullableCastableObjectSequence(nsTArray<nsRefPtr<TestInterface>> &);
+  void ReceiveWeakCastableObjectNullableSequence(Nullable< nsTArray<nsRefPtr<TestInterface>> >&);
+  void ReceiveWeakNullableCastableObjectNullableSequence(Nullable< nsTArray<nsRefPtr<TestInterface>> >&);
   void PassCastableObjectSequence(const Sequence< OwningNonNull<TestInterface> >&);
   void PassNullableCastableObjectSequence(const Sequence< nsRefPtr<TestInterface> > &);
   void PassCastableObjectNullableSequence(const Nullable< Sequence< OwningNonNull<TestInterface> > >&);
diff --git a/dom/canvas/WebGLContext.h b/dom/canvas/WebGLContext.h
index ddfdd9731d9..563652ea977 100644
--- a/dom/canvas/WebGLContext.h
+++ b/dom/canvas/WebGLContext.h
@@ -362,7 +362,7 @@ public:
     already_AddRefed<WebGLActiveInfo> GetActiveUniform(WebGLProgram *prog,
                                                        GLuint index);
     void GetAttachedShaders(WebGLProgram* prog,
-                            dom::Nullable< nsTArray<WebGLShader*> > &retval);
+                            dom::Nullable<nsTArray<nsRefPtr<WebGLShader>>>& retval);
     GLint GetAttribLocation(WebGLProgram* prog, const nsAString& name);
     JS::Value GetBufferParameter(GLenum target, GLenum pname);
     void GetBufferParameter(JSContext* /* unused */, GLenum target,
diff --git a/dom/canvas/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp
index 6e7d439abe1..beb417fa9ce 100644
--- a/dom/canvas/WebGLContextGL.cpp
+++ b/dom/canvas/WebGLContextGL.cpp
@@ -966,7 +966,7 @@ WebGLContext::GetActiveUniform(WebGLProgram *prog, uint32_t index)
 
 void
 WebGLContext::GetAttachedShaders(WebGLProgram *prog,
-                                 Nullable< nsTArray<WebGLShader*> > &retval)
+                                 Nullable<nsTArray<nsRefPtr<WebGLShader>>>& retval)
 {
     retval.SetNull();
     if (IsContextLost())