github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

In the semantics tree, do not detach a child if it has already been assigned a new parent (#6773)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/6690

Also add a version of the Gallery smoke test that enables semantics
This commit is contained in:
Jason Simmons 2016-11-10 12:55:56 -08:00 committed by GitHub
parent 546cef5277
commit ca5e1f3f23
3 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/flutter_gallery/test/smoke_test.dart
View File

@ -5,9 +5,10 @@
import 'dart:collection' show LinkedHashSet; import 'dart:collection' show LinkedHashSet;
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:flutter_gallery/gallery/item.dart' show GalleryItem, kAllGalleryItems; import 'package:flutter_gallery/gallery/item.dart' show GalleryItem, kAllGalleryItems;
import 'package:flutter_gallery/main.dart' as flutter_gallery_main; import 'package:flutter_gallery/gallery/app.dart' show GalleryApp;
const String kCaption = 'Flutter Gallery'; const String kCaption = 'Flutter Gallery';
@ -47,10 +48,8 @@ Future<Null> smokeDemo(WidgetTester tester, String routeName) async {
return null; return null;
} }
void main() { Future<Null> runSmokeTest(WidgetTester tester) async {
testWidgets('Flutter Gallery app smoke test', (WidgetTester tester) async { await tester.pumpWidget(new GalleryApp());
flutter_gallery_main
.main(); // builds the app and schedules a frame but doesn't trigger one
await tester.pump(); // see https://github.com/flutter/flutter/issues/1865 await tester.pump(); // see https://github.com/flutter/flutter/issues/1865
await tester.pump(); // triggers a frame await tester.pump(); // triggers a frame
@ -90,5 +89,14 @@ void main() {
await tester.tap(find.text('Light')); await tester.tap(find.text('Light'));
await tester.pump(); await tester.pump();
await tester.pump(const Duration(seconds: 1)); // Wait until it's changed. await tester.pump(const Duration(seconds: 1)); // Wait until it's changed.
}
void main() {
testWidgets('Flutter Gallery app smoke test', runSmokeTest);
testWidgets('Flutter Gallery app smoke test', (WidgetTester tester) async {
RendererBinding.instance.setSemanticsEnabled(true);
await runSmokeTest(tester);
RendererBinding.instance.setSemanticsEnabled(false);
}); });
} }

6
packages/flutter/lib/src/rendering/binding.dart
View File

@ -138,7 +138,11 @@ abstract class RendererBinding extends BindingBase implements SchedulerBinding,
SemanticsHandle _semanticsHandle; SemanticsHandle _semanticsHandle;
void _handleSemanticsEnabledChanged() { void _handleSemanticsEnabledChanged() {
if (ui.window.semanticsEnabled) { setSemanticsEnabled(ui.window.semanticsEnabled);
}
void setSemanticsEnabled(bool enabled) {
if (enabled) {
_semanticsHandle ??= _pipelineOwner.ensureSemantics(); _semanticsHandle ??= _pipelineOwner.ensureSemantics();
} else { } else {
_semanticsHandle?.dispose(); _semanticsHandle?.dispose();

7
packages/flutter/lib/src/rendering/semantics.dart
View File

@ -372,6 +372,7 @@ class SemanticsNode extends AbstractNode {
/// child list for the given frame at once instead of needing to process the /// child list for the given frame at once instead of needing to process the
/// changes incrementally as new children are compiled. /// changes incrementally as new children are compiled.
void finalizeChildren() { void finalizeChildren() {
// The goal of this function is updating sawChange.
if (_children != null) { if (_children != null) {
for (SemanticsNode child in _children) for (SemanticsNode child in _children)
child._dead = true; child._dead = true;
@ -473,10 +474,14 @@ class SemanticsNode extends AbstractNode {
owner._detachedNodes.add(this); owner._detachedNodes.add(this);
super.detach(); super.detach();
if (_children != null) { if (_children != null) {
for (SemanticsNode child in _children) for (SemanticsNode child in _children) {
// The list of children may be stale and may contain nodes that have
// been assigned to a different parent.
if (child.parent == this)
child.detach(); child.detach();
} }
} }
}
bool _dirty = false; bool _dirty = false;
void _markDirty() { void _markDirty() {