Skip to content

Commit

Permalink
Roll engine to fea42a2 (11 commits)
Browse files Browse the repository at this point in the history
flutter/engine@6bc33b5...fea42a2

git log 6bc33b5..fea42a2 --no-merges --oneline
fea42a2 Roll src/third_party/dart 9e1adc54a7..389ccc9000 (10 commits)
d6cf2bd Roll src/third_party/dart da4ccd0855..9e1adc54a7 (3 commits)
0c2a2c1 Initialize OpacityLayer&flutter#39;s matrix to identity (flutter/engine#8467)
7fd4caf Roll src/third_party/dart 1ad11facec..da4ccd0855 (6 commits)
d3fbaea Android Embedding PR25: Prevent black rectangle when launching FlutterActivity (flutter/engine#8460)
99da038 Document the leak_vm flag. (flutter/engine#8462)
ce7c21c Log the correct function on error in the embedder. (flutter/engine#8461)
e10d464 Improve path metrics tests and docs (flutter/engine#7851)
424045c Enable shutting down all root isolates in a VM. (flutter/engine#8457)
816e3dc Roll src/third_party/dart 907c514c89..1ad11facec (7 commits)
45dc353 Roll src/third_party/skia 0e35ce27e0e9..053b2939938c (10 commits) (flutter/engine#8458)

This roll also includes manual fix for @mustCallSuper update: call the
super method whenever possible, and suppress warnings in tests.
  • Loading branch information
liyuqian committed Apr 6, 2019
1 parent d0f89c1 commit 53a2d9c
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion bin/internal/engine.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6bc33b5e144254ceab274298dd61d9d9ed0dcc8f
fea42a25960c07648da5d7a85ef1d32723120abd
1 change: 1 addition & 0 deletions packages/flutter/lib/src/rendering/object.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2663,6 +2663,7 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
@protected
@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
properties.add(DiagnosticsProperty<dynamic>('creator', debugCreator, defaultValue: null, level: DiagnosticLevel.debug));
properties.add(DiagnosticsProperty<ParentData>('parentData', parentData, tooltip: _debugCanParentUseSize == true ? 'can use size' : null, missingIfNull: true));
properties.add(DiagnosticsProperty<Constraints>('constraints', constraints, missingIfNull: true));
Expand Down
2 changes: 2 additions & 0 deletions packages/flutter/lib/src/rendering/view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ class RenderView extends RenderObject with RenderObjectWithChildMixin<RenderBox>
}

@override
// (See the explanation below for why super is not called.)
// ignore: must_call_super
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
// call to ${super.debugFillProperties(description)} is omitted because the
// root superclasses don't include any interesting information for this
Expand Down
1 change: 1 addition & 0 deletions packages/flutter/lib/src/semantics/semantics.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2048,6 +2048,7 @@ class SemanticsNode extends AbstractNode with DiagnosticableTreeMixin {

@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
bool hideOwner = true;
if (_dirty) {
final bool inDirtyNodes = owner != null && owner._dirtyNodes.contains(this);
Expand Down
1 change: 1 addition & 0 deletions packages/flutter/test/foundation/diagnostics_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class TestTree extends Object with DiagnosticableTreeMixin {

@override
void debugFillProperties(DiagnosticPropertiesBuilder properties) {
super.debugFillProperties(properties);
if (style != null)
properties.defaultDiagnosticsTreeStyle = style;

Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/test/material/tabs_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AlwaysKeepAliveState extends State<AlwaysKeepAliveWidget>
bool get wantKeepAlive => true;

@override
Widget build(BuildContext context) {
Widget build(BuildContext context) { // ignore: must_call_super
return Text(AlwaysKeepAliveWidget.text);
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/test/painting/painting_utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PaintingBindingSpy extends BindingBase with ServicesBinding, PaintingBindi
}

@override
void initLicenses() {
void initLicenses() { // ignore: must_call_super
// Do not include any licenses, because we're a test, and the LICENSE file
// doesn't get generated for tests.
}
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter/test/widgets/list_view_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class AliveState extends State<Alive> with AutomaticKeepAliveClientMixin {
bool get wantKeepAlive => widget.alive;

@override
Widget build(BuildContext context) =>
Widget build(BuildContext context) => // ignore: must_call_super
Text('${widget.index}:$wantKeepAlive');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class ProblemWidget extends StatefulWidget {

class ProblemWidgetState extends State<ProblemWidget> with AutomaticKeepAliveClientMixin<ProblemWidget> {
@override
Widget build(BuildContext context) {
Widget build(BuildContext context) { // ignore: must_call_super
Widget child = Semantics(
container: true,
child: Text(widget.text),
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_test/lib/src/binding.dart
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ abstract class TestWidgetsFlutterBinding extends BindingBase
}

@override
void initLicenses() {
void initLicenses() { // ignore: must_call_super
// Do not include any licenses, because we're a test, and the LICENSE file
// doesn't get generated for tests.
}
Expand Down

0 comments on commit 53a2d9c

Please sign in to comment.