From 4a1b51bddaaf26ce6f0bbd04285309848f4a11a4 Mon Sep 17 00:00:00 2001 From: Jackson Gardner Date: Mon, 9 Sep 2024 10:22:02 -0700 Subject: [PATCH] Revert "Add `crossOrigin` property to tag used for decoding (#54961)" (flutter/engine#55042) This reverts commit acf6660982dff1f924f3438f05a41bcdba649105. Reason for revert: We broke users (including a Google internal customer) that depend on credentialed image requests. See https://github.com/flutter/flutter/issues/154809 Fixes https://github.com/flutter/flutter/issues/154809 --- .../lib/src/engine/html_image_element_codec.dart | 1 - .../lib/web_ui/lib/src/engine/safe_browser_api.dart | 1 - .../web_ui/test/canvaskit/image_golden_test.dart | 13 ------------- 3 files changed, 15 deletions(-) diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart index 4323330a1b..2bd6ccabc5 100644 --- a/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart +++ b/engine/src/flutter/lib/web_ui/lib/src/engine/html_image_element_codec.dart @@ -45,7 +45,6 @@ abstract class HtmlImageElementCodec implements ui.Codec { imgElement = createDomHTMLImageElement(); imgElement!.src = src; setJsProperty(imgElement!, 'decoding', 'async'); - setJsProperty(imgElement!, 'crossOrigin', 'anonymous'); // Ignoring the returned future on purpose because we're communicating // through the `completer`. diff --git a/engine/src/flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart b/engine/src/flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart index a62b2e034c..59d9f7a07e 100644 --- a/engine/src/flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart +++ b/engine/src/flutter/lib/web_ui/lib/src/engine/safe_browser_api.dart @@ -40,7 +40,6 @@ T getJsProperty(Object object, String name) { } const Set _safeJsProperties = { - 'crossOrigin', 'decoding', '__flutter_state', }; diff --git a/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart b/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart index e0681ce6e1..b5c5c6085b 100644 --- a/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart +++ b/engine/src/flutter/lib/web_ui/test/canvaskit/image_golden_test.dart @@ -253,19 +253,6 @@ Future testMain() async { } }); - test('crossOrigin requests cause an error', () async { - final String otherOrigin = - domWindow.location.origin.replaceAll('localhost', '127.0.0.1'); - bool gotError = false; - try { - final ui.Codec _ = await renderer.instantiateImageCodecFromUrl( - Uri.parse('$otherOrigin/test_images/1x1.png')); - } catch (e) { - gotError = true; - } - expect(gotError, isTrue, reason: 'Should have got CORS error'); - }); - _testCkAnimatedImage(); test('isAvif', () {