Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f2c3cd7
Changes from Michael
dkwingsmt Aug 25, 2023
ca0fc96
Merge remote-tracking branch 'origin/main' into enforce-rendering-rule
dkwingsmt Aug 28, 2023
f783ef3
Remove RunOnPlatformTaskRunner
dkwingsmt Aug 28, 2023
3c3ddbe
Impl
dkwingsmt Aug 28, 2023
4326d57
Merge branch 'remove-RunOnPlatformTaskRunner' into enforce-rendering-…
dkwingsmt Aug 28, 2023
9ac34e2
First running runtime controller
dkwingsmt Aug 30, 2023
5e15f5d
CallingRenderOutOfScopeIsIgnored
dkwingsmt Aug 30, 2023
8c7b5d6
Extract methods
dkwingsmt Aug 30, 2023
0d563e8
DuplicateRenderCallsAreIgnored
dkwingsmt Aug 30, 2023
49a3560
Docs and callback
dkwingsmt Aug 30, 2023
713648e
Move destruction to destructor
dkwingsmt Aug 30, 2023
48135a7
Format
dkwingsmt Aug 30, 2023
d0b1cf7
Extract Shell InferVmInitDataFromSettings
dkwingsmt Aug 30, 2023
21b2787
lint
dkwingsmt Aug 30, 2023
c38c202
Revert contents of #45190
dkwingsmt Aug 30, 2023
c4d273c
Use new mocks
dkwingsmt Aug 30, 2023
1f96e53
Merge remote-tracking branch 'origin/main' into enforce-rendering-rule
dkwingsmt Aug 30, 2023
45f0149
Lint
dkwingsmt Aug 30, 2023
cb9b8e4
Merge remote-tracking branch 'origin/main' into enforce-rendering-rule
dkwingsmt Aug 31, 2023
bc11215
correctly post sync for begin frame
dkwingsmt Aug 31, 2023
151ed77
Extract into methods
dkwingsmt Aug 31, 2023
3370e8c
Address comments
dkwingsmt Sep 1, 2023
d768cc4
Remove exact
dkwingsmt Sep 2, 2023
828b791
Merge remote-tracking branch 'dkwingsmt/enforce-rendering-rule' into …
dkwingsmt Sep 2, 2023
e266da1
Merge branch 'main' into enforce-rendering-rule
dkwingsmt Sep 5, 2023
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
Next Next commit
Changes from Michael
  • Loading branch information
dkwingsmt committed Aug 25, 2023
commit f2c3cd7a2624db25c184fb7f5caa7fdf5cd28965
33 changes: 33 additions & 0 deletions lib/ui/platform_dispatcher.dart
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,21 @@ class PlatformDispatcher {
_invoke(onMetricsChanged, _onMetricsChangedZone);
}

// [FlutterView]s for which [FlutterView.render] has already been called
// during the current [onBeginFrame]/[onDrawFrame] callback sequence.
//
// The field is null outside the scope of those callbacks indicating that
// calls to [FlutterView.render] must be ignored. Furthermore, if a given
// [FlutterView] is already present in this set when its [FlutterView.render]
// is called again, that call must be ignored as a duplicate.
//
// Between [onBeginFrame] and [onDrawFrame] the properties value is
// temporarily stored in `_renderedViewsBetweenCallbacks` so that it survives
// the gap between the two callbacks.
Set<FlutterView>? _renderedViews;
// Temporary storage of the `_renderedViews` value between `_beginFrame` and
// `_drawFrame`.
Set<FlutterView>? _renderedViewsBetweenCallbacks;

/// A callback invoked when any view begins a frame.
///
Expand All @@ -329,11 +344,20 @@ class PlatformDispatcher {

// Called from the engine, via hooks.dart
void _beginFrame(int microseconds) {
assert(_renderedViews == null);
assert(_renderedViewsBetweenCallbacks == null);

_renderedViews = <FlutterView>{};
_invoke1<Duration>(
onBeginFrame,
_onBeginFrameZone,
Duration(microseconds: microseconds),
);
_renderedViewsBetweenCallbacks = _renderedViews;
_renderedViews = null;

assert(_renderedViews == null);
assert(_renderedViewsBetweenCallbacks != null);
}

/// A callback that is invoked for each frame after [onBeginFrame] has
Expand All @@ -351,7 +375,16 @@ class PlatformDispatcher {

// Called from the engine, via hooks.dart
void _drawFrame() {
assert(_renderedViews == null);
assert(_renderedViewsBetweenCallbacks != null);

_renderedViews = _renderedViewsBetweenCallbacks;
_renderedViewsBetweenCallbacks = null;
_invoke(onDrawFrame, _onDrawFrameZone);
_renderedViews = null;

assert(_renderedViews == null);
assert(_renderedViewsBetweenCallbacks == null);
}

/// A callback that is invoked when pointer data is available.
Expand Down
9 changes: 8 additions & 1 deletion lib/ui/window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,14 @@ class FlutterView {
/// scheduling of frames.
/// * [RendererBinding], the Flutter framework class which manages layout and
/// painting.
void render(Scene scene) => _render(scene as _NativeScene);
void render(Scene scene) {
if (platformDispatcher._renderedViews?.add(this) != true) {
// Duplicated calls or calls outside of onBeginFrame/onDrawFrame
// (indicated by _renderedViews being null) are ignored, as documented.
return;
}
_render(scene as _NativeScene);
}

@Native<Void Function(Pointer<Void>)>(symbol: 'PlatformConfigurationNativeApi::Render')
external static void _render(_NativeScene scene);
Expand Down