Skip to content

Commit 43e9138

Browse files
ditmanloic-sharma
authored andcommitted
Revert "[web] Render in custom target (flutter#37738)" (flutter#38469)
This reverts commit 2358215.
1 parent 6b90d83 commit 43e9138

26 files changed

+491
-1951
lines changed

ci/licenses_golden/licenses_flutter

-16
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/message_handle
19621962
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/slots.dart + ../../../flutter/LICENSE
19631963
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart + ../../../flutter/LICENSE
19641964
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart + ../../../flutter/LICENSE
1965-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart + ../../../flutter/LICENSE
19661965
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart + ../../../flutter/LICENSE
19671966
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/profiler.dart + ../../../flutter/LICENSE
19681967
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/raw_keyboard.dart + ../../../flutter/LICENSE
@@ -2018,13 +2017,6 @@ ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/ulps.dart + ../../../flutter/
20182017
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/util.dart + ../../../flutter/LICENSE
20192018
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart + ../../../flutter/LICENSE
20202019
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart + ../../../flutter/LICENSE
2021-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart + ../../../flutter/LICENSE
2022-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart + ../../../flutter/LICENSE
2023-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart + ../../../flutter/LICENSE
2024-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart + ../../../flutter/LICENSE
2025-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart + ../../../flutter/LICENSE
2026-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart + ../../../flutter/LICENSE
2027-
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart + ../../../flutter/LICENSE
20282020
ORIGIN: ../../../flutter/lib/web_ui/lib/src/engine/window.dart + ../../../flutter/LICENSE
20292021
ORIGIN: ../../../flutter/lib/web_ui/lib/text.dart + ../../../flutter/LICENSE
20302022
ORIGIN: ../../../flutter/lib/web_ui/lib/tile_mode.dart + ../../../flutter/LICENSE
@@ -4421,7 +4413,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/message_handler.
44214413
FILE: ../../../flutter/lib/web_ui/lib/src/engine/platform_views/slots.dart
44224414
FILE: ../../../flutter/lib/web_ui/lib/src/engine/plugins.dart
44234415
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding.dart
4424-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_binding/event_position_helper.dart
44254416
FILE: ../../../flutter/lib/web_ui/lib/src/engine/pointer_converter.dart
44264417
FILE: ../../../flutter/lib/web_ui/lib/src/engine/profiler.dart
44274418
FILE: ../../../flutter/lib/web_ui/lib/src/engine/raw_keyboard.dart
@@ -4477,13 +4468,6 @@ FILE: ../../../flutter/lib/web_ui/lib/src/engine/ulps.dart
44774468
FILE: ../../../flutter/lib/web_ui/lib/src/engine/util.dart
44784469
FILE: ../../../flutter/lib/web_ui/lib/src/engine/validators.dart
44794470
FILE: ../../../flutter/lib/web_ui/lib/src/engine/vector_math.dart
4480-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart
4481-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/dimensions_provider.dart
4482-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart
4483-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart
4484-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/embedding_strategy.dart
4485-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart
4486-
FILE: ../../../flutter/lib/web_ui/lib/src/engine/view_embedder/hot_restart_cache_handler.dart
44874471
FILE: ../../../flutter/lib/web_ui/lib/src/engine/window.dart
44884472
FILE: ../../../flutter/lib/web_ui/lib/text.dart
44894473
FILE: ../../../flutter/lib/web_ui/lib/tile_mode.dart

lib/web_ui/lib/src/engine.dart

-8
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ export 'engine/platform_views/message_handler.dart';
122122
export 'engine/platform_views/slots.dart';
123123
export 'engine/plugins.dart';
124124
export 'engine/pointer_binding.dart';
125-
export 'engine/pointer_binding/event_position_helper.dart';
126125
export 'engine/pointer_converter.dart';
127126
export 'engine/profiler.dart';
128127
export 'engine/raw_keyboard.dart';
@@ -171,11 +170,4 @@ export 'engine/text_editing/text_editing.dart';
171170
export 'engine/util.dart';
172171
export 'engine/validators.dart';
173172
export 'engine/vector_math.dart';
174-
export 'engine/view_embedder/dimensions_provider/custom_element_dimensions_provider.dart';
175-
export 'engine/view_embedder/dimensions_provider/dimensions_provider.dart';
176-
export 'engine/view_embedder/dimensions_provider/full_page_dimensions_provider.dart';
177-
export 'engine/view_embedder/embedding_strategy/custom_element_embedding_strategy.dart';
178-
export 'engine/view_embedder/embedding_strategy/embedding_strategy.dart';
179-
export 'engine/view_embedder/embedding_strategy/full_page_embedding_strategy.dart';
180-
export 'engine/view_embedder/hot_restart_cache_handler.dart';
181173
export 'engine/window.dart';

lib/web_ui/lib/src/engine/dom.dart

+4-82
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ class DomEvent {}
174174

175175
extension DomEventExtension on DomEvent {
176176
external DomEventTarget? get target;
177-
external DomEventTarget? get currentTarget;
178177
external double? get timeStamp;
179178
external String get type;
180179
external void preventDefault();
@@ -462,9 +461,6 @@ class DomHTMLElement extends DomElement {}
462461

463462
extension DomHTMLElementExtension on DomHTMLElement {
464463
external double get offsetWidth;
465-
external double get offsetLeft;
466-
external double get offsetTop;
467-
external DomHTMLElement? get offsetParent;
468464
}
469465

470466
@JS()
@@ -1093,8 +1089,6 @@ extension DomMouseEventExtension on DomMouseEvent {
10931089
external double get clientY;
10941090
external double get offsetX;
10951091
external double get offsetY;
1096-
external double get pageX;
1097-
external double get pageY;
10981092
DomPoint get client => DomPoint(clientX, clientY);
10991093
DomPoint get offset => DomPoint(offsetX, offsetY);
11001094
external double get button;
@@ -1318,10 +1312,7 @@ class DomStyleSheet {}
13181312
class DomCSSStyleSheet extends DomStyleSheet {}
13191313

13201314
extension DomCSSStyleSheetExtension on DomCSSStyleSheet {
1321-
Iterable<DomCSSRule> get cssRules =>
1322-
createDomListWrapper<DomCSSRule>(js_util
1323-
.getProperty<_DomList>(this, 'cssRules'));
1324-
1315+
external DomCSSRuleList get cssRules;
13251316
double insertRule(String rule, [int? index]) => js_util
13261317
.callMethod<double>(
13271318
this, 'insertRule',
@@ -1332,12 +1323,6 @@ extension DomCSSStyleSheetExtension on DomCSSStyleSheet {
13321323
@staticInterop
13331324
class DomCSSRule {}
13341325

1335-
@JS()
1336-
@staticInterop
1337-
extension DomCSSRuleExtension on DomCSSRule {
1338-
external String get cssText;
1339-
}
1340-
13411326
@JS()
13421327
@staticInterop
13431328
class DomScreen {}
@@ -1435,75 +1420,12 @@ extension DomMessageChannelExtension on DomMessageChannel {
14351420
external DomMessagePort get port2;
14361421
}
14371422

1438-
/// ResizeObserver JS binding.
1439-
///
1440-
/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver
14411423
@JS()
14421424
@staticInterop
1443-
abstract class DomResizeObserver {}
1425+
class DomCSSRuleList {}
14441426

1445-
/// Creates a DomResizeObserver with a callback.
1446-
///
1447-
/// Internally converts the `List<dynamic>` of entries into the expected
1448-
/// `List<DomResizeObserverEntry>`
1449-
DomResizeObserver? createDomResizeObserver(DomResizeObserverCallbackFn fn) {
1450-
return domCallConstructorString('ResizeObserver', <Object?>[
1451-
allowInterop(
1452-
(List<dynamic> entries, DomResizeObserver observer) {
1453-
fn(entries.cast<DomResizeObserverEntry>(), observer);
1454-
}
1455-
),
1456-
]) as DomResizeObserver?;
1457-
}
1458-
1459-
/// ResizeObserver instance methods.
1460-
///
1461-
/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver#instance_methods
1462-
extension DomResizeObserverExtension on DomResizeObserver {
1463-
external void disconnect();
1464-
external void observe(DomElement target, [DomResizeObserverObserveOptions options]);
1465-
external void unobserve(DomElement target);
1466-
}
1467-
1468-
/// Options object passed to the `observe` method of a [DomResizeObserver].
1469-
///
1470-
/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserver/observe#parameters
1471-
@JS()
1472-
@staticInterop
1473-
@anonymous
1474-
abstract class DomResizeObserverObserveOptions {
1475-
external factory DomResizeObserverObserveOptions({
1476-
String box,
1477-
});
1478-
}
1479-
1480-
/// Type of the function used to create a Resize Observer.
1481-
typedef DomResizeObserverCallbackFn = void Function(List<DomResizeObserverEntry> entries, DomResizeObserver observer);
1482-
1483-
/// The object passed to the [DomResizeObserverCallbackFn], which allows access to the new dimensions of the observed element.
1484-
///
1485-
/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserverEntry
1486-
@JS()
1487-
@staticInterop
1488-
abstract class DomResizeObserverEntry {}
1489-
1490-
/// ResizeObserverEntry instance properties.
1491-
///
1492-
/// See: https://developer.mozilla.org/en-US/docs/Web/API/ResizeObserverEntry#instance_properties
1493-
extension DomResizeObserverEntryExtension on DomResizeObserverEntry {
1494-
/// A DOMRectReadOnly object containing the new size of the observed element when the callback is run.
1495-
///
1496-
/// Note that this is better supported than the above two properties, but it
1497-
/// is left over from an earlier implementation of the Resize Observer API, is
1498-
/// still included in the spec for web compat reasons, and may be deprecated
1499-
/// in future versions.
1500-
external DomRectReadOnly get contentRect;
1501-
external DomElement get target;
1502-
// Some more future getters:
1503-
//
1504-
// borderBoxSize
1505-
// contentBoxSize
1506-
// devicePixelContentBoxSize
1427+
extension DomCSSRuleListExtension on DomCSSRuleList {
1428+
external double get length;
15071429
}
15081430

15091431
/// A factory to create `TrustedTypePolicy` objects.

0 commit comments

Comments
 (0)