Commit 4d2b3f00 authored by Adam Barth's avatar Adam Barth

Merge pull request #2610 from abarth/update_context

Provide the BuildContext to createRenderObject and updateRenderObject
parents 5ebe61a1 0277b075
...@@ -37,7 +37,7 @@ class RenderDots extends RenderConstrainedBox { ...@@ -37,7 +37,7 @@ class RenderDots extends RenderConstrainedBox {
class Dots extends OneChildRenderObjectWidget { class Dots extends OneChildRenderObjectWidget {
Dots({ Key key, Widget child }) : super(key: key, child: child); Dots({ Key key, Widget child }) : super(key: key, child: child);
RenderDots createRenderObject() => new RenderDots(); RenderDots createRenderObject(BuildContext context) => new RenderDots();
} }
void main() { void main() {
......
...@@ -67,14 +67,14 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget { ...@@ -67,14 +67,14 @@ class _CheckboxRenderObjectWidget extends LeafRenderObjectWidget {
final Color inactiveColor; final Color inactiveColor;
final ValueChanged<bool> onChanged; final ValueChanged<bool> onChanged;
_RenderCheckbox createRenderObject() => new _RenderCheckbox( _RenderCheckbox createRenderObject(BuildContext context) => new _RenderCheckbox(
value: value, value: value,
activeColor: activeColor, activeColor: activeColor,
inactiveColor: inactiveColor, inactiveColor: inactiveColor,
onChanged: onChanged onChanged: onChanged
); );
void updateRenderObject(_RenderCheckbox renderObject, _CheckboxRenderObjectWidget oldWidget) { void updateRenderObject(BuildContext context, _RenderCheckbox renderObject) {
renderObject renderObject
..value = value ..value = value
..activeColor = activeColor ..activeColor = activeColor
......
...@@ -279,9 +279,9 @@ class InkFeatures extends OneChildRenderObjectWidget { ...@@ -279,9 +279,9 @@ class InkFeatures extends OneChildRenderObjectWidget {
final Color color; final Color color;
RenderInkFeatures createRenderObject() => new RenderInkFeatures(color: color); RenderInkFeatures createRenderObject(BuildContext context) => new RenderInkFeatures(color: color);
void updateRenderObject(RenderInkFeatures renderObject, InkFeatures oldWidget) { void updateRenderObject(BuildContext context, RenderInkFeatures renderObject) {
renderObject.color = color; renderObject.color = color;
} }
} }
......
...@@ -72,14 +72,14 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget { ...@@ -72,14 +72,14 @@ class _RadioRenderObjectWidget extends LeafRenderObjectWidget {
final Color activeColor; final Color activeColor;
final ValueChanged<bool> onChanged; final ValueChanged<bool> onChanged;
_RenderRadio createRenderObject() => new _RenderRadio( _RenderRadio createRenderObject(BuildContext context) => new _RenderRadio(
value: selected, value: selected,
activeColor: activeColor, activeColor: activeColor,
inactiveColor: inactiveColor, inactiveColor: inactiveColor,
onChanged: onChanged onChanged: onChanged
); );
void updateRenderObject(_RenderRadio renderObject, _RadioRenderObjectWidget oldWidget) { void updateRenderObject(BuildContext context, _RenderRadio renderObject) {
renderObject renderObject
..value = selected ..value = selected
..activeColor = activeColor ..activeColor = activeColor
......
...@@ -55,13 +55,13 @@ class _SliderRenderObjectWidget extends LeafRenderObjectWidget { ...@@ -55,13 +55,13 @@ class _SliderRenderObjectWidget extends LeafRenderObjectWidget {
final Color activeColor; final Color activeColor;
final ValueChanged<double> onChanged; final ValueChanged<double> onChanged;
_RenderSlider createRenderObject() => new _RenderSlider( _RenderSlider createRenderObject(BuildContext context) => new _RenderSlider(
value: value, value: value,
activeColor: activeColor, activeColor: activeColor,
onChanged: onChanged onChanged: onChanged
); );
void updateRenderObject(_RenderSlider renderObject, _SliderRenderObjectWidget oldWidget) { void updateRenderObject(BuildContext context, _RenderSlider renderObject) {
renderObject renderObject
..value = value ..value = value
..activeColor = activeColor ..activeColor = activeColor
......
...@@ -68,7 +68,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget { ...@@ -68,7 +68,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
final Color inactiveTrackColor; final Color inactiveTrackColor;
final ValueChanged<bool> onChanged; final ValueChanged<bool> onChanged;
_RenderSwitch createRenderObject() => new _RenderSwitch( _RenderSwitch createRenderObject(BuildContext context) => new _RenderSwitch(
value: value, value: value,
activeColor: activeColor, activeColor: activeColor,
inactiveColor: inactiveColor, inactiveColor: inactiveColor,
...@@ -77,7 +77,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget { ...@@ -77,7 +77,7 @@ class _SwitchRenderObjectWidget extends LeafRenderObjectWidget {
onChanged: onChanged onChanged: onChanged
); );
void updateRenderObject(_RenderSwitch renderObject, _SwitchRenderObjectWidget oldWidget) { void updateRenderObject(BuildContext context, _RenderSwitch renderObject) {
renderObject renderObject
..value = value ..value = value
..activeColor = activeColor ..activeColor = activeColor
......
...@@ -265,13 +265,13 @@ class _TabBarWrapper extends MultiChildRenderObjectWidget { ...@@ -265,13 +265,13 @@ class _TabBarWrapper extends MultiChildRenderObjectWidget {
final bool isScrollable; final bool isScrollable;
final TabLayoutChanged onLayoutChanged; final TabLayoutChanged onLayoutChanged;
_RenderTabBar createRenderObject() { _RenderTabBar createRenderObject(BuildContext context) {
_RenderTabBar result = new _RenderTabBar(onLayoutChanged); _RenderTabBar result = new _RenderTabBar(onLayoutChanged);
updateRenderObject(result, null); updateRenderObject(context, result);
return result; return result;
} }
void updateRenderObject(_RenderTabBar renderObject, _TabBarWrapper oldWidget) { void updateRenderObject(BuildContext context, _RenderTabBar renderObject) {
renderObject renderObject
..selectedIndex = selectedIndex ..selectedIndex = selectedIndex
..indicatorColor = indicatorColor ..indicatorColor = indicatorColor
......
...@@ -19,9 +19,9 @@ class AutoLayout extends MultiChildRenderObjectWidget { ...@@ -19,9 +19,9 @@ class AutoLayout extends MultiChildRenderObjectWidget {
final AutoLayoutDelegate delegate; final AutoLayoutDelegate delegate;
RenderAutoLayout createRenderObject() => new RenderAutoLayout(delegate: delegate); RenderAutoLayout createRenderObject(BuildContext context) => new RenderAutoLayout(delegate: delegate);
void updateRenderObject(RenderAutoLayout renderObject, AutoLayout oldWidget) { void updateRenderObject(BuildContext context, RenderAutoLayout renderObject) {
renderObject.delegate = delegate; renderObject.delegate = delegate;
} }
} }
......
...@@ -68,9 +68,9 @@ class Opacity extends OneChildRenderObjectWidget { ...@@ -68,9 +68,9 @@ class Opacity extends OneChildRenderObjectWidget {
/// (i.e., invisible). /// (i.e., invisible).
final double opacity; final double opacity;
RenderOpacity createRenderObject() => new RenderOpacity(opacity: opacity); RenderOpacity createRenderObject(BuildContext context) => new RenderOpacity(opacity: opacity);
void updateRenderObject(RenderOpacity renderObject, Opacity oldWidget) { void updateRenderObject(BuildContext context, RenderOpacity renderObject) {
renderObject.opacity = opacity; renderObject.opacity = opacity;
} }
...@@ -94,14 +94,14 @@ class ShaderMask extends OneChildRenderObjectWidget { ...@@ -94,14 +94,14 @@ class ShaderMask extends OneChildRenderObjectWidget {
final ShaderCallback shaderCallback; final ShaderCallback shaderCallback;
final TransferMode transferMode; final TransferMode transferMode;
RenderShaderMask createRenderObject() { RenderShaderMask createRenderObject(BuildContext context) {
return new RenderShaderMask( return new RenderShaderMask(
shaderCallback: shaderCallback, shaderCallback: shaderCallback,
transferMode: transferMode transferMode: transferMode
); );
} }
void updateRenderObject(RenderShaderMask renderObject, ShaderMask oldWidget) { void updateRenderObject(BuildContext context, RenderShaderMask renderObject) {
renderObject renderObject
..shaderCallback = shaderCallback ..shaderCallback = shaderCallback
..transferMode = transferMode; ..transferMode = transferMode;
...@@ -131,9 +131,9 @@ class DecoratedBox extends OneChildRenderObjectWidget { ...@@ -131,9 +131,9 @@ class DecoratedBox extends OneChildRenderObjectWidget {
/// Where to paint the box decoration. /// Where to paint the box decoration.
final DecorationPosition position; final DecorationPosition position;
RenderDecoratedBox createRenderObject() => new RenderDecoratedBox(decoration: decoration, position: position); RenderDecoratedBox createRenderObject(BuildContext context) => new RenderDecoratedBox(decoration: decoration, position: position);
void updateRenderObject(RenderDecoratedBox renderObject, DecoratedBox oldWidget) { void updateRenderObject(BuildContext context, RenderDecoratedBox renderObject) {
renderObject renderObject
..decoration = decoration ..decoration = decoration
..position = position; ..position = position;
...@@ -163,12 +163,12 @@ class CustomPaint extends OneChildRenderObjectWidget { ...@@ -163,12 +163,12 @@ class CustomPaint extends OneChildRenderObjectWidget {
/// The painter that paints after the children. /// The painter that paints after the children.
final CustomPainter foregroundPainter; final CustomPainter foregroundPainter;
RenderCustomPaint createRenderObject() => new RenderCustomPaint( RenderCustomPaint createRenderObject(BuildContext context) => new RenderCustomPaint(
painter: painter, painter: painter,
foregroundPainter: foregroundPainter foregroundPainter: foregroundPainter
); );
void updateRenderObject(RenderCustomPaint renderObject, CustomPaint oldWidget) { void updateRenderObject(BuildContext context, RenderCustomPaint renderObject) {
renderObject renderObject
..painter = painter ..painter = painter
..foregroundPainter = foregroundPainter; ..foregroundPainter = foregroundPainter;
...@@ -190,9 +190,9 @@ class ClipRect extends OneChildRenderObjectWidget { ...@@ -190,9 +190,9 @@ class ClipRect extends OneChildRenderObjectWidget {
/// If non-null, determines which clip to use. /// If non-null, determines which clip to use.
final CustomClipper<Rect> clipper; final CustomClipper<Rect> clipper;
RenderClipRect createRenderObject() => new RenderClipRect(clipper: clipper); RenderClipRect createRenderObject(BuildContext context) => new RenderClipRect(clipper: clipper);
void updateRenderObject(RenderClipRect renderObject, ClipRect oldWidget) { void updateRenderObject(BuildContext context, RenderClipRect renderObject) {
renderObject.clipper = clipper; renderObject.clipper = clipper;
} }
...@@ -222,9 +222,9 @@ class ClipRRect extends OneChildRenderObjectWidget { ...@@ -222,9 +222,9 @@ class ClipRRect extends OneChildRenderObjectWidget {
/// object. /// object.
final double yRadius; final double yRadius;
RenderClipRRect createRenderObject() => new RenderClipRRect(xRadius: xRadius, yRadius: yRadius); RenderClipRRect createRenderObject(BuildContext context) => new RenderClipRRect(xRadius: xRadius, yRadius: yRadius);
void updateRenderObject(RenderClipRRect renderObject, ClipRRect oldWidget) { void updateRenderObject(BuildContext context, RenderClipRRect renderObject) {
renderObject renderObject
..xRadius = xRadius ..xRadius = xRadius
..yRadius = yRadius; ..yRadius = yRadius;
...@@ -241,9 +241,9 @@ class ClipOval extends OneChildRenderObjectWidget { ...@@ -241,9 +241,9 @@ class ClipOval extends OneChildRenderObjectWidget {
/// If non-null, determines which clip to use. /// If non-null, determines which clip to use.
final CustomClipper<Rect> clipper; final CustomClipper<Rect> clipper;
RenderClipOval createRenderObject() => new RenderClipOval(clipper: clipper); RenderClipOval createRenderObject(BuildContext context) => new RenderClipOval(clipper: clipper);
void updateRenderObject(RenderClipOval renderObject, ClipOval oldWidget) { void updateRenderObject(BuildContext context, RenderClipOval renderObject) {
renderObject.clipper = clipper; renderObject.clipper = clipper;
} }
...@@ -281,14 +281,14 @@ class Transform extends OneChildRenderObjectWidget { ...@@ -281,14 +281,14 @@ class Transform extends OneChildRenderObjectWidget {
/// Whether to apply the translation when performing hit tests. /// Whether to apply the translation when performing hit tests.
final bool transformHitTests; final bool transformHitTests;
RenderTransform createRenderObject() => new RenderTransform( RenderTransform createRenderObject(BuildContext context) => new RenderTransform(
transform: transform, transform: transform,
origin: origin, origin: origin,
alignment: alignment, alignment: alignment,
transformHitTests: transformHitTests transformHitTests: transformHitTests
); );
void updateRenderObject(RenderTransform renderObject, Transform oldWidget) { void updateRenderObject(BuildContext context, RenderTransform renderObject) {
renderObject renderObject
..transform = transform ..transform = transform
..origin = origin ..origin = origin
...@@ -311,9 +311,9 @@ class FractionalTranslation extends OneChildRenderObjectWidget { ...@@ -311,9 +311,9 @@ class FractionalTranslation extends OneChildRenderObjectWidget {
/// Whether to apply the translation when performing hit tests. /// Whether to apply the translation when performing hit tests.
final bool transformHitTests; final bool transformHitTests;
RenderFractionalTranslation createRenderObject() => new RenderFractionalTranslation(translation: translation, transformHitTests: transformHitTests); RenderFractionalTranslation createRenderObject(BuildContext context) => new RenderFractionalTranslation(translation: translation, transformHitTests: transformHitTests);
void updateRenderObject(RenderFractionalTranslation renderObject, FractionalTranslation oldWidget) { void updateRenderObject(BuildContext context, RenderFractionalTranslation renderObject) {
renderObject renderObject
..translation = translation ..translation = translation
..transformHitTests = transformHitTests; ..transformHitTests = transformHitTests;
...@@ -335,9 +335,9 @@ class Padding extends OneChildRenderObjectWidget { ...@@ -335,9 +335,9 @@ class Padding extends OneChildRenderObjectWidget {
/// The amount to pad the child in each dimension. /// The amount to pad the child in each dimension.
final EdgeDims padding; final EdgeDims padding;
RenderPadding createRenderObject() => new RenderPadding(padding: padding); RenderPadding createRenderObject(BuildContext context) => new RenderPadding(padding: padding);
void updateRenderObject(RenderPadding renderObject, Padding oldWidget) { void updateRenderObject(BuildContext context, RenderPadding renderObject) {
renderObject.padding = padding; renderObject.padding = padding;
} }
} }
...@@ -386,9 +386,9 @@ class Align extends OneChildRenderObjectWidget { ...@@ -386,9 +386,9 @@ class Align extends OneChildRenderObjectWidget {
/// Can be both greater and less than 1.0 but must be positive. /// Can be both greater and less than 1.0 but must be positive.
final double heightFactor; final double heightFactor;
RenderPositionedBox createRenderObject() => new RenderPositionedBox(alignment: alignment, widthFactor: widthFactor, heightFactor: heightFactor); RenderPositionedBox createRenderObject(BuildContext context) => new RenderPositionedBox(alignment: alignment, widthFactor: widthFactor, heightFactor: heightFactor);
void updateRenderObject(RenderPositionedBox renderObject, Align oldWidget) { void updateRenderObject(BuildContext context, RenderPositionedBox renderObject) {
renderObject renderObject
..alignment = alignment ..alignment = alignment
..widthFactor = widthFactor ..widthFactor = widthFactor
...@@ -419,9 +419,9 @@ class CustomOneChildLayout extends OneChildRenderObjectWidget { ...@@ -419,9 +419,9 @@ class CustomOneChildLayout extends OneChildRenderObjectWidget {
final OneChildLayoutDelegate delegate; final OneChildLayoutDelegate delegate;
RenderCustomOneChildLayoutBox createRenderObject() => new RenderCustomOneChildLayoutBox(delegate: delegate); RenderCustomOneChildLayoutBox createRenderObject(BuildContext context) => new RenderCustomOneChildLayoutBox(delegate: delegate);
void updateRenderObject(RenderCustomOneChildLayoutBox renderObject, CustomOneChildLayout oldWidget) { void updateRenderObject(BuildContext context, RenderCustomOneChildLayoutBox renderObject) {
renderObject.delegate = delegate; renderObject.delegate = delegate;
} }
} }
...@@ -477,11 +477,11 @@ class CustomMultiChildLayout extends MultiChildRenderObjectWidget { ...@@ -477,11 +477,11 @@ class CustomMultiChildLayout extends MultiChildRenderObjectWidget {
/// The delegate that controls the layout of the children. /// The delegate that controls the layout of the children.
final MultiChildLayoutDelegate delegate; final MultiChildLayoutDelegate delegate;
RenderCustomMultiChildLayoutBox createRenderObject() { RenderCustomMultiChildLayoutBox createRenderObject(BuildContext context) {
return new RenderCustomMultiChildLayoutBox(delegate: delegate); return new RenderCustomMultiChildLayoutBox(delegate: delegate);
} }
void updateRenderObject(RenderCustomMultiChildLayoutBox renderObject, CustomMultiChildLayout oldWidget) { void updateRenderObject(BuildContext context, RenderCustomMultiChildLayoutBox renderObject) {
renderObject.delegate = delegate; renderObject.delegate = delegate;
} }
} }
...@@ -500,7 +500,7 @@ class SizedBox extends OneChildRenderObjectWidget { ...@@ -500,7 +500,7 @@ class SizedBox extends OneChildRenderObjectWidget {
/// If non-null, requires the child to have exactly this height. /// If non-null, requires the child to have exactly this height.
final double height; final double height;
RenderConstrainedBox createRenderObject() => new RenderConstrainedBox( RenderConstrainedBox createRenderObject(BuildContext context) => new RenderConstrainedBox(
additionalConstraints: _additionalConstraints additionalConstraints: _additionalConstraints
); );
...@@ -508,7 +508,7 @@ class SizedBox extends OneChildRenderObjectWidget { ...@@ -508,7 +508,7 @@ class SizedBox extends OneChildRenderObjectWidget {
return new BoxConstraints.tightFor(width: width, height: height); return new BoxConstraints.tightFor(width: width, height: height);
} }
void updateRenderObject(RenderConstrainedBox renderObject, SizedBox oldWidget) { void updateRenderObject(BuildContext context, RenderConstrainedBox renderObject) {
renderObject.additionalConstraints = _additionalConstraints; renderObject.additionalConstraints = _additionalConstraints;
} }
...@@ -535,9 +535,9 @@ class ConstrainedBox extends OneChildRenderObjectWidget { ...@@ -535,9 +535,9 @@ class ConstrainedBox extends OneChildRenderObjectWidget {
/// The additional constraints to impose on the child. /// The additional constraints to impose on the child.
final BoxConstraints constraints; final BoxConstraints constraints;
RenderConstrainedBox createRenderObject() => new RenderConstrainedBox(additionalConstraints: constraints); RenderConstrainedBox createRenderObject(BuildContext context) => new RenderConstrainedBox(additionalConstraints: constraints);
void updateRenderObject(RenderConstrainedBox renderObject, ConstrainedBox oldWidget) { void updateRenderObject(BuildContext context, RenderConstrainedBox renderObject) {
renderObject.additionalConstraints = constraints; renderObject.additionalConstraints = constraints;
} }
...@@ -566,12 +566,12 @@ class FractionallySizedBox extends OneChildRenderObjectWidget { ...@@ -566,12 +566,12 @@ class FractionallySizedBox extends OneChildRenderObjectWidget {
/// incoming height constraint multipled by this factor. /// incoming height constraint multipled by this factor.
final double height; final double height;
RenderFractionallySizedBox createRenderObject() => new RenderFractionallySizedBox( RenderFractionallySizedBox createRenderObject(BuildContext context) => new RenderFractionallySizedBox(
widthFactor: width, widthFactor: width,
heightFactor: height heightFactor: height
); );
void updateRenderObject(RenderFractionallySizedBox renderObject, FractionallySizedBox oldWidget) { void updateRenderObject(BuildContext context, RenderFractionallySizedBox renderObject) {
renderObject renderObject
..widthFactor = width ..widthFactor = width
..heightFactor = height; ..heightFactor = height;
...@@ -628,7 +628,7 @@ class OverflowBox extends OneChildRenderObjectWidget { ...@@ -628,7 +628,7 @@ class OverflowBox extends OneChildRenderObjectWidget {
/// with the center of the parent. /// with the center of the parent.
final FractionalOffset alignment; final FractionalOffset alignment;
RenderOverflowBox createRenderObject() => new RenderOverflowBox( RenderOverflowBox createRenderObject(BuildContext context) => new RenderOverflowBox(
minWidth: minWidth, minWidth: minWidth,
maxWidth: maxWidth, maxWidth: maxWidth,
minHeight: minHeight, minHeight: minHeight,
...@@ -636,7 +636,7 @@ class OverflowBox extends OneChildRenderObjectWidget { ...@@ -636,7 +636,7 @@ class OverflowBox extends OneChildRenderObjectWidget {
alignment: alignment alignment: alignment
); );
void updateRenderObject(RenderOverflowBox renderObject, OverflowBox oldWidget) { void updateRenderObject(BuildContext context, RenderOverflowBox renderObject) {
renderObject renderObject
..minWidth = minWidth ..minWidth = minWidth
..maxWidth = maxWidth ..maxWidth = maxWidth
...@@ -664,9 +664,9 @@ class SizedOverflowBox extends OneChildRenderObjectWidget { ...@@ -664,9 +664,9 @@ class SizedOverflowBox extends OneChildRenderObjectWidget {
final Size size; final Size size;
RenderSizedOverflowBox createRenderObject() => new RenderSizedOverflowBox(requestedSize: size); RenderSizedOverflowBox createRenderObject(BuildContext context) => new RenderSizedOverflowBox(requestedSize: size);
void updateRenderObject(RenderSizedOverflowBox renderObject, SizedOverflowBox oldWidget) { void updateRenderObject(BuildContext context, RenderSizedOverflowBox renderObject) {
renderObject.requestedSize = size; renderObject.requestedSize = size;
} }
} }
...@@ -678,7 +678,7 @@ class OffStage extends OneChildRenderObjectWidget { ...@@ -678,7 +678,7 @@ class OffStage extends OneChildRenderObjectWidget {
OffStage({ Key key, Widget child }) OffStage({ Key key, Widget child })
: super(key: key, child: child); : super(key: key, child: child);
RenderOffStage createRenderObject() => new RenderOffStage(); RenderOffStage createRenderObject(BuildContext context) => new RenderOffStage();
} }
/// Forces child to layout at a specific aspect ratio. /// Forces child to layout at a specific aspect ratio.
...@@ -696,9 +696,9 @@ class AspectRatio extends OneChildRenderObjectWidget { ...@@ -696,9 +696,9 @@ class AspectRatio extends OneChildRenderObjectWidget {
/// a 16:9 width:height aspect ratio would have a value of 16.0/9.0. /// a 16:9 width:height aspect ratio would have a value of 16.0/9.0.
final double aspectRatio; final double aspectRatio;
RenderAspectRatio createRenderObject() => new RenderAspectRatio(aspectRatio: aspectRatio); RenderAspectRatio createRenderObject(BuildContext context) => new RenderAspectRatio(aspectRatio: aspectRatio);
void updateRenderObject(RenderAspectRatio renderObject, AspectRatio oldWidget) { void updateRenderObject(BuildContext context, RenderAspectRatio renderObject) {
renderObject.aspectRatio = aspectRatio; renderObject.aspectRatio = aspectRatio;
} }
...@@ -730,9 +730,9 @@ class IntrinsicWidth extends OneChildRenderObjectWidget { ...@@ -730,9 +730,9 @@ class IntrinsicWidth extends OneChildRenderObjectWidget {
/// If non-null, force the child's height to be a multiple of this value. /// If non-null, force the child's height to be a multiple of this value.
final double stepHeight; final double stepHeight;
RenderIntrinsicWidth createRenderObject() => new RenderIntrinsicWidth(stepWidth: stepWidth, stepHeight: stepHeight); RenderIntrinsicWidth createRenderObject(BuildContext context) => new RenderIntrinsicWidth(stepWidth: stepWidth, stepHeight: stepHeight);
void updateRenderObject(RenderIntrinsicWidth renderObject, IntrinsicWidth oldWidget) { void updateRenderObject(BuildContext context, RenderIntrinsicWidth renderObject) {
renderObject renderObject
..stepWidth = stepWidth ..stepWidth = stepWidth
..stepHeight = stepHeight; ..stepHeight = stepHeight;
...@@ -748,7 +748,7 @@ class IntrinsicWidth extends OneChildRenderObjectWidget { ...@@ -748,7 +748,7 @@ class IntrinsicWidth extends OneChildRenderObjectWidget {
/// This class is relatively expensive. Avoid using it where possible. /// This class is relatively expensive. Avoid using it where possible.
class IntrinsicHeight extends OneChildRenderObjectWidget { class IntrinsicHeight extends OneChildRenderObjectWidget {
IntrinsicHeight({ Key key, Widget child }) : super(key: key, child: child); IntrinsicHeight({ Key key, Widget child }) : super(key: key, child: child);
RenderIntrinsicHeight createRenderObject() => new RenderIntrinsicHeight(); RenderIntrinsicHeight createRenderObject(BuildContext context) => new RenderIntrinsicHeight();
} }
/// Positions its child vertically according to the child's baseline. /// Positions its child vertically according to the child's baseline.
...@@ -766,9 +766,9 @@ class Baseline extends OneChildRenderObjectWidget { ...@@ -766,9 +766,9 @@ class Baseline extends OneChildRenderObjectWidget {
/// The type of baseline to use for positioning the child. /// The type of baseline to use for positioning the child.
final TextBaseline baselineType; final TextBaseline baselineType;
RenderBaseline createRenderObject() => new RenderBaseline(baseline: baseline, baselineType: baselineType); RenderBaseline createRenderObject(BuildContext context) => new RenderBaseline(baseline: baseline, baselineType: baselineType);
void updateRenderObject(RenderBaseline renderObject, Baseline oldWidget) { void updateRenderObject(BuildContext context, RenderBaseline renderObject) {
renderObject renderObject
..baseline = baseline ..baseline = baseline
..baselineType = baselineType; ..baselineType = baselineType;
...@@ -819,7 +819,7 @@ class Viewport extends OneChildRenderObjectWidget { ...@@ -819,7 +819,7 @@ class Viewport extends OneChildRenderObjectWidget {
final ViewportDimensionsChangeCallback onPaintOffsetUpdateNeeded; final ViewportDimensionsChangeCallback onPaintOffsetUpdateNeeded;
RenderViewport createRenderObject() { RenderViewport createRenderObject(BuildContext context) {
return new RenderViewport( return new RenderViewport(
paintOffset: paintOffset, paintOffset: paintOffset,
scrollDirection: scrollDirection, scrollDirection: scrollDirection,
...@@ -829,7 +829,7 @@ class Viewport extends OneChildRenderObjectWidget { ...@@ -829,7 +829,7 @@ class Viewport extends OneChildRenderObjectWidget {
); );
} }
void updateRenderObject(RenderViewport renderObject, Viewport oldWidget) { void updateRenderObject(BuildContext context, RenderViewport renderObject) {
// Order dependency: RenderViewport validates scrollOffset based on scrollDirection. // Order dependency: RenderViewport validates scrollOffset based on scrollDirection.
renderObject renderObject
..scrollDirection = scrollDirection ..scrollDirection = scrollDirection
...@@ -970,9 +970,9 @@ class BlockBody extends MultiChildRenderObjectWidget { ...@@ -970,9 +970,9 @@ class BlockBody extends MultiChildRenderObjectWidget {
/// The direction to use as the main axis. /// The direction to use as the main axis.
final Axis direction; final Axis direction;
RenderBlock createRenderObject() => new RenderBlock(direction: direction); RenderBlock createRenderObject(BuildContext context) => new RenderBlock(direction: direction);
void updateRenderObject(RenderBlock renderObject, BlockBody oldWidget) { void updateRenderObject(BuildContext context, RenderBlock renderObject) {
renderObject.direction = direction; renderObject.direction = direction;
} }
} }
...@@ -1010,9 +1010,9 @@ class Stack extends StackRenderObjectWidgetBase { ...@@ -1010,9 +1010,9 @@ class Stack extends StackRenderObjectWidgetBase {
/// How to align the non-positioned children in the stack. /// How to align the non-positioned children in the stack.
final FractionalOffset alignment; final FractionalOffset alignment;
RenderStack createRenderObject() => new RenderStack(alignment: alignment); RenderStack createRenderObject(BuildContext context) => new RenderStack(alignment: alignment);
void updateRenderObject(RenderStack renderObject, Stack oldWidget) { void updateRenderObject(BuildContext context, RenderStack renderObject) {
renderObject.alignment = alignment; renderObject.alignment = alignment;
} }
} }
...@@ -1034,10 +1034,9 @@ class IndexedStack extends StackRenderObjectWidgetBase { ...@@ -1034,10 +1034,9 @@ class IndexedStack extends StackRenderObjectWidgetBase {
/// How to align the non-positioned children in the stack. /// How to align the non-positioned children in the stack.
final FractionalOffset alignment; final FractionalOffset alignment;
RenderIndexedStack createRenderObject() => new RenderIndexedStack(index: index, alignment: alignment); RenderIndexedStack createRenderObject(BuildContext context) => new RenderIndexedStack(index: index, alignment: alignment);
void updateRenderObject(RenderIndexedStack renderObject, IndexedStack oldWidget) { void updateRenderObject(BuildContext context, RenderIndexedStack renderObject) {
super.updateRenderObject(renderObject, oldWidget);
renderObject renderObject
..index = index ..index = index
..alignment = alignment; ..alignment = alignment;
...@@ -1172,9 +1171,9 @@ abstract class GridRenderObjectWidgetBase extends MultiChildRenderObjectWidget { ...@@ -1172,9 +1171,9 @@ abstract class GridRenderObjectWidgetBase extends MultiChildRenderObjectWidget {
/// The delegate that controls the layout of the children. /// The delegate that controls the layout of the children.
GridDelegate createDelegate(); GridDelegate createDelegate();
RenderGrid createRenderObject() => new RenderGrid(delegate: _delegate); RenderGrid createRenderObject(BuildContext context) => new RenderGrid(delegate: _delegate);
void updateRenderObject(RenderGrid renderObject, GridRenderObjectWidgetBase oldWidget) { void updateRenderObject(BuildContext context, RenderGrid renderObject) {
renderObject.delegate = _delegate; renderObject.delegate = _delegate;
} }
} }
...@@ -1326,9 +1325,9 @@ class Flex extends MultiChildRenderObjectWidget { ...@@ -1326,9 +1325,9 @@ class Flex extends MultiChildRenderObjectWidget {
final FlexAlignItems alignItems; final FlexAlignItems alignItems;
final TextBaseline textBaseline; final TextBaseline textBaseline;
RenderFlex createRenderObject() => new RenderFlex(direction: direction, justifyContent: justifyContent, alignItems: alignItems, textBaseline: textBaseline); RenderFlex createRenderObject(BuildContext context) => new RenderFlex(direction: direction, justifyContent: justifyContent, alignItems: alignItems, textBaseline: textBaseline);
void updateRenderObject(RenderFlex renderObject, Flex oldWidget) { void updateRenderObject(BuildContext context, RenderFlex renderObject) {
renderObject renderObject
..direction = direction ..direction = direction
..justifyContent = justifyContent ..justifyContent = justifyContent
...@@ -1425,9 +1424,9 @@ class RichText extends LeafRenderObjectWidget { ...@@ -1425,9 +1424,9 @@ class RichText extends LeafRenderObjectWidget {
final TextSpan text; final TextSpan text;
RenderParagraph createRenderObject() => new RenderParagraph(text); RenderParagraph createRenderObject(BuildContext context) => new RenderParagraph(text);
void updateRenderObject(RenderParagraph renderObject, RichText oldWidget) { void updateRenderObject(BuildContext context, RenderParagraph renderObject) {
renderObject.text = text; renderObject.text = text;
} }
} }
...@@ -1567,7 +1566,7 @@ class RawImage extends LeafRenderObjectWidget { ...@@ -1567,7 +1566,7 @@ class RawImage extends LeafRenderObjectWidget {
/// the center slice will be stretched only vertically. /// the center slice will be stretched only vertically.
final Rect centerSlice; final Rect centerSlice;
RenderImage createRenderObject() => new RenderImage( RenderImage createRenderObject(BuildContext context) => new RenderImage(
image: image, image: image,
width: width, width: width,
height: height, height: height,
...@@ -1579,7 +1578,7 @@ class RawImage extends LeafRenderObjectWidget { ...@@ -1579,7 +1578,7 @@ class RawImage extends LeafRenderObjectWidget {
centerSlice: centerSlice centerSlice: centerSlice
); );
void updateRenderObject(RenderImage renderObject, RawImage oldWidget) { void updateRenderObject(BuildContext context, RenderImage renderObject) {
renderObject renderObject
..image = image ..image = image
..width = width ..width = width
...@@ -2079,9 +2078,9 @@ class WidgetToRenderBoxAdapter extends LeafRenderObjectWidget { ...@@ -2079,9 +2078,9 @@ class WidgetToRenderBoxAdapter extends LeafRenderObjectWidget {
/// tree will be dirty. /// tree will be dirty.
final VoidCallback onBuild; final VoidCallback onBuild;
RenderBox createRenderObject() => renderBox; RenderBox createRenderObject(BuildContext context) => renderBox;
void updateRenderObject(RenderBox renderObject, WidgetToRenderBoxAdapter oldWidget) { void updateRenderObject(BuildContext context, RenderBox renderObject) {
if (onBuild != null) if (onBuild != null)
onBuild(); onBuild();
} }
...@@ -2109,7 +2108,7 @@ class Listener extends OneChildRenderObjectWidget { ...@@ -2109,7 +2108,7 @@ class Listener extends OneChildRenderObjectWidget {
final PointerCancelEventListener onPointerCancel; final PointerCancelEventListener onPointerCancel;
final HitTestBehavior behavior; final HitTestBehavior behavior;
RenderPointerListener createRenderObject() => new RenderPointerListener( RenderPointerListener createRenderObject(BuildContext context) => new RenderPointerListener(
onPointerDown: onPointerDown, onPointerDown: onPointerDown,
onPointerMove: onPointerMove, onPointerMove: onPointerMove,
onPointerUp: onPointerUp, onPointerUp: onPointerUp,
...@@ -2117,7 +2116,7 @@ class Listener extends OneChildRenderObjectWidget { ...@@ -2117,7 +2116,7 @@ class Listener extends OneChildRenderObjectWidget {
behavior: behavior behavior: behavior
); );
void updateRenderObject(RenderPointerListener renderObject, Listener oldWidget) { void updateRenderObject(BuildContext context, RenderPointerListener renderObject) {
renderObject renderObject
..onPointerDown = onPointerDown ..onPointerDown = onPointerDown
..onPointerMove = onPointerMove ..onPointerMove = onPointerMove
...@@ -2165,7 +2164,7 @@ class Listener extends OneChildRenderObjectWidget { ...@@ -2165,7 +2164,7 @@ class Listener extends OneChildRenderObjectWidget {
/// for the surround tree. /// for the surround tree.
class RepaintBoundary extends OneChildRenderObjectWidget { class RepaintBoundary extends OneChildRenderObjectWidget {
RepaintBoundary({ Key key, Widget child }) : super(key: key, child: child); RepaintBoundary({ Key key, Widget child }) : super(key: key, child: child);
RenderRepaintBoundary createRenderObject() => new RenderRepaintBoundary(); RenderRepaintBoundary createRenderObject(BuildContext context) => new RenderRepaintBoundary();
} }
class IgnorePointer extends OneChildRenderObjectWidget { class IgnorePointer extends OneChildRenderObjectWidget {
...@@ -2175,12 +2174,12 @@ class IgnorePointer extends OneChildRenderObjectWidget { ...@@ -2175,12 +2174,12 @@ class IgnorePointer extends OneChildRenderObjectWidget {
final bool ignoring; final bool ignoring;
final bool ignoringSemantics; // if null, defaults to value of ignoring final bool ignoringSemantics; // if null, defaults to value of ignoring
RenderIgnorePointer createRenderObject() => new RenderIgnorePointer( RenderIgnorePointer createRenderObject(BuildContext context) => new RenderIgnorePointer(
ignoring: ignoring, ignoring: ignoring,
ignoringSemantics: ignoringSemantics ignoringSemantics: ignoringSemantics
); );
void updateRenderObject(RenderIgnorePointer renderObject, IgnorePointer oldWidget) { void updateRenderObject(BuildContext context, RenderIgnorePointer renderObject) {
renderObject renderObject
..ignoring = ignoring ..ignoring = ignoring
..ignoringSemantics = ignoringSemantics; ..ignoringSemantics = ignoringSemantics;
...@@ -2225,13 +2224,13 @@ class Semantics extends OneChildRenderObjectWidget { ...@@ -2225,13 +2224,13 @@ class Semantics extends OneChildRenderObjectWidget {
/// Provides a textual description of the widget. /// Provides a textual description of the widget.
final String label; final String label;
RenderSemanticAnnotations createRenderObject() => new RenderSemanticAnnotations( RenderSemanticAnnotations createRenderObject(BuildContext context) => new RenderSemanticAnnotations(
container: container, container: container,
checked: checked, checked: checked,
label: label label: label
); );
void updateRenderObject(RenderSemanticAnnotations renderObject, Semantics oldWidget) { void updateRenderObject(BuildContext context, RenderSemanticAnnotations renderObject) {
renderObject renderObject
..container = container ..container = container
..checked = checked ..checked = checked
...@@ -2267,7 +2266,7 @@ class Semantics extends OneChildRenderObjectWidget { ...@@ -2267,7 +2266,7 @@ class Semantics extends OneChildRenderObjectWidget {
/// callbacks. /// callbacks.
class MergeSemantics extends OneChildRenderObjectWidget { class MergeSemantics extends OneChildRenderObjectWidget {
MergeSemantics({ Key key, Widget child }) : super(key: key, child: child); MergeSemantics({ Key key, Widget child }) : super(key: key, child: child);
RenderMergeSemantics createRenderObject() => new RenderMergeSemantics(); RenderMergeSemantics createRenderObject(BuildContext context) => new RenderMergeSemantics();
} }
/// Drops all semantics in this subtree. /// Drops all semantics in this subtree.
...@@ -2278,7 +2277,7 @@ class MergeSemantics extends OneChildRenderObjectWidget { ...@@ -2278,7 +2277,7 @@ class MergeSemantics extends OneChildRenderObjectWidget {
/// redundant with the chip label. /// redundant with the chip label.
class ExcludeSemantics extends OneChildRenderObjectWidget { class ExcludeSemantics extends OneChildRenderObjectWidget {
ExcludeSemantics({ Key key, Widget child }) : super(key: key, child: child); ExcludeSemantics({ Key key, Widget child }) : super(key: key, child: child);
RenderExcludeSemantics createRenderObject() => new RenderExcludeSemantics(); RenderExcludeSemantics createRenderObject(BuildContext context) => new RenderExcludeSemantics();
} }
class MetaData extends OneChildRenderObjectWidget { class MetaData extends OneChildRenderObjectWidget {
...@@ -2292,12 +2291,12 @@ class MetaData extends OneChildRenderObjectWidget { ...@@ -2292,12 +2291,12 @@ class MetaData extends OneChildRenderObjectWidget {
final dynamic metaData; final dynamic metaData;
final HitTestBehavior behavior; final HitTestBehavior behavior;
RenderMetaData createRenderObject() => new RenderMetaData( RenderMetaData createRenderObject(BuildContext context) => new RenderMetaData(
metaData: metaData, metaData: metaData,
behavior: behavior behavior: behavior
); );
void updateRenderObject(RenderMetaData renderObject, MetaData oldWidget) { void updateRenderObject(BuildContext context, RenderMetaData renderObject) {
renderObject renderObject
..metaData = metaData ..metaData = metaData
..behavior = behavior; ..behavior = behavior;
......
...@@ -192,9 +192,9 @@ class RenderObjectToWidgetAdapter<T extends RenderObject> extends RenderObjectWi ...@@ -192,9 +192,9 @@ class RenderObjectToWidgetAdapter<T extends RenderObject> extends RenderObjectWi
RenderObjectToWidgetElement<T> createElement() => new RenderObjectToWidgetElement<T>(this); RenderObjectToWidgetElement<T> createElement() => new RenderObjectToWidgetElement<T>(this);
RenderObjectWithChildMixin<T> createRenderObject() => container; RenderObjectWithChildMixin<T> createRenderObject(BuildContext context) => container;
void updateRenderObject(RenderObject renderObject, RenderObjectWidget oldWidget) { } void updateRenderObject(BuildContext context, RenderObject renderObject) { }
RenderObjectToWidgetElement<T> attachToRenderTree([RenderObjectToWidgetElement<T> element]) { RenderObjectToWidgetElement<T> attachToRenderTree([RenderObjectToWidgetElement<T> element]) {
BuildableElement.lockState(() { BuildableElement.lockState(() {
......
...@@ -32,9 +32,9 @@ class _ChildViewWidget extends LeafRenderObjectWidget { ...@@ -32,9 +32,9 @@ class _ChildViewWidget extends LeafRenderObjectWidget {
final ChildViewConnection child; final ChildViewConnection child;
final double scale; final double scale;
RenderChildView createRenderObject() => new RenderChildView(child: child, scale: scale); RenderChildView createRenderObject(BuildContext context) => new RenderChildView(child: child, scale: scale);
void updateRenderObject(RenderChildView renderObject, _ChildViewWidget oldWidget) { void updateRenderObject(BuildContext context, RenderChildView renderObject) {
renderObject renderObject
..child = child ..child = child
..scale = scale; ..scale = scale;
......
...@@ -365,7 +365,7 @@ class _EditableLineWidget extends LeafRenderObjectWidget { ...@@ -365,7 +365,7 @@ class _EditableLineWidget extends LeafRenderObjectWidget {
final Offset paintOffset; final Offset paintOffset;
final ViewportDimensionsChangeCallback onPaintOffsetUpdateNeeded; final ViewportDimensionsChangeCallback onPaintOffsetUpdateNeeded;
RenderEditableLine createRenderObject() { RenderEditableLine createRenderObject(BuildContext context) {
return new RenderEditableLine( return new RenderEditableLine(
text: _styledTextSpan, text: _styledTextSpan,
cursorColor: cursorColor, cursorColor: cursorColor,
...@@ -378,8 +378,7 @@ class _EditableLineWidget extends LeafRenderObjectWidget { ...@@ -378,8 +378,7 @@ class _EditableLineWidget extends LeafRenderObjectWidget {
); );
} }
void updateRenderObject(RenderEditableLine renderObject, void updateRenderObject(BuildContext context, RenderEditableLine renderObject) {
_EditableLineWidget oldWidget) {
renderObject renderObject
..text = _styledTextSpan ..text = _styledTextSpan
..cursorColor = cursorColor ..cursorColor = cursorColor
......
...@@ -485,12 +485,12 @@ abstract class RenderObjectWidget extends Widget { ...@@ -485,12 +485,12 @@ abstract class RenderObjectWidget extends Widget {
/// Constructs an instance of the RenderObject class that this /// Constructs an instance of the RenderObject class that this
/// RenderObjectWidget represents, using the configuration described by this /// RenderObjectWidget represents, using the configuration described by this
/// RenderObjectWidget. /// RenderObjectWidget.
RenderObject createRenderObject(); RenderObject createRenderObject(BuildContext context);
/// Copies the configuration described by this RenderObjectWidget to the given /// Copies the configuration described by this RenderObjectWidget to the given
/// RenderObject, which must be of the same type as returned by this class' /// RenderObject, which must be of the same type as returned by this class'
/// createRenderObject(). /// createRenderObject(BuildContext context).
void updateRenderObject(RenderObject renderObject, RenderObjectWidget oldWidget) { } void updateRenderObject(BuildContext context, RenderObject renderObject) { }
void didUnmountRenderObject(RenderObject renderObject) { } void didUnmountRenderObject(RenderObject renderObject) { }
} }
...@@ -1033,7 +1033,7 @@ class ErrorWidget extends LeafRenderObjectWidget { ...@@ -1033,7 +1033,7 @@ class ErrorWidget extends LeafRenderObjectWidget {
} catch (e) { } } catch (e) { }
return 'Error'; return 'Error';
} }
RenderBox createRenderObject() => new RenderErrorBox(message); RenderBox createRenderObject(BuildContext context) => new RenderErrorBox(message);
} }
typedef void BuildScheduler(BuildableElement element); typedef void BuildScheduler(BuildableElement element);
...@@ -1509,7 +1509,7 @@ abstract class RenderObjectElement<T extends RenderObjectWidget> extends Buildab ...@@ -1509,7 +1509,7 @@ abstract class RenderObjectElement<T extends RenderObjectWidget> extends Buildab
void mount(Element parent, dynamic newSlot) { void mount(Element parent, dynamic newSlot) {
super.mount(parent, newSlot); super.mount(parent, newSlot);
_renderObject = widget.createRenderObject(); _renderObject = widget.createRenderObject(this);
assert(() { debugUpdateRenderObjectOwner(); return true; }); assert(() { debugUpdateRenderObjectOwner(); return true; });
assert(_slot == newSlot); assert(_slot == newSlot);
attachRenderObject(newSlot); attachRenderObject(newSlot);
...@@ -1517,11 +1517,10 @@ abstract class RenderObjectElement<T extends RenderObjectWidget> extends Buildab ...@@ -1517,11 +1517,10 @@ abstract class RenderObjectElement<T extends RenderObjectWidget> extends Buildab
} }
void update(T newWidget) { void update(T newWidget) {
T oldWidget = widget;
super.update(newWidget); super.update(newWidget);
assert(widget == newWidget); assert(widget == newWidget);
assert(() { debugUpdateRenderObjectOwner(); return true; }); assert(() { debugUpdateRenderObjectOwner(); return true; });
widget.updateRenderObject(renderObject, oldWidget); widget.updateRenderObject(this, renderObject);
_dirty = false; _dirty = false;
} }
......
...@@ -303,7 +303,7 @@ class RawGestureDetectorState extends State<RawGestureDetector> { ...@@ -303,7 +303,7 @@ class RawGestureDetectorState extends State<RawGestureDetector> {
if (!config.excludeFromSemantics) { if (!config.excludeFromSemantics) {
RenderSemanticsGestureHandler semanticsGestureHandler = context.findRenderObject(); RenderSemanticsGestureHandler semanticsGestureHandler = context.findRenderObject();
context.visitChildElements((RenderObjectElement element) { context.visitChildElements((RenderObjectElement element) {
element.widget.updateRenderObject(semanticsGestureHandler, null); element.widget.updateRenderObject(context, semanticsGestureHandler);
}); });
} }
} }
...@@ -458,13 +458,13 @@ class _GestureSemantics extends OneChildRenderObjectWidget { ...@@ -458,13 +458,13 @@ class _GestureSemantics extends OneChildRenderObjectWidget {
assert(false); assert(false);
} }
RenderSemanticsGestureHandler createRenderObject() { RenderSemanticsGestureHandler createRenderObject(BuildContext context) {
RenderSemanticsGestureHandler result = new RenderSemanticsGestureHandler(); RenderSemanticsGestureHandler result = new RenderSemanticsGestureHandler();
updateRenderObject(result, null); updateRenderObject(context, result);
return result; return result;
} }
void updateRenderObject(RenderSemanticsGestureHandler renderObject, _GestureSemantics oldWidget) { void updateRenderObject(BuildContext context, RenderSemanticsGestureHandler renderObject) {
Map<Type, GestureRecognizer> recognizers = owner._recognizers; Map<Type, GestureRecognizer> recognizers = owner._recognizers;
renderObject renderObject
..onTap = recognizers.containsKey(TapGestureRecognizer) ? _handleTap : null ..onTap = recognizers.containsKey(TapGestureRecognizer) ? _handleTap : null
......
...@@ -37,7 +37,7 @@ class MixedViewport extends RenderObjectWidget { ...@@ -37,7 +37,7 @@ class MixedViewport extends RenderObjectWidget {
// we don't pass constructor arguments to the RenderBlockViewport() because until // we don't pass constructor arguments to the RenderBlockViewport() because until
// we know our children, the constructor arguments we could give have no effect // we know our children, the constructor arguments we could give have no effect
RenderBlockViewport createRenderObject() => new RenderBlockViewport(); RenderBlockViewport createRenderObject(BuildContext context) => new RenderBlockViewport();
_ChangeDescription evaluateChangesFrom(MixedViewport oldWidget) { _ChangeDescription evaluateChangesFrom(MixedViewport oldWidget) {
if (direction != oldWidget.direction || if (direction != oldWidget.direction ||
......
...@@ -242,7 +242,7 @@ class PageViewport extends VirtualViewportFromIterable { ...@@ -242,7 +242,7 @@ class PageViewport extends VirtualViewportFromIterable {
final Painter overlayPainter; final Painter overlayPainter;
final Iterable<Widget> children; final Iterable<Widget> children;
RenderList createRenderObject() => new RenderList(); RenderList createRenderObject(BuildContext context) => new RenderList();
_PageViewportElement createElement() => new _PageViewportElement(this); _PageViewportElement createElement() => new _PageViewportElement(this);
} }
......
...@@ -56,12 +56,12 @@ class PerformanceOverlay extends LeafRenderObjectWidget { ...@@ -56,12 +56,12 @@ class PerformanceOverlay extends LeafRenderObjectWidget {
/// how many frame intervals). /// how many frame intervals).
final int rasterizerThreshold; final int rasterizerThreshold;
RenderPerformanceOverlay createRenderObject() => new RenderPerformanceOverlay( RenderPerformanceOverlay createRenderObject(BuildContext context) => new RenderPerformanceOverlay(
optionsMask: optionsMask, optionsMask: optionsMask,
rasterizerThreshold: rasterizerThreshold rasterizerThreshold: rasterizerThreshold
); );
void updateRenderObject(RenderPerformanceOverlay renderObject, RenderObjectWidget oldWidget) { void updateRenderObject(BuildContext context, RenderPerformanceOverlay renderObject) {
renderObject renderObject
..optionsMask = optionsMask ..optionsMask = optionsMask
..rasterizerThreshold = rasterizerThreshold; ..rasterizerThreshold = rasterizerThreshold;
......
...@@ -80,7 +80,7 @@ class GridViewport extends VirtualViewportFromIterable { ...@@ -80,7 +80,7 @@ class GridViewport extends VirtualViewportFromIterable {
// TODO(abarth): Support horizontal scrolling; // TODO(abarth): Support horizontal scrolling;
Axis get scrollDirection => Axis.vertical; Axis get scrollDirection => Axis.vertical;
RenderGrid createRenderObject() => new RenderGrid(delegate: delegate); RenderGrid createRenderObject(BuildContext context) => new RenderGrid(delegate: delegate);
_GridViewportElement createElement() => new _GridViewportElement(this); _GridViewportElement createElement() => new _GridViewportElement(this);
} }
......
...@@ -140,7 +140,7 @@ class _VirtualListViewport extends VirtualViewport { ...@@ -140,7 +140,7 @@ class _VirtualListViewport extends VirtualViewport {
return scrollOffset - _leadingPadding; return scrollOffset - _leadingPadding;
} }
RenderList createRenderObject() => new RenderList(itemExtent: itemExtent); RenderList createRenderObject(BuildContext context) => new RenderList(itemExtent: itemExtent);
_VirtualListViewportElement createElement() => new _VirtualListViewportElement(this); _VirtualListViewportElement createElement() => new _VirtualListViewportElement(this);
} }
......
...@@ -24,9 +24,9 @@ class SpriteWidget extends OneChildRenderObjectWidget { ...@@ -24,9 +24,9 @@ class SpriteWidget extends OneChildRenderObjectWidget {
/// var mySpriteWidget = new SpriteWidget(mySpriteTree, SpriteBoxTransformMode.fixedHeight); /// var mySpriteWidget = new SpriteWidget(mySpriteTree, SpriteBoxTransformMode.fixedHeight);
SpriteWidget(this.rootNode, [this.transformMode = SpriteBoxTransformMode.letterbox]); SpriteWidget(this.rootNode, [this.transformMode = SpriteBoxTransformMode.letterbox]);
SpriteBox createRenderObject() => new SpriteBox(rootNode, transformMode); SpriteBox createRenderObject(BuildContext context) => new SpriteBox(rootNode, transformMode);
void updateRenderObject(SpriteBox renderObject, SpriteWidget oldWidget) { void updateRenderObject(BuildContext context, SpriteBox renderObject) {
renderObject renderObject
..rootNode = rootNode ..rootNode = rootNode
..transformMode = transformMode; ..transformMode = transformMode;
......
...@@ -57,9 +57,9 @@ class _ChartWrapper extends LeafRenderObjectWidget { ...@@ -57,9 +57,9 @@ class _ChartWrapper extends LeafRenderObjectWidget {
final TextTheme textTheme; final TextTheme textTheme;
final ChartData data; final ChartData data;
_RenderChart createRenderObject() => new _RenderChart(textTheme: textTheme, data: data); _RenderChart createRenderObject(BuildContext context) => new _RenderChart(textTheme: textTheme, data: data);
void updateRenderObject(_RenderChart renderObject, _ChartWrapper oldWidget) { void updateRenderObject(BuildContext context, _RenderChart renderObject) {
renderObject renderObject
..textTheme = textTheme ..textTheme = textTheme
..data = data; ..data = data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment