Backed out changeset b3389fd511a0 (bug 1795506) for causing failures complaining about transferFromImageBitmap. CLOSED TREE

dom/canvas/ImageBitmapRenderingContext.cpp

@@ -62,23 +62,18 @@ void ImageBitmapRenderingContext::GetCanvas(
   }
 }
 
-void ImageBitmapRenderingContext::TransferImageBitmap(ImageBitmap& aImageBitmap,
-                                                      ErrorResult& aRv) {
-  TransferFromImageBitmap(&aImageBitmap, aRv);
+void ImageBitmapRenderingContext::TransferImageBitmap(
+    ImageBitmap& aImageBitmap) {
+  TransferFromImageBitmap(&aImageBitmap);
 }
 
 void ImageBitmapRenderingContext::TransferFromImageBitmap(
-    ImageBitmap* aImageBitmap, ErrorResult& aRv) {
+    ImageBitmap* aImageBitmap) {
   ResetBitmap();
 
   if (aImageBitmap) {
     mImage = aImageBitmap->TransferAsImage();
 
-    if (!mImage) {
-      aRv.ThrowInvalidStateError("The input ImageBitmap has been detached");
-      return;
-    }
-
     if (aImageBitmap->IsWriteOnly()) {
       if (mCanvasElement) {
         mCanvasElement->SetWriteOnly();

dom/canvas/ImageBitmapRenderingContext.h

@@ -57,8 +57,8 @@ class ImageBitmapRenderingContext final
   void GetCanvas(
       Nullable<OwningHTMLCanvasElementOrOffscreenCanvas>& retval) const;
 
-  void TransferImageBitmap(ImageBitmap& aImageBitmap, ErrorResult& aRv);
-  void TransferFromImageBitmap(ImageBitmap* aImageBitmap, ErrorResult& aRv);
+  void TransferImageBitmap(ImageBitmap& aImageBitmap);
+  void TransferFromImageBitmap(ImageBitmap* aImageBitmap);
 
   // nsICanvasRenderingContextInternal
   virtual int32_t GetWidth() override { return mWidth; }

dom/webidl/ImageBitmapRenderingContext.webidl

@@ -34,10 +34,9 @@ interface ImageBitmapRenderingContext {
   // would be covered by the canvas's bitmap which are not covered by
   // the supplied ImageBitmap are rendered transparent black. Any CSS
   // styles affecting the display of the canvas are applied as usual.
-  [Throws]
   undefined transferFromImageBitmap(ImageBitmap? bitmap);
 
   // Deprecated version of transferFromImageBitmap
-  [Deprecated="ImageBitmapRenderingContext_TransferImageBitmap", Throws]
+  [Deprecated="ImageBitmapRenderingContext_TransferImageBitmap"]
   undefined transferImageBitmap(ImageBitmap bitmap);
 };

testing/web-platform/meta/imagebitmap-renderingcontext/transferFromImageBitmap-detached.html.ini

@@ -1,3 +1,5 @@
 [transferFromImageBitmap-detached.html]
   expected:
-    if (os == "android") and fission: [TIMEOUT, OK]
+    if (os == "android") and fission: [TIMEOUT, OK]
+  [Test transferFromImageBitmap(image) with a detached image should throw InvalidStateError]
+    expected: FAIL