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
f03b0070
Unverified
Commit
f03b0070
authored
Nov 03, 2018
by
Yegor
Committed by
GitHub
Nov 03, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code readability: fix awkward variable shadowing (#23886)
parent
dd30efa1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
object.dart
packages/flutter/lib/src/rendering/object.dart
+3
-3
semantics_tester.dart
packages/flutter/test/widgets/semantics_tester.dart
+2
-2
No files found.
packages/flutter/lib/src/rendering/object.dart
View file @
f03b0070
...
...
@@ -2414,17 +2414,17 @@ abstract class RenderObject extends AbstractNode with DiagnosticableTreeMixin im
final
bool
childrenMergeIntoParent
=
mergeIntoParent
||
config
.
isMergingSemanticsOfDescendants
;
visitChildrenForSemantics
((
RenderObject
renderChild
)
{
final
_SemanticsFragment
f
ragment
=
renderChild
.
_getSemanticsForParent
(
final
_SemanticsFragment
parentF
ragment
=
renderChild
.
_getSemanticsForParent
(
mergeIntoParent:
childrenMergeIntoParent
,
);
if
(
f
ragment
.
dropsSemanticsOfPreviousSiblings
)
{
if
(
parentF
ragment
.
dropsSemanticsOfPreviousSiblings
)
{
fragments
.
clear
();
toBeMarkedExplicit
.
clear
();
if
(!
config
.
isSemanticBoundary
)
dropSemanticsOfPreviousSiblings
=
true
;
}
// Figure out which child fragments are to be made explicit.
for
(
_InterestingSemanticsFragment
fragment
in
f
ragment
.
interestingFragments
)
{
for
(
_InterestingSemanticsFragment
fragment
in
parentF
ragment
.
interestingFragments
)
{
fragments
.
add
(
fragment
);
fragment
.
addAncestor
(
this
);
fragment
.
addTags
(
config
.
tagsForChildren
);
...
...
packages/flutter/test/widgets/semantics_tester.dart
View file @
f03b0070
...
...
@@ -296,10 +296,10 @@ class TestSemantics {
return
true
;
bool
result
=
true
;
final
Iterator
<
TestSemantics
>
it
=
children
.
iterator
;
for
(
final
SemanticsNode
node
in
node
.
debugListChildrenInOrder
(
childOrder
))
{
for
(
final
SemanticsNode
child
in
node
.
debugListChildrenInOrder
(
childOrder
))
{
it
.
moveNext
();
final
bool
childMatches
=
it
.
current
.
_matches
(
node
,
child
,
matchState
,
ignoreRect:
ignoreRect
,
ignoreTransform:
ignoreTransform
,
...
...
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