Bug 1348453 - Make the second argument to ImageBitmap::ExtensionsEnabled() optional; r=baku

dom/base/nsGlobalWindow.cpp

@@ -14832,7 +14832,7 @@ nsGlobalWindow::CreateImageBitmap(JSContext* aCx,
                                   const Sequence<ChannelPixelLayout>& aLayout,
                                   ErrorResult& aRv)
 {
-  if (!ImageBitmap::ExtensionsEnabled(aCx, nullptr)) {
+  if (!ImageBitmap::ExtensionsEnabled(aCx)) {
     aRv.Throw(NS_ERROR_TYPE_ERR);
     return nullptr;
   }

dom/canvas/ImageBitmap.h

@@ -152,7 +152,10 @@ public:
                        ImageBitmap* aImageBitmap);
 
   // Mozilla Extensions
-  static bool ExtensionsEnabled(JSContext* aCx, JSObject* aObj);
+  // aObj is an optional argument that isn't used by ExtensionsEnabled() and
+  // only exists because the bindings layer insists on passing it to us.  All
+  // other consumers of this function should only call it passing one argument.
+  static bool ExtensionsEnabled(JSContext* aCx, JSObject* aObj = nullptr);
 
   friend CreateImageBitmapFromBlob;
   friend CreateImageBitmapFromBlobTask;

dom/workers/WorkerScope.cpp

@@ -475,7 +475,7 @@ WorkerGlobalScope::CreateImageBitmap(JSContext* aCx,
                                      const Sequence<ChannelPixelLayout>& aLayout,
                                      ErrorResult& aRv)
 {
-  if (!ImageBitmap::ExtensionsEnabled(aCx, nullptr)) {
+  if (!ImageBitmap::ExtensionsEnabled(aCx)) {
     aRv.Throw(NS_ERROR_TYPE_ERR);
     return nullptr;
   }