Skip to content

Commit

Permalink
Manual roll Flutter from fa402c8057a1 to ead6b0d17c89 (14 revisions) (#…
Browse files Browse the repository at this point in the history
…7806)

Manual roll requested by stuartmorgan@google.com

flutter/flutter@fa402c8...ead6b0d

2024-09-27 kustermann@google.com Remove left-over traces of "link-dry-run" - which isn't used anywhere in flutter (flutter/flutter#155820)
2024-09-27 engine-flutter-autoroll@skia.org Roll Flutter Engine from e57b440ec4ee to 7c603de2dca7 (5 revisions) (flutter/flutter#155811)
2024-09-27 bruno.leroux@gmail.com Fix DropdownMenu rendered behind AppBar (flutter/flutter#155539)
2024-09-27 engine-flutter-autoroll@skia.org Roll Flutter Engine from 53517772a5b0 to e57b440ec4ee (8 revisions) (flutter/flutter#155799)
2024-09-27 ditman@gmail.com Throw StateError when implicitView is null on `wrapWithDefaultView`. (flutter/flutter#155734)
2024-09-27 34871572+gmackall@users.noreply.github.com Roll packages manually (flutter/flutter#155786)
2024-09-27 rmolivares@renzo-olivares.dev fix: SelectableText should handle focus changes (flutter/flutter#155771)
2024-09-27 34871572+gmackall@users.noreply.github.com Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (again) (flutter/flutter#155794)
2024-09-26 34871572+gmackall@users.noreply.github.com Use flutter from in same repo (not path) in `generate_gradle_lockfiles.dart` (flutter/flutter#155790)
2024-09-26 rmolivares@renzo-olivares.dev `RenderParagraph` should invalidate its `_SelectableFragment`s cached rects on window size updates (flutter/flutter#155719)
2024-09-26 zeqinjie@qq.com Fix broken text field with set hint and min and max lines(#153183) (flutter/flutter#153235)
2024-09-26 engine-flutter-autoroll@skia.org Roll Flutter Engine from 9e6133e8d906 to 53517772a5b0 (1 revision) (flutter/flutter#155772)
2024-09-26 ian@hixie.ch Fix line-wrapping in `flutter create` error message. (flutter/flutter#150325)
2024-09-26 christopherfujino@gmail.com remove fujino from CODEOWNERS (flutter/flutter#155369)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC camillesimon@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
  • Loading branch information
engine-flutter-autoroll authored Oct 7, 2024
1 parent bb00d34 commit b6b7bfa
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fa402c8057a11481b834c478cb8374df9bbc0819
ead6b0d17c893109b9424aaf116a74295472cc73
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ public void onSurfaceRequested(@NonNull SurfaceRequest request) {
surfaceProducer.setCallback(
new TextureRegistry.SurfaceProducer.Callback() {
@Override
// TODO(matanlurey): Replace with onSurfaceAvailable once available on stable;
// https://github.com/flutter/flutter/issues/155131.
@SuppressWarnings({"deprecation", "removal"})
public void onSurfaceCreated() {
// Do nothing. The Preview.SurfaceProvider will handle this whenever a new
// Surface is needed.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void createSurfaceProducer_setsExpectedSurfaceProducerCallback() {
reset(mockSurfaceRequest);

// Verify callback's onSurfaceCreated does not interact with the SurfaceRequest.
callback.onSurfaceCreated();
simulateSurfaceCreation(callback);
verifyNoMoreInteractions(mockSurfaceRequest);
}

Expand Down Expand Up @@ -262,4 +262,12 @@ public void setTargetRotation_makesCallToSetTargetRotation() {

verify(mockPreview).setTargetRotation(targetRotation);
}

// TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once
// available on stable; see https://github.com/flutter/flutter/issues/155131.
// This seperate method only exists to scope the suppression.
@SuppressWarnings({"deprecation", "removal"})
void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
producerLifecycle.onSurfaceCreated();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public void onSurfaceProducerDestroyedAndRecreatedReleasesAndThenRecreatesAndRes

// Create a new mock exo player so that we get a new instance.
mockExoPlayer = mock(ExoPlayer.class);
producerLifecycle.onSurfaceCreated();
simulateSurfaceCreation(producerLifecycle);

verify(mockExoPlayer).seekTo(10L);
verify(mockExoPlayer).setRepeatMode(Player.REPEAT_MODE_ALL);
Expand Down Expand Up @@ -231,7 +231,7 @@ public void onSurfaceCreatedDoesNotSendInitializeEventAgain() {

// Trigger destroyed/created.
producerLifecycle.onSurfaceDestroyed();
producerLifecycle.onSurfaceCreated();
simulateSurfaceCreation(producerLifecycle);

// Initial listener, and the new one from the resume.
verify(mockExoPlayer, times(2)).addListener(listenerCaptor.capture());
Expand All @@ -257,7 +257,7 @@ public void onSurfaceCreatedWithoutDestroyDoesNotRecreate() {
TextureRegistry.SurfaceProducer.Callback producerLifecycle = callbackCaptor.getValue();

// Calling onSurfaceCreated does not do anything, since the surface was never destroyed.
producerLifecycle.onSurfaceCreated();
simulateSurfaceCreation(producerLifecycle);
verifyNoMoreInteractions(mockProducer);

videoPlayer.dispose();
Expand All @@ -271,4 +271,12 @@ public void disposeReleasesTextureAndPlayer() {
verify(mockProducer).release();
verify(mockExoPlayer).release();
}

// TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once
// available on stable; see https://github.com/flutter/flutter/issues/155131.
// This seperate method only exists to scope the suppression.
@SuppressWarnings({"deprecation", "removal"})
void simulateSurfaceCreation(TextureRegistry.SurfaceProducer.Callback producerLifecycle) {
producerLifecycle.onSurfaceCreated();
}
}

0 comments on commit b6b7bfa

Please sign in to comment.