[flutter_releases] Cherry pick flutter-2.13-candidate.7 changes (#10… (#103374)

muditatandon · Casey Hillers · jonahwilliams · web-flow · commit 93a41bc4da12 · 2022-05-09T15:55:07.000-07:00
* [flutter_releases] Cherry pick flutter-2.13-candidate.7 changes (#103206) * Revert "Fix jumping when doing long press for selecting text (#102270)" (#103142) This reverts commit 6ea4aef. * Roll engine with Cps * Fix engine hash * [flutter_releases] partial revert of repaint boundary change (#102962) (#103214) Co-authored-by: Jonah Williams <jonahwilliams@google.com> * [flutter_releases] remove assert on markNeedsCompositingBitsUpdate #103227 (#103225) Co-authored-by: Casey Hillers <chillers@google.com> Co-authored-by: Jonah Williams <jonahwilliams@google.com>
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-07584c64bb7ba8d9e79214c3667cdb16cfa67923
+74ac1de5d4f70d6db6cc7f99f6f259a7d073c3ab
diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart
@@ -2295,12 +2295,6 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
         return;
       }
     }
-    assert(() {
-      final AbstractNode? parent = this.parent;
-      if (parent is RenderObject)
-        return parent._needsCompositing;
-      return true;
-    }());
     // parent is fine (or there isn't one), but we are dirty
     if (owner != null)
       owner!._nodesNeedingCompositingBitsUpdate.add(this);
diff --git a/packages/flutter/lib/src/rendering/proxy_box.dart b/packages/flutter/lib/src/rendering/proxy_box.dart
@@ -843,7 +843,7 @@ class RenderOpacity extends RenderProxyBox {
        super(child);
 
   @override
-  bool get isRepaintBoundary => child != null && (_alpha > 0);
+  bool get alwaysNeedsCompositing => child != null && (_alpha > 0);
 
   @override
   OffsetLayer updateCompositedLayer({required covariant OpacityLayer? oldLayer}) {
@@ -871,13 +871,13 @@ class RenderOpacity extends RenderProxyBox {
     assert(value >= 0.0 && value <= 1.0);
     if (_opacity == value)
       return;
-    final bool wasRepaintBoundary = isRepaintBoundary;
+    final bool didNeedCompositing = alwaysNeedsCompositing;
     final bool wasVisible = _alpha != 0;
     _opacity = value;
     _alpha = ui.Color.getAlphaFromOpacity(_opacity);
-    if (wasRepaintBoundary != isRepaintBoundary)
+    if (didNeedCompositing != alwaysNeedsCompositing)
       markNeedsCompositingBitsUpdate();
-    markNeedsCompositedLayerUpdate();
+    markNeedsPaint();
     if (wasVisible != (_alpha != 0) && !alwaysIncludeSemantics)
       markNeedsSemanticsUpdate();
   }
@@ -898,10 +898,19 @@ class RenderOpacity extends RenderProxyBox {
 
   @override
   void paint(PaintingContext context, Offset offset) {
-    if (_alpha == 0) {
-      return;
+    if (child != null) {
+      if (_alpha == 0) {
+        // No need to keep the layer. We'll create a new one if necessary.
+        layer = null;
+        return;
+      }
+      assert(needsCompositing);
+      layer = context.pushOpacity(offset, _alpha, super.paint, oldLayer: layer as OpacityLayer?);
+      assert(() {
+        layer!.debugCreator = debugCreator;
+        return true;
+      }());
     }
-    super.paint(context, offset);
   }
 
   @override
diff --git a/packages/flutter/lib/src/widgets/editable_text.dart b/packages/flutter/lib/src/widgets/editable_text.dart
@@ -2514,11 +2514,6 @@ class EditableTextState extends State<EditableText> with AutomaticKeepAliveClien
     _showCaretOnScreenScheduled = true;
     SchedulerBinding.instance.addPostFrameCallback((Duration _) {
       _showCaretOnScreenScheduled = false;
-
-      // if cursor is inactive, e.g. while selecting text, do not jump away
-      if (!_cursorActive) {
-        return;
-      }
       if (_currentCaretRect == null || !_scrollController.hasClients) {
         return;
       }
diff --git a/packages/flutter/test/widgets/editable_text_test.dart b/packages/flutter/test/widgets/editable_text_test.dart
@@ -5183,53 +5183,6 @@ void main() {
     // toolbar. Until we change that, this test should remain skipped.
   }, skip: kIsWeb); // [intended]
 
-
-  testWidgets('text selection handle visibility for long text', (WidgetTester tester) async {
-    // long text which is scrollable based on given box size
-    const String testText =
-        'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.';
-    final TextEditingController controller =
-        TextEditingController(text: testText);
-    final ScrollController scrollController = ScrollController();
-
-    await tester.pumpWidget(MaterialApp(
-      home: Align(
-        alignment: Alignment.topLeft,
-        child: SizedBox(
-          width: 100,
-          height: 100,
-          child: SingleChildScrollView(
-            controller: scrollController,
-            child: EditableText(
-              controller: controller,
-              showSelectionHandles: true,
-              focusNode: FocusNode(),
-              style: Typography.material2018().black.subtitle1!,
-              cursorColor: Colors.blue,
-              backgroundCursorColor: Colors.grey,
-              selectionControls: materialTextSelectionControls,
-              keyboardType: TextInputType.multiline,
-              maxLines: null,
-            ),
-          ),
-        ),
-      ),
-    ));
-
-    // scroll to a text that is outside of the inital visible rect
-    scrollController.jumpTo(151);
-    await tester.pump();
-
-    // long press on a word to trigger a select
-    await tester.longPressAt(const Offset(20, 15));
-    // wait for adjustments of scroll area
-    await tester.pump();
-    await tester.pumpAndSettle();
-
-    // assert not jumped to top
-    expect(scrollController.offset, equals(151));
-  });
-
   const String testText = 'Now is the time for\n' // 20
       'all good people\n'                         // 20 + 16 => 36
       'to come to the aid\n'                      // 36 + 19 => 55
diff --git a/packages/flutter/test/widgets/opacity_repaint_test.dart b/packages/flutter/test/widgets/opacity_repaint_test.dart

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-07584c64bb7ba8d9e79214c3667cdb16cfa67923`
	`1`	`+74ac1de5d4f70d6db6cc7f99f6f259a7d073c3ab`
Original file line number	Diff line number	Diff line change
`@@ -2295,12 +2295,6 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im`
`2295`	`2295`	`return;`
`2296`	`2296`	`}`
`2297`	`2297`	`}`
`2298`		`- assert(() {`
`2299`		`- final AbstractNode? parent = this.parent;`
`2300`		`- if (parent is RenderObject)`
`2301`		`- return parent._needsCompositing;`
`2302`		`- return true;`
`2303`		`- }());`
`2304`	`2298`	`// parent is fine (or there isn't one), but we are dirty`
`2305`	`2299`	`if (owner != null)`
`2306`	`2300`	`owner!._nodesNeedingCompositingBitsUpdate.add(this);`