gistfile1.txt

diff --git a/dom/camera/DOMCameraCapabilities.cpp b/dom/camera/DOMCameraCapabilities.cpp
--- a/dom/camera/DOMCameraCapabilities.cpp
+++ b/dom/camera/DOMCameraCapabilities.cpp
@@ -165,31 +165,31 @@ DOMCameraCapabilities::StringListToNewOb
                                              JS::MutableHandle<JS::Value> aArray,
                                              uint32_t aKey)
 {
   JS::Rooted<JSObject*> array(aCx);
 
   nsresult rv = ParameterListToNewArray(aCx, &array, aKey, ParseStringItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aArray.setObject(*array);
+  aArray.setObjectOrNull(array);
   return NS_OK;
 }
 
 nsresult
 DOMCameraCapabilities::DimensionListToNewObject(JSContext* aCx,
                                                 JS::MutableHandle<JS::Value> aArray,
                                                 uint32_t aKey)
 {
   JS::Rooted<JSObject*> array(aCx);
 
   nsresult rv = ParameterListToNewArray(aCx, &array, aKey, ParseDimensionItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aArray.setObject(*array);
+  aArray.setObjectOrNull(array);
   return NS_OK;
 }
 
 /* readonly attribute jsval previewSizes; */
 NS_IMETHODIMP
 DOMCameraCapabilities::GetPreviewSizes(JSContext* cx,
                                        JS::MutableHandle<JS::Value> aPreviewSizes)
 {
@@ -358,17 +358,17 @@ DOMCameraCapabilities::GetZoomRatios(JSC
     return NS_OK;
   }
 
   JS::Rooted<JSObject*> array(cx);
 
   nsresult rv = ParameterListToNewArray(cx, &array, CAMERA_PARAM_SUPPORTED_ZOOMRATIOS, ParseZoomRatioItemAndAdd);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  aZoomRatios.setObject(*array);
+  aZoomRatios.setObjectOrNull(array);
   return NS_OK;
 }
 
 /* readonly attribute jsval videoSizes; */
 NS_IMETHODIMP
 DOMCameraCapabilities::GetVideoSizes(JSContext* cx, JS::MutableHandle<JS::Value> aVideoSizes)
 {
   NS_ENSURE_TRUE(mCamera, NS_ERROR_NOT_AVAILABLE);