Skip to content

Commit ab46186

Browse files
itsjustkevinLongCatIsLooongEmmanuel Garciayjbanoveggfly
authored
[flutter_releases] Flutter stable 2.10.1 Engine Cherrypicks (#31339)
* 'Update Dart SDK to 0180af250ff518cc0fa494a4eb484ce11ec1e62c' * [Web Text Input] ensure the input element is put in the DOM on desktop safari (#30885) * Reland: Teardown external view embedder prior to unmerging threads (#31122) * Don't remove views while the rasterizer is torn down (#31229) * [web] roll CanvasKit 0.32.0; fix frame order in animated images (#30680) * roll CanvasKit 0.32.0 * Fix frame order in WASM image codecs * [web] roll CanvasKit to 0.33.0 (#31240) * 'add branch flutter-2.8-candidate.16 to enabled_branches in .ci.yaml' * remove candidate from enabled_branches * resolved merge conflict in DEPS file for the canvaskit_cipd_instance key * update license hash * resolving presubmit failures on android tests Co-authored-by: Kevin Chisholm <[email protected]> Co-authored-by: LongCatIsLooong <[email protected]> Co-authored-by: Emmanuel Garcia <[email protected]> Co-authored-by: Yegor <[email protected]> Co-authored-by: eggfly <[email protected]>
1 parent 776efd2 commit ab46186

24 files changed

+277
-140
lines changed

‎DEPS

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ vars = {
3131

3232
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
3333
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
34-
'canvaskit_cipd_instance': 'NcwvqeeKK7urddCbEdDvHytdaCiCA_8-4oS_T_ouGfgC',
34+
'canvaskit_cipd_instance': '8MSYGWVWzrTJIoVL00ZquruZs-weuwLBy1kt1AawJiIC',
3535

3636
# When updating the Dart revision, ensure that all entries that are
3737
# dependencies of Dart are also updated to match the entries in the
3838
# Dart SDK's DEPS file for that revision of Dart. The DEPS file for
3939
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS.
4040
# You can use //tools/dart/create_updated_flutter_deps.py to produce
4141
# updated revision list of existing dependencies.
42-
'dart_revision': '547d54e13cc8c1ce9279792fd16c189663e18f96',
42+
'dart_revision': '0180af250ff518cc0fa494a4eb484ce11ec1e62c',
4343

4444
# WARNING: DO NOT EDIT MANUALLY
4545
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py

‎ci/licenses_golden/licenses_third_party

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Signature: 51c303e95a17cde2eb9ee7806c16a1c5
1+
Signature: cc2abaf0233d38199643282d27336c28
22

33
UNUSED LICENSES:
44

‎lib/web_ui/dev/canvaskit_lock.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Specifies the version of CanvasKit to use for Flutter Web apps.
22
#
33
# See `lib/web_ui/README.md` for how to update this file.
4-
canvaskit_version: "0.31.0"
4+
canvaskit_version: "0.33.0"

‎lib/web_ui/lib/src/engine/canvaskit/canvaskit_api.dart

+6-1
Original file line numberDiff line numberDiff line change
@@ -758,9 +758,14 @@ class SkColorType {
758758
class SkAnimatedImage {
759759
external int getFrameCount();
760760

761-
/// Returns duration in milliseconds.
762761
external int getRepetitionCount();
762+
763+
/// Returns duration in milliseconds.
764+
external int currentFrameDuration();
765+
766+
/// Advances to the next frame and returns its duration in milliseconds.
763767
external int decodeNextFrame();
768+
764769
external SkImage makeImageAtCurrentFrame();
765770
external int width();
766771
external int height();

‎lib/web_ui/lib/src/engine/canvaskit/image_wasm_codecs.dart

+28-10
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
3131
int _frameCount = 0;
3232
int _repetitionCount = -1;
3333

34-
/// The index to the next frame to be decoded.
35-
int _nextFrameIndex = 0;
34+
/// Current frame index.
35+
int _currentFrameIndex = 0;
3636

3737
@override
3838
SkAnimatedImage createDefault() {
@@ -48,11 +48,16 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
4848
_frameCount = animatedImage.getFrameCount();
4949
_repetitionCount = animatedImage.getRepetitionCount();
5050

51-
// If the object has been deleted then resurrected, it may already have
52-
// iterated over some frames. We need to skip over them.
53-
for (int i = 0; i < _nextFrameIndex; i++) {
51+
// Normally CanvasKit initializes `SkAnimatedImage` to point to the first
52+
// frame in the animation. However, if the Skia object has been deleted then
53+
// resurrected, the framework/app may already have advanced to one of the
54+
// subsequent frames. When that happens the value of _currentFrameIndex will
55+
// be something other than zero, and we need to tell the decoder to skip
56+
// over the previous frames to point to the current one.
57+
for (int i = 0; i < _currentFrameIndex; i++) {
5458
animatedImage.decodeNextFrame();
5559
}
60+
5661
return animatedImage;
5762
}
5863

@@ -100,10 +105,23 @@ class CkAnimatedImage extends ManagedSkiaObject<SkAnimatedImage>
100105
@override
101106
Future<ui.FrameInfo> getNextFrame() {
102107
assert(_debugCheckIsNotDisposed());
103-
final int durationMillis = skiaObject.decodeNextFrame();
104-
final Duration duration = Duration(milliseconds: durationMillis);
105-
final CkImage image = CkImage(skiaObject.makeImageAtCurrentFrame());
106-
_nextFrameIndex = (_nextFrameIndex + 1) % _frameCount;
107-
return Future<ui.FrameInfo>.value(AnimatedImageFrameInfo(duration, image));
108+
final SkAnimatedImage animatedImage = skiaObject;
109+
110+
// SkAnimatedImage comes pre-initialized to point to the current frame (by
111+
// default the first frame, and, with some special resurrection logic in
112+
// `createDefault`, to a subsequent frame if resurrection happens in the
113+
// middle of animation). Flutter's `Codec` semantics is to initialize to
114+
// point to "just before the first frame", i.e. the first invocation of
115+
// `getNextFrame` returns the first frame. Therefore, we have to read the
116+
// current Skia frame, then advance SkAnimatedImage to the next frame, and
117+
// return the current frame.
118+
final ui.FrameInfo currentFrame = AnimatedImageFrameInfo(
119+
Duration(milliseconds: animatedImage.currentFrameDuration()),
120+
CkImage(animatedImage.makeImageAtCurrentFrame()),
121+
);
122+
123+
animatedImage.decodeNextFrame();
124+
_currentFrameIndex = (_currentFrameIndex + 1) % _frameCount;
125+
return Future<ui.FrameInfo>.value(currentFrame);
108126
}
109127
}

‎lib/web_ui/lib/src/engine/configuration.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import 'package:js/js.dart';
3232
/// The version of CanvasKit used by the web engine by default.
3333
// DO NOT EDIT THE NEXT LINE OF CODE MANUALLY
3434
// See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
35-
const String _canvaskitVersion = '0.31.0';
35+
const String _canvaskitVersion = '0.33.0';
3636

3737
/// The Web Engine configuration for the current application.
3838
FlutterConfiguration get configuration => _configuration ??= FlutterConfiguration(_jsConfiguration);

‎lib/web_ui/lib/src/engine/text_editing/text_editing.dart

+7-3
Original file line numberDiff line numberDiff line change
@@ -782,9 +782,10 @@ class SafariDesktopTextEditingStrategy extends DefaultTextEditingStrategy {
782782
// On Safari Desktop, when a form is focused, it opens an autofill menu
783783
// immediately.
784784
// Flutter framework sends `setEditableSizeAndTransform` for informing
785-
// the engine about the location of the text field. This call will
786-
// arrive after `show` call. Therefore form is placed, when
787-
// `setEditableSizeAndTransform` method is called and focus called on the
785+
// the engine about the location of the text field. This call may arrive
786+
// after the first `show` call, depending on the text input widget's
787+
// implementation. Therefore form is placed, when
788+
// `setEditableSizeAndTransform` method is called and focus called on the
788789
// form only after placing it to the correct position and only once after
789790
// that. Calling focus multiple times causes flickering.
790791
focusedFormElement!.focus();
@@ -800,6 +801,9 @@ class SafariDesktopTextEditingStrategy extends DefaultTextEditingStrategy {
800801

801802
@override
802803
void initializeElementPlacement() {
804+
if (geometry != null) {
805+
placeElement();
806+
}
803807
activeDomElement.focus();
804808
}
805809
}

‎lib/web_ui/test/canvaskit/image_golden_test.dart

+4-5
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ void _testForImageCodecs({required bool useBrowserImageDecoder}) {
9494
expect(image.repetitionCount, -1);
9595

9696
final ui.FrameInfo frame1 = await image.getNextFrame();
97-
await expectFrameData(frame1, <int>[0, 255, 0, 255]);
97+
await expectFrameData(frame1, <int>[255, 0, 0, 255]);
9898
final ui.FrameInfo frame2 = await image.getNextFrame();
99-
await expectFrameData(frame2, <int>[0, 0, 255, 255]);
99+
await expectFrameData(frame2, <int>[0, 255, 0, 255]);
100100

101101
// Pretend that the image is temporarily deleted.
102102
image.delete();
103103
image.didDelete();
104104

105105
// Check that we got the 3rd frame after resurrection.
106106
final ui.FrameInfo frame3 = await image.getNextFrame();
107-
await expectFrameData(frame3, <int>[255, 0, 0, 255]);
107+
await expectFrameData(frame3, <int>[0, 0, 255, 255]);
108108

109109
testCollector.collectNow();
110110
});
@@ -548,11 +548,10 @@ void _testCkAnimatedImage() {
548548

549549
test('CkAnimatedImage toByteData(RGBA)', () async {
550550
final CkAnimatedImage image = CkAnimatedImage.decodeFromBytes(kAnimatedGif, 'test');
551-
// TODO(yjbanov): frame sequence is wrong (https://github.com/flutter/flutter/issues/95281)
552551
const List<List<int>> expectedColors = <List<int>>[
552+
<int>[255, 0, 0, 255],
553553
<int>[0, 255, 0, 255],
554554
<int>[0, 0, 255, 255],
555-
<int>[255, 0, 0, 255],
556555
];
557556
for (int i = 0; i < image.frameCount; i++) {
558557
final ui.FrameInfo frame = await image.getNextFrame();

‎lib/web_ui/test/text_editing_test.dart

+34
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,40 @@ void testMain() {
551551
expect(spy.messages, isEmpty);
552552
});
553553

554+
test('setClient, setEditingState, setSizeAndTransform, show - input element is put into the DOM', () {
555+
editingStrategy = SafariDesktopTextEditingStrategy(textEditing!);
556+
textEditing!.debugTextEditingStrategyOverride = editingStrategy;
557+
final MethodCall setClient = MethodCall(
558+
'TextInput.setClient', <dynamic>[123, flutterSinglelineConfig]);
559+
sendFrameworkMessage(codec.encodeMethodCall(setClient));
560+
561+
const MethodCall setEditingState =
562+
MethodCall('TextInput.setEditingState', <String, dynamic>{
563+
'text': 'abcd',
564+
'selectionBase': 2,
565+
'selectionExtent': 3,
566+
});
567+
sendFrameworkMessage(codec.encodeMethodCall(setEditingState));
568+
569+
// Editing shouldn't have started yet.
570+
expect(document.activeElement, document.body);
571+
572+
// The "setSizeAndTransform" message has to be here before we call
573+
// checkInputEditingState, since on some platforms (e.g. Desktop Safari)
574+
// we don't put the input element into the DOM until we get its correct
575+
// dimensions from the framework.
576+
final MethodCall setSizeAndTransform =
577+
configureSetSizeAndTransformMethodCall(150, 50,
578+
Matrix4.translationValues(10.0, 20.0, 30.0).storage.toList());
579+
sendFrameworkMessage(codec.encodeMethodCall(setSizeAndTransform));
580+
581+
const MethodCall show = MethodCall('TextInput.show');
582+
sendFrameworkMessage(codec.encodeMethodCall(show));
583+
584+
expect(defaultTextEditingRoot.activeElement,
585+
textEditing!.strategy.domElement);
586+
});
587+
554588
test('setClient, setEditingState, show, updateConfig, clearClient', () {
555589
final MethodCall setClient = MethodCall('TextInput.setClient', <dynamic>[
556590
123,

‎shell/common/rasterizer.cc

+6-4
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ void Rasterizer::Setup(std::unique_ptr<Surface> surface) {
8181
}
8282
}
8383

84+
void Rasterizer::TeardownExternalViewEmbedder() {
85+
if (external_view_embedder_) {
86+
external_view_embedder_->Teardown();
87+
}
88+
}
89+
8490
void Rasterizer::Teardown() {
8591
auto context_switch =
8692
surface_ ? surface_->MakeRenderContextCurrent() : nullptr;
@@ -97,10 +103,6 @@ void Rasterizer::Teardown() {
97103
raster_thread_merger_->UnMergeNowIfLastOne();
98104
raster_thread_merger_->SetMergeUnmergeCallback(nullptr);
99105
}
100-
101-
if (external_view_embedder_) {
102-
external_view_embedder_->Teardown();
103-
}
104106
}
105107

106108
void Rasterizer::EnableThreadMergerIfNeeded() {

‎shell/common/rasterizer.h

+7
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,13 @@ class Rasterizer final : public SnapshotDelegate {
140140
///
141141
void Teardown();
142142

143+
//----------------------------------------------------------------------------
144+
/// @brief Releases any resource used by the external view embedder.
145+
/// For example, overlay surfaces or Android views.
146+
/// On Android, this method post a task to the platform thread,
147+
/// and waits until it completes.
148+
void TeardownExternalViewEmbedder();
149+
143150
//----------------------------------------------------------------------------
144151
/// @brief Notifies the rasterizer that there is a low memory situation
145152
/// and it must purge as many unnecessary resources as possible.

‎shell/common/shell.cc

+5
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,11 @@ void Shell::OnPlatformViewDestroyed() {
878878
fml::TaskRunner::RunNowOrPostTask(task_runners_.GetRasterTaskRunner(),
879879
raster_task);
880880
latch.Wait();
881+
// On Android, the external view embedder posts a task to the platform thread,
882+
// and waits until it completes.
883+
// As a result, the platform thread must not be blocked prior to calling
884+
// this method.
885+
rasterizer_->TeardownExternalViewEmbedder();
881886
}
882887

883888
// |PlatformView::Delegate|

‎shell/platform/android/external_view_embedder/external_view_embedder.cc

+20-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include "flutter/shell/platform/android/external_view_embedder/external_view_embedder.h"
66

7+
#include "flutter/fml/synchronization/waitable_event.h"
8+
#include "flutter/fml/task_runner.h"
79
#include "flutter/fml/trace_event.h"
810
#include "flutter/shell/platform/android/surface/android_surface.h"
911

@@ -12,12 +14,14 @@ namespace flutter {
1214
AndroidExternalViewEmbedder::AndroidExternalViewEmbedder(
1315
const AndroidContext& android_context,
1416
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
15-
std::shared_ptr<AndroidSurfaceFactory> surface_factory)
17+
std::shared_ptr<AndroidSurfaceFactory> surface_factory,
18+
TaskRunners task_runners)
1619
: ExternalViewEmbedder(),
1720
android_context_(android_context),
1821
jni_facade_(jni_facade),
1922
surface_factory_(surface_factory),
20-
surface_pool_(std::make_unique<SurfacePool>()) {}
23+
surface_pool_(std::make_unique<SurfacePool>()),
24+
task_runners_(task_runners) {}
2125

2226
// |ExternalViewEmbedder|
2327
void AndroidExternalViewEmbedder::PrerollCompositeEmbeddedView(
@@ -264,8 +268,8 @@ void AndroidExternalViewEmbedder::BeginFrame(
264268

265269
// The surface size changed. Therefore, destroy existing surfaces as
266270
// the existing surfaces in the pool can't be recycled.
267-
if (frame_size_ != frame_size && raster_thread_merger->IsOnPlatformThread()) {
268-
surface_pool_->DestroyLayers(jni_facade_);
271+
if (frame_size_ != frame_size) {
272+
DestroySurfaces();
269273
}
270274
surface_pool_->SetFrameSize(frame_size);
271275
// JNI method must be called on the platform thread.
@@ -300,7 +304,18 @@ bool AndroidExternalViewEmbedder::SupportsDynamicThreadMerging() {
300304

301305
// |ExternalViewEmbedder|
302306
void AndroidExternalViewEmbedder::Teardown() {
303-
surface_pool_->DestroyLayers(jni_facade_);
307+
DestroySurfaces();
308+
}
309+
310+
// |ExternalViewEmbedder|
311+
void AndroidExternalViewEmbedder::DestroySurfaces() {
312+
fml::AutoResetWaitableEvent latch;
313+
fml::TaskRunner::RunNowOrPostTask(task_runners_.GetPlatformTaskRunner(),
314+
[&]() {
315+
surface_pool_->DestroyLayers(jni_facade_);
316+
latch.Signal();
317+
});
318+
latch.Wait();
304319
}
305320

306321
} // namespace flutter

‎shell/platform/android/external_view_embedder/external_view_embedder.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <unordered_map>
99

10+
#include "flutter/common/task_runners.h"
1011
#include "flutter/flow/embedded_views.h"
1112
#include "flutter/flow/rtree.h"
1213
#include "flutter/shell/platform/android/context/android_context.h"
@@ -32,7 +33,8 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
3233
AndroidExternalViewEmbedder(
3334
const AndroidContext& android_context,
3435
std::shared_ptr<PlatformViewAndroidJNI> jni_facade,
35-
std::shared_ptr<AndroidSurfaceFactory> surface_factory);
36+
std::shared_ptr<AndroidSurfaceFactory> surface_factory,
37+
TaskRunners task_runners);
3638

3739
// |ExternalViewEmbedder|
3840
void PrerollCompositeEmbeddedView(
@@ -99,6 +101,9 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
99101
// Holds surfaces. Allows to recycle surfaces or allocate new ones.
100102
const std::unique_ptr<SurfacePool> surface_pool_;
101103

104+
// The task runners.
105+
const TaskRunners task_runners_;
106+
102107
// The size of the root canvas.
103108
SkISize frame_size_;
104109

@@ -126,6 +131,11 @@ class AndroidExternalViewEmbedder final : public ExternalViewEmbedder {
126131
// The number of platform views in the previous frame.
127132
int64_t previous_frame_view_count_;
128133

134+
// Destroys the surfaces created from the surface factory.
135+
// This method schedules a task on the platform thread, and waits for
136+
// the task until it completes.
137+
void DestroySurfaces();
138+
129139
// Resets the state.
130140
void Reset();
131141

0 commit comments

Comments
 (0)