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
4e3e40a1
Commit
4e3e40a1
authored
Jun 09, 2016
by
Adam Barth
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename relayoutSubtreeRoot -> relayoutBoundary (#4483)
Fixes #4425
parent
afe3158d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
24 deletions
+24
-24
object.dart
packages/flutter/lib/src/rendering/object.dart
+24
-24
No files found.
packages/flutter/lib/src/rendering/object.dart
View file @
4e3e40a1
...
...
@@ -1017,7 +1017,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert
(
_debugCanPerformMutations
);
assert
(
child
!=
null
);
assert
(
child
.
parentData
!=
null
);
child
.
_cleanRelayout
SubtreeRoot
();
child
.
_cleanRelayout
Boundary
();
child
.
parentData
.
detach
();
child
.
parentData
=
null
;
super
.
dropChild
(
child
);
...
...
@@ -1145,7 +1145,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
super
.
attach
(
owner
);
// If the node was dirtied in some way while unattached, make sure to add
// it to the appropriate dirty list now that an owner is available
if
(
_needsLayout
&&
_relayout
SubtreeRoot
!=
null
)
{
if
(
_needsLayout
&&
_relayout
Boundary
!=
null
)
{
// Don't enter this block if we've never laid out at all;
// scheduleInitialLayout() will handle it
_needsLayout
=
false
;
...
...
@@ -1173,7 +1173,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
bool
get
needsLayout
=>
_needsLayout
;
bool
_needsLayout
=
true
;
RenderObject
_relayout
SubtreeRoot
;
RenderObject
_relayout
Boundary
;
bool
_doingThisLayoutWithCallback
=
false
;
/// The layout constraints most recently supplied by the parent.
...
...
@@ -1200,17 +1200,17 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
/// release mode (where it will always be false).
static
bool
debugCheckingIntrinsics
=
false
;
bool
_debugSubtreeRelayoutRootAlreadyMarkedNeedsLayout
()
{
if
(
_relayout
SubtreeRoot
==
null
)
if
(
_relayout
Boundary
==
null
)
return
true
;
// we haven't yet done layout even once, so there's nothing for us to do
RenderObject
node
=
this
;
while
(
node
!=
_relayout
SubtreeRoot
)
{
assert
(
node
.
_relayout
SubtreeRoot
==
_relayoutSubtreeRoot
);
while
(
node
!=
_relayout
Boundary
)
{
assert
(
node
.
_relayout
Boundary
==
_relayoutBoundary
);
assert
(
node
.
parent
!=
null
);
node
=
node
.
parent
;
if
((!
node
.
_needsLayout
)
&&
(!
node
.
_debugDoingThisLayout
))
return
false
;
}
assert
(
node
.
_relayout
SubtreeRoot
==
node
);
assert
(
node
.
_relayout
Boundary
==
node
);
return
true
;
}
...
...
@@ -1254,8 +1254,8 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert
(
_debugSubtreeRelayoutRootAlreadyMarkedNeedsLayout
());
return
;
}
assert
(
_relayout
SubtreeRoot
!=
null
);
if
(
_relayout
SubtreeRoot
!=
this
)
{
assert
(
_relayout
Boundary
!=
null
);
if
(
_relayout
Boundary
!=
this
)
{
markParentNeedsLayout
();
}
else
{
_needsLayout
=
true
;
...
...
@@ -1291,12 +1291,12 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert
(
parent
==
this
.
parent
);
}
void
_cleanRelayout
SubtreeRoot
()
{
if
(
_relayout
SubtreeRoot
!=
this
)
{
_relayout
SubtreeRoot
=
null
;
void
_cleanRelayout
Boundary
()
{
if
(
_relayout
Boundary
!=
this
)
{
_relayout
Boundary
=
null
;
_needsLayout
=
true
;
visitChildren
((
RenderObject
child
)
{
child
.
_cleanRelayout
SubtreeRoot
();
child
.
_cleanRelayout
Boundary
();
});
}
}
...
...
@@ -1311,8 +1311,8 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert
(
attached
);
assert
(
parent
is
!
RenderObject
);
assert
(!
owner
.
_debugDoingLayout
);
assert
(
_relayout
SubtreeRoot
==
null
);
_relayout
SubtreeRoot
=
this
;
assert
(
_relayout
Boundary
==
null
);
_relayout
Boundary
=
this
;
assert
(()
{
_debugCanParentUseSize
=
false
;
return
true
;
...
...
@@ -1321,7 +1321,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
}
void
_layoutWithoutResize
()
{
assert
(
_relayout
SubtreeRoot
==
this
);
assert
(
_relayout
Boundary
==
this
);
RenderObject
debugPreviousActiveLayout
;
assert
(!
_debugMutationsLocked
);
assert
(!
_doingThisLayoutWithCallback
);
...
...
@@ -1404,17 +1404,17 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
assert
(!
_debugDoingThisResize
);
assert
(!
_debugDoingThisLayout
);
final
RenderObject
parent
=
this
.
parent
;
RenderObject
relayout
SubtreeRoot
;
RenderObject
relayout
Boundary
;
if
(!
parentUsesSize
||
sizedByParent
||
constraints
.
isTight
||
parent
is
!
RenderObject
)
relayout
SubtreeRoot
=
this
;
relayout
Boundary
=
this
;
else
relayout
SubtreeRoot
=
parent
.
_relayoutSubtreeRoot
;
relayout
Boundary
=
parent
.
_relayoutBoundary
;
assert
(
parent
==
this
.
parent
);
assert
(()
{
_debugCanParentUseSize
=
parentUsesSize
;
return
true
;
});
if
(!
needsLayout
&&
constraints
==
_constraints
&&
relayout
SubtreeRoot
==
_relayoutSubtreeRoot
)
{
if
(!
needsLayout
&&
constraints
==
_constraints
&&
relayout
Boundary
==
_relayoutBoundary
)
{
assert
(()
{
// in case parentUsesSize changed since the last invocation, set size
// to itself, so it has the right internal debug values.
...
...
@@ -1431,7 +1431,7 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
return
;
}
_constraints
=
constraints
;
_relayout
SubtreeRoot
=
relayoutSubtreeRoot
;
_relayout
Boundary
=
relayoutBoundary
;
assert
(!
_debugMutationsLocked
);
assert
(!
_doingThisLayoutWithCallback
);
assert
(()
{
...
...
@@ -2087,14 +2087,14 @@ abstract class RenderObject extends AbstractNode implements HitTestTarget {
@override
String
toString
()
{
String
header
=
'
$runtimeType
'
;
if
(
_relayout
SubtreeRoot
!=
null
&&
_relayoutSubtreeRoot
!=
this
)
{
if
(
_relayout
Boundary
!=
null
&&
_relayoutBoundary
!=
this
)
{
int
count
=
1
;
RenderObject
target
=
parent
;
while
(
target
!=
null
&&
target
!=
_relayout
SubtreeRoot
)
{
while
(
target
!=
null
&&
target
!=
_relayout
Boundary
)
{
target
=
target
.
parent
;
count
+=
1
;
}
header
+=
' relayout
SubtreeRoot
=up
$count
'
;
header
+=
' relayout
Boundary
=up
$count
'
;
}
if
(
_needsLayout
)
header
+=
' NEEDS-LAYOUT'
;
...
...
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