From a9fa7ede7ff0df1a904a7eb03e2a170fd608899f Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Wed, 1 Dec 2021 09:55:49 -0800 Subject: [PATCH 1/2] Fix sceneElement analysis error --- .../test/canvaskit/embedded_views_test.dart | 58 ++++++++++++------- 1 file changed, 38 insertions(+), 20 deletions(-) diff --git a/lib/web_ui/test/canvaskit/embedded_views_test.dart b/lib/web_ui/test/canvaskit/embedded_views_test.dart index 296f29101ebb3..ce9675bb87275 100644 --- a/lib/web_ui/test/canvaskit/embedded_views_test.dart +++ b/lib/web_ui/test/canvaskit/embedded_views_test.dart @@ -77,7 +77,9 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelectorAll('#sk_path_defs').single, + flutterViewEmbedder.sceneElement! + .querySelectorAll('#sk_path_defs') + .single, isNotNull, ); expect( @@ -118,8 +120,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; + final html.Element slotHost = flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot')!; expect( slotHost.style.transform, @@ -160,8 +162,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; + final html.Element slotHost = flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot')!; expect( getTransformChain(slotHost), @@ -189,8 +191,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; + final html.Element slotHost = flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot')!; expect( getTransformChain(slotHost), @@ -234,7 +236,9 @@ void testMain() { } int countCanvases() { - return flutterViewEmbedder.sceneElement!.querySelectorAll('canvas').length; + return flutterViewEmbedder.sceneElement! + .querySelectorAll('canvas') + .length; } // Frame 1: @@ -337,7 +341,9 @@ void testMain() { } int countCanvases() { - return flutterViewEmbedder.sceneElement!.querySelectorAll('canvas').length; + return flutterViewEmbedder.sceneElement! + .querySelectorAll('canvas') + .length; } // Frame 1: @@ -379,11 +385,13 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot'), isNotNull, ); expect( - flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement! + .querySelector('flt-platform-view'), isNotNull, ); @@ -394,11 +402,13 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot'), isNull, ); expect( - flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement! + .querySelector('flt-platform-view'), isNull, ); }); @@ -419,11 +429,13 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot'), isNotNull, ); expect( - flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement! + .querySelector('flt-platform-view'), isNotNull, ); @@ -435,10 +447,12 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelectorAll('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement! + .querySelectorAll('flt-platform-view-slot'), hasLength(1)); expect( - flutterViewEmbedder.glassPaneElement!.querySelectorAll('flt-platform-view'), + flutterViewEmbedder.glassPaneElement! + .querySelectorAll('flt-platform-view'), hasLength(2)); // Render a frame without a platform view, but also without disposing of @@ -448,13 +462,15 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement! + .querySelector('flt-platform-view-slot'), isNull, ); // The actual contents of the platform view are kept in the dom, until // it's actually disposed of! expect( - flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement! + .querySelector('flt-platform-view'), isNotNull, ); }); @@ -665,7 +681,9 @@ void testMain() { ui.window.platformDispatcher as EnginePlatformDispatcher; int countCanvases() { - return domRenderer.sceneElement!.querySelectorAll('canvas').length; + return flutterViewEmbedder.sceneElement! + .querySelectorAll('canvas') + .length; } expect(platformViewManager.isInvisible(0), isFalse); From 910048da7aa53f933bc11dea6b228353b17ae0dd Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Wed, 1 Dec 2021 09:57:26 -0800 Subject: [PATCH 2/2] undo formatting --- .../test/canvaskit/embedded_views_test.dart | 58 +++++++------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/lib/web_ui/test/canvaskit/embedded_views_test.dart b/lib/web_ui/test/canvaskit/embedded_views_test.dart index ce9675bb87275..a7b6d17b828cd 100644 --- a/lib/web_ui/test/canvaskit/embedded_views_test.dart +++ b/lib/web_ui/test/canvaskit/embedded_views_test.dart @@ -77,9 +77,7 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelectorAll('#sk_path_defs') - .single, + flutterViewEmbedder.sceneElement!.querySelectorAll('#sk_path_defs').single, isNotNull, ); expect( @@ -120,8 +118,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot')!; + final html.Element slotHost = + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; expect( slotHost.style.transform, @@ -162,8 +160,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot')!; + final html.Element slotHost = + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; expect( getTransformChain(slotHost), @@ -191,8 +189,8 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); // Transformations happen on the slot element. - final html.Element slotHost = flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot')!; + final html.Element slotHost = + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot')!; expect( getTransformChain(slotHost), @@ -236,9 +234,7 @@ void testMain() { } int countCanvases() { - return flutterViewEmbedder.sceneElement! - .querySelectorAll('canvas') - .length; + return flutterViewEmbedder.sceneElement!.querySelectorAll('canvas').length; } // Frame 1: @@ -341,9 +337,7 @@ void testMain() { } int countCanvases() { - return flutterViewEmbedder.sceneElement! - .querySelectorAll('canvas') - .length; + return flutterViewEmbedder.sceneElement!.querySelectorAll('canvas').length; } // Frame 1: @@ -385,13 +379,11 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), isNotNull, ); expect( - flutterViewEmbedder.glassPaneElement! - .querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), isNotNull, ); @@ -402,13 +394,11 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), isNull, ); expect( - flutterViewEmbedder.glassPaneElement! - .querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), isNull, ); }); @@ -429,13 +419,11 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), isNotNull, ); expect( - flutterViewEmbedder.glassPaneElement! - .querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), isNotNull, ); @@ -447,12 +435,10 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelectorAll('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement!.querySelectorAll('flt-platform-view-slot'), hasLength(1)); expect( - flutterViewEmbedder.glassPaneElement! - .querySelectorAll('flt-platform-view'), + flutterViewEmbedder.glassPaneElement!.querySelectorAll('flt-platform-view'), hasLength(2)); // Render a frame without a platform view, but also without disposing of @@ -462,15 +448,13 @@ void testMain() { dispatcher.rasterizer!.draw(sb.build().layerTree); expect( - flutterViewEmbedder.sceneElement! - .querySelector('flt-platform-view-slot'), + flutterViewEmbedder.sceneElement!.querySelector('flt-platform-view-slot'), isNull, ); // The actual contents of the platform view are kept in the dom, until // it's actually disposed of! expect( - flutterViewEmbedder.glassPaneElement! - .querySelector('flt-platform-view'), + flutterViewEmbedder.glassPaneElement!.querySelector('flt-platform-view'), isNotNull, ); }); @@ -681,9 +665,7 @@ void testMain() { ui.window.platformDispatcher as EnginePlatformDispatcher; int countCanvases() { - return flutterViewEmbedder.sceneElement! - .querySelectorAll('canvas') - .length; + return flutterViewEmbedder.sceneElement!.querySelectorAll('canvas').length; } expect(platformViewManager.isInvisible(0), isFalse);