Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
e122d5d1
Commit
e122d5d1
authored
Feb 08, 2018
by
asiva
Committed by
Siva
Feb 08, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Fixes in flutter framework code to address the mixin issue raised"
This reverts commit
1c236d52
.
parent
fb9743d7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
proxy_box.dart
packages/flutter/lib/src/rendering/proxy_box.dart
+2
-3
automatic_keep_alive.dart
packages/flutter/lib/src/widgets/automatic_keep_alive.dart
+1
-2
ticker_provider.dart
packages/flutter/lib/src/widgets/ticker_provider.dart
+5
-2
No files found.
packages/flutter/lib/src/rendering/proxy_box.dart
View file @
e122d5d1
...
@@ -51,9 +51,8 @@ class RenderProxyBox extends RenderBox with RenderObjectWithChildMixin<RenderBox
...
@@ -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
;
...
...
packages/flutter/lib/src/widgets/automatic_keep_alive.dart
View file @
e122d5d1
...
@@ -299,8 +299,7 @@ class KeepAliveHandle extends ChangeNotifier {
...
@@ -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
;
...
...
packages/flutter/lib/src/widgets/ticker_provider.dart
View file @
e122d5d1
...
@@ -73,8 +73,7 @@ class TickerMode extends InheritedWidget {
...
@@ -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
...
@@ -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
1
c236d524
...
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment