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
05bcbb6c
Commit
05bcbb6c
authored
Jun 28, 2016
by
Phil Quitslund
Committed by
GitHub
Jun 28, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4785 from pq/empty_statement_cleanup
Cleanup empty statements.
parents
fbab25be
543f705a
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
13 deletions
+17
-13
box_painter.dart
packages/flutter/lib/src/painting/box_painter.dart
+8
-4
flow.dart
packages/flutter/lib/src/rendering/flow.dart
+1
-1
object.dart
packages/flutter/lib/src/rendering/object.dart
+1
-1
basic.dart
packages/flutter/lib/src/widgets/basic.dart
+2
-2
lazy_block_viewport_test.dart
packages/flutter/test/widget/lazy_block_viewport_test.dart
+1
-1
set_state_2_test.dart
packages/flutter/test/widget/set_state_2_test.dart
+1
-1
node_test.dart
packages/flutter_sprites/test/node_test.dart
+1
-1
build_apk.dart
packages/flutter_tools/lib/src/commands/build_apk.dart
+1
-1
simulators.dart
packages/flutter_tools/lib/src/ios/simulators.dart
+1
-1
No files found.
packages/flutter/lib/src/painting/box_painter.dart
View file @
05bcbb6c
...
@@ -272,7 +272,8 @@ class Border {
...
@@ -272,7 +272,8 @@ class Border {
}
}
canvas
.
drawPath
(
path
,
paint
);
canvas
.
drawPath
(
path
,
paint
);
break
;
break
;
case
BorderStyle
.
none
:
;
case
BorderStyle
.
none
:
break
;
}
}
switch
(
right
.
style
)
{
switch
(
right
.
style
)
{
...
@@ -290,7 +291,8 @@ class Border {
...
@@ -290,7 +291,8 @@ class Border {
}
}
canvas
.
drawPath
(
path
,
paint
);
canvas
.
drawPath
(
path
,
paint
);
break
;
break
;
case
BorderStyle
.
none
:
;
case
BorderStyle
.
none
:
break
;
}
}
switch
(
bottom
.
style
)
{
switch
(
bottom
.
style
)
{
...
@@ -308,7 +310,8 @@ class Border {
...
@@ -308,7 +310,8 @@ class Border {
}
}
canvas
.
drawPath
(
path
,
paint
);
canvas
.
drawPath
(
path
,
paint
);
break
;
break
;
case
BorderStyle
.
none
:
;
case
BorderStyle
.
none
:
break
;
}
}
switch
(
left
.
style
)
{
switch
(
left
.
style
)
{
...
@@ -326,7 +329,8 @@ class Border {
...
@@ -326,7 +329,8 @@ class Border {
}
}
canvas
.
drawPath
(
path
,
paint
);
canvas
.
drawPath
(
path
,
paint
);
break
;
break
;
case
BorderStyle
.
none
:
;
case
BorderStyle
.
none
:
break
;
}
}
}
}
...
...
packages/flutter/lib/src/rendering/flow.dart
View file @
05bcbb6c
...
@@ -335,7 +335,7 @@ class RenderFlow extends RenderBox
...
@@ -335,7 +335,7 @@ class RenderFlow extends RenderBox
void
painter
(
PaintingContext
context
,
Offset
offset
)
{
void
painter
(
PaintingContext
context
,
Offset
offset
)
{
context
.
paintChild
(
child
,
offset
);
context
.
paintChild
(
child
,
offset
);
}
;
}
if
(
opacity
==
1.0
)
{
if
(
opacity
==
1.0
)
{
_paintingContext
.
pushTransform
(
needsCompositing
,
_paintingOffset
,
transform
,
painter
);
_paintingContext
.
pushTransform
(
needsCompositing
,
_paintingOffset
,
transform
,
painter
);
}
else
{
}
else
{
...
...
packages/flutter/lib/src/rendering/object.dart
View file @
05bcbb6c
...
@@ -871,7 +871,7 @@ class PipelineOwner {
...
@@ -871,7 +871,7 @@ class PipelineOwner {
for
(
RenderObject
node
in
dirtyNodes
..
sort
((
RenderObject
a
,
RenderObject
b
)
=>
b
.
depth
-
a
.
depth
))
{
for
(
RenderObject
node
in
dirtyNodes
..
sort
((
RenderObject
a
,
RenderObject
b
)
=>
b
.
depth
-
a
.
depth
))
{
if
(
node
.
_needsPaint
&&
node
.
owner
==
this
)
if
(
node
.
_needsPaint
&&
node
.
owner
==
this
)
PaintingContext
.
repaintCompositedChild
(
node
);
PaintingContext
.
repaintCompositedChild
(
node
);
}
;
}
assert
(
_nodesNeedingPaint
.
length
==
0
);
assert
(
_nodesNeedingPaint
.
length
==
0
);
}
finally
{
}
finally
{
_debugDoingPaint
=
false
;
_debugDoingPaint
=
false
;
...
...
packages/flutter/lib/src/widgets/basic.dart
View file @
05bcbb6c
...
@@ -2756,9 +2756,9 @@ class Semantics extends SingleChildRenderObjectWidget {
...
@@ -2756,9 +2756,9 @@ class Semantics extends SingleChildRenderObjectWidget {
void
debugFillDescription
(
List
<
String
>
description
)
{
void
debugFillDescription
(
List
<
String
>
description
)
{
super
.
debugFillDescription
(
description
);
super
.
debugFillDescription
(
description
);
description
.
add
(
'container:
$container
'
);
description
.
add
(
'container:
$container
'
);
if
(
checked
!=
null
)
;
if
(
checked
!=
null
)
description
.
add
(
'checked:
$checked
'
);
description
.
add
(
'checked:
$checked
'
);
if
(
label
!=
null
)
;
if
(
label
!=
null
)
description
.
add
(
'label: "
$label
"'
);
description
.
add
(
'label: "
$label
"'
);
}
}
}
}
...
...
packages/flutter/test/widget/lazy_block_viewport_test.dart
View file @
05bcbb6c
...
@@ -170,7 +170,7 @@ void main() {
...
@@ -170,7 +170,7 @@ void main() {
void
collectText
(
Widget
widget
)
{
void
collectText
(
Widget
widget
)
{
if
(
widget
is
Text
)
if
(
widget
is
Text
)
text
.
add
(
widget
.
data
);
text
.
add
(
widget
.
data
);
}
;
}
Widget
builder
()
{
Widget
builder
()
{
return
new
LazyBlockViewport
(
return
new
LazyBlockViewport
(
...
...
packages/flutter/test/widget/set_state_2_test.dart
View file @
05bcbb6c
...
@@ -39,7 +39,7 @@ void main() {
...
@@ -39,7 +39,7 @@ void main() {
}
}
));
));
log
.
add
(
'---'
);
log
.
add
(
'---'
);
await
tester
.
tap
(
find
.
text
(
'inner'
));
;
await
tester
.
tap
(
find
.
text
(
'inner'
));
await
tester
.
pump
();
await
tester
.
pump
();
log
.
add
(
'---'
);
log
.
add
(
'---'
);
expect
(
log
,
equals
(<
String
>[
expect
(
log
,
equals
(<
String
>[
...
...
packages/flutter_sprites/test/node_test.dart
View file @
05bcbb6c
...
@@ -167,7 +167,7 @@ void main() {
...
@@ -167,7 +167,7 @@ void main() {
{
{
Node
rootNode
=
new
Node
();
Node
rootNode
=
new
Node
();
Node
node0
=
new
Node
()..
zPosition
=
-
1.0
;
;
Node
node0
=
new
Node
()..
zPosition
=
-
1.0
;
Node
node1
=
new
Node
();
Node
node1
=
new
Node
();
Node
node2
=
new
Node
()..
zPosition
=
1.0
;
Node
node2
=
new
Node
()..
zPosition
=
1.0
;
...
...
packages/flutter_tools/lib/src/commands/build_apk.dart
View file @
05bcbb6c
...
@@ -461,7 +461,7 @@ Future<int> buildAndroid(
...
@@ -461,7 +461,7 @@ Future<int> buildAndroid(
String
targetPath
=
entity
.
path
.
substring
(
assetsDir
.
path
.
length
);
String
targetPath
=
entity
.
path
.
substring
(
assetsDir
.
path
.
length
);
extraFiles
[
"assets/
$targetPath
"
]
=
entity
;
extraFiles
[
"assets/
$targetPath
"
]
=
entity
;
}
}
}
;
}
}
}
// In debug (JIT) mode, the snapshot lives in the FLX, and we can skip the APK
// In debug (JIT) mode, the snapshot lives in the FLX, and we can skip the APK
...
...
packages/flutter_tools/lib/src/ios/simulators.dart
View file @
05bcbb6c
...
@@ -660,7 +660,7 @@ class IOSSimulator extends Device {
...
@@ -660,7 +660,7 @@ class IOSSimulator extends Device {
String
name
=
path
.
basename
(
entity
.
path
);
String
name
=
path
.
basename
(
entity
.
path
);
return
entity
is
File
&&
name
.
startsWith
(
'Simulator'
)
&&
name
.
endsWith
(
'.png'
);
return
entity
is
File
&&
name
.
startsWith
(
'Simulator'
)
&&
name
.
endsWith
(
'.png'
);
}));
}));
}
;
}
Set
<
File
>
existingScreenshots
=
getScreenshots
();
Set
<
File
>
existingScreenshots
=
getScreenshots
();
...
...
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