Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[web] Rename EngineFlutterWindow => EngineSingletonFlutterWindow #45981

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/web_ui/lib/src/engine/platform_dispatcher.dart
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ class EnginePlatformDispatcher extends ui.PlatformDispatcher {
/// * [PlatformDisptacher.views] for a list of all [FlutterView]s provided
/// by the platform.
@override
EngineFlutterWindow? get implicitView => viewData[kImplicitViewId] as EngineFlutterWindow?;
EngineSingletonFlutterWindow? get implicitView =>
viewData[kImplicitViewId] as EngineSingletonFlutterWindow?;

/// A callback that is invoked whenever the platform's [devicePixelRatio],
/// [physicalSize], [padding], [viewInsets], or [systemGestureInsets]
Expand Down
10 changes: 6 additions & 4 deletions lib/web_ui/lib/src/engine/window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ abstract interface class EngineFlutterView extends ui.FlutterView {
}

/// The Web implementation of [ui.SingletonFlutterWindow].
class EngineFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlutterView {
EngineFlutterWindow(this.viewId, this.platformDispatcher) {
class EngineSingletonFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlutterView {
EngineSingletonFlutterWindow(this.viewId, this.platformDispatcher) {
platformDispatcher.viewData[viewId] = this;
platformDispatcher.windowConfigurations[viewId] = const ViewConfiguration();
if (ui_web.isCustomUrlStrategySet) {
Expand Down Expand Up @@ -383,8 +383,10 @@ class EngineFlutterWindow extends ui.SingletonFlutterWindow implements EngineFlu
/// `dart:ui` window delegates to this value. However, this value has a wider
/// API surface, providing Web-specific functionality that the standard
/// `dart:ui` version does not.
final EngineFlutterWindow window =
EngineFlutterWindow(kImplicitViewId, EnginePlatformDispatcher.instance);
final EngineSingletonFlutterWindow window = EngineSingletonFlutterWindow(
kImplicitViewId,
EnginePlatformDispatcher.instance,
);

/// The Web implementation of [ui.ViewPadding].
class ViewPadding implements ui.ViewPadding {
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/lib/ui_web/src/ui_web/testing.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:ui/ui.dart' as ui;
extension SingletonFlutterWindowExtension on ui.SingletonFlutterWindow {
/// Overrides the value of [physicalSize] in tests.
set debugPhysicalSizeOverride(ui.Size? value) {
(this as EngineFlutterWindow).debugPhysicalSizeOverride = value;
(this as EngineSingletonFlutterWindow).debugPhysicalSizeOverride = value;
}
}

Expand Down
4 changes: 2 additions & 2 deletions lib/web_ui/test/engine/routing_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ void main() {
}

void testMain() {
late EngineFlutterWindow window;
late EngineSingletonFlutterWindow window;

setUpAll(() async {
await initializeEngine();
});

setUp(() {
window = EngineFlutterWindow(0, EnginePlatformDispatcher.instance);
window = EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);
});

tearDown(() async {
Expand Down
3 changes: 2 additions & 1 deletion lib/web_ui/test/engine/surface/platform_view_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import 'package:ui/ui_web/src/ui_web.dart' as ui_web;
import '../../common/matchers.dart';

const MethodCodec codec = StandardMethodCodec();
final EngineFlutterWindow window = EngineFlutterWindow(0, EnginePlatformDispatcher.instance);
final EngineSingletonFlutterWindow window =
EngineSingletonFlutterWindow(0, EnginePlatformDispatcher.instance);

void main() {
internalBootstrapBrowserTest(() => testMain);
Expand Down