firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fixes in flutter framework code to address the mixin issue raised"

Browse Source 
This reverts commit 1c236d52454fd6c72c9b49b7b06f08c5ba36ec66.
This commit is contained in:
asiva 2018-02-07 17:41:10 -08:00 committed by Siva
parent fb9743d7ac
commit e122d5d1d5
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/flutter/lib/src/rendering/proxy_box.dart
View File

@ -51,9 +51,8 @@ class RenderProxyBox extends RenderBox with RenderObjectWithChildMixin<RenderBox
/// This class can be used as a mixin for situations where the proxying behavior /// This class can be used as a mixin for situations where the proxying behavior
/// of [RenderProxyBox] is desired but inheriting from [RenderProxyBox] is /// of [RenderProxyBox] is desired but inheriting from [RenderProxyBox] is
/// impractical (e.g. because you want to mix in other classes as well). /// impractical (e.g. because you want to mix in other classes as well).
/// TODO(ianh): Remove this class once https://github.com/dart-lang/sdk/issues/15101 is fixed // TODO(ianh): Remove this class once https://github.com/dart-lang/sdk/issues/15101 is fixed
@optionalTypeArgs abstract class RenderProxyBoxMixin extends RenderBox with RenderObjectWithChildMixin<RenderBox> {
abstract class RenderProxyBoxMixin<T extends RenderBox> extends RenderBox with RenderObjectWithChildMixin<T> {
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory RenderProxyBoxMixin._() => null; factory RenderProxyBoxMixin._() => null;

3
packages/flutter/lib/src/widgets/automatic_keep_alive.dart
View File

@ -299,8 +299,7 @@ class KeepAliveHandle extends ChangeNotifier {
/// ///
/// * [AutomaticKeepAlive], which listens to messages from this mixin. /// * [AutomaticKeepAlive], which listens to messages from this mixin.
/// * [KeepAliveNotification], the notifications sent by this mixin. /// * [KeepAliveNotification], the notifications sent by this mixin.
@optionalTypeArgs abstract class AutomaticKeepAliveClientMixin extends State<T> {
abstract class AutomaticKeepAliveClientMixin<T extends StatefulWidget> extends State<T> {
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory AutomaticKeepAliveClientMixin._() => null; factory AutomaticKeepAliveClientMixin._() => null;

7
packages/flutter/lib/src/widgets/ticker_provider.dart
View File

@ -73,8 +73,7 @@ class TickerMode extends InheritedWidget {
/// This mixin only supports vending a single ticker. If you might have multiple /// This mixin only supports vending a single ticker. If you might have multiple
/// [AnimationController] objects over the lifetime of the [State], use a full /// [AnimationController] objects over the lifetime of the [State], use a full
/// [TickerProviderStateMixin] instead. /// [TickerProviderStateMixin] instead.
@optionalTypeArgs abstract class SingleTickerProviderStateMixin extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
abstract class SingleTickerProviderStateMixin<T extends StatefulWidget> extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory SingleTickerProviderStateMixin._() => null; factory SingleTickerProviderStateMixin._() => null;
@ -156,8 +155,12 @@ abstract class SingleTickerProviderStateMixin<T extends StatefulWidget> extends
/// If you only have a single [Ticker] (for example only a single /// If you only have a single [Ticker] (for example only a single
/// [AnimationController]) for the lifetime of your [State], then using a /// [AnimationController]) for the lifetime of your [State], then using a
/// [SingleTickerProviderStateMixin] is more efficient. This is the common case. /// [SingleTickerProviderStateMixin] is more efficient. This is the common case.
<<<<<<< HEAD
@optionalTypeArgs @optionalTypeArgs
abstract class TickerProviderStateMixin<T extends StatefulWidget> extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232 abstract class TickerProviderStateMixin<T extends StatefulWidget> extends State<T> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
=======
abstract class TickerProviderStateMixin extends State<dynamic> implements TickerProvider { // ignore: TYPE_ARGUMENT_NOT_MATCHING_BOUNDS, https://github.com/dart-lang/sdk/issues/25232
>>>>>>> parent of 1c236d524... Fixes in flutter framework code to address the mixin issue raised
// This class is intended to be used as a mixin, and should not be // This class is intended to be used as a mixin, and should not be
// extended directly. // extended directly.
factory TickerProviderStateMixin._() => null; factory TickerProviderStateMixin._() => null;