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
bb4afb04
Commit
bb4afb04
authored
May 10, 2018
by
Zachary Anderson
Committed by
Todd Volkert
May 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Roll engine to 37e20af6a324cd4cfa1324b8c644712ef8224359 (#17481)
parent
33dd44bc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
engine.version
bin/internal/engine.version
+1
-1
text_style_test.dart
packages/flutter/test/painting/text_style_test.dart
+4
-4
vmservice.dart
packages/flutter_tools/lib/src/vmservice.dart
+1
-1
No files found.
bin/internal/engine.version
View file @
bb4afb04
11d6da3cd9b9449a0d56c068193f9a0addf89e33
37e20af6a324cd4cfa1324b8c644712ef8224359
packages/flutter/test/painting/text_style_test.dart
View file @
bb4afb04
...
...
@@ -163,10 +163,10 @@ void main() {
final
ui
.
TextStyle
ts5
=
s5
.
getTextStyle
();
expect
(
ts5
,
equals
(
new
ui
.
TextStyle
(
fontWeight:
FontWeight
.
w700
,
fontSize:
12.0
,
height:
123.0
)));
expect
(
ts5
.
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontSize: 12.0, letterSpacing: unspecified, wordSpacing: unspecified, height: 123.0x, locale: unspecified)'
);
expect
(
ts5
.
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: FontWeight.w700, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontSize: 12.0, letterSpacing: unspecified, wordSpacing: unspecified, height: 123.0x, locale: unspecified
, background: unspecified
)'
);
final
ui
.
TextStyle
ts2
=
s2
.
getTextStyle
();
expect
(
ts2
,
equals
(
new
ui
.
TextStyle
(
color:
const
Color
(
0xFF00FF00
),
fontWeight:
FontWeight
.
w800
,
fontSize:
10.0
,
height:
100.0
)));
expect
(
ts2
.
toString
(),
'TextStyle(color: Color(0xff00ff00), decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: FontWeight.w800, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontSize: 10.0, letterSpacing: unspecified, wordSpacing: unspecified, height: 100.0x, locale: unspecified)'
);
expect
(
ts2
.
toString
(),
'TextStyle(color: Color(0xff00ff00), decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: FontWeight.w800, fontStyle: unspecified, textBaseline: unspecified, fontFamily: unspecified, fontSize: 10.0, letterSpacing: unspecified, wordSpacing: unspecified, height: 100.0x, locale: unspecified
, background: unspecified
)'
);
final
ui
.
ParagraphStyle
ps2
=
s2
.
getParagraphStyle
(
textAlign:
TextAlign
.
center
);
expect
(
ps2
,
equals
(
new
ui
.
ParagraphStyle
(
textAlign:
TextAlign
.
center
,
fontWeight:
FontWeight
.
w800
,
fontSize:
10.0
,
lineHeight:
100.0
)));
...
...
@@ -189,11 +189,11 @@ void main() {
test
(
'TextStyle using package font'
,
()
{
const
TextStyle
s6
=
const
TextStyle
(
fontFamily:
'test'
);
expect
(
s6
.
fontFamily
,
'test'
);
expect
(
s6
.
getTextStyle
().
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: test, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: unspecified, locale: unspecified)'
);
expect
(
s6
.
getTextStyle
().
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: test, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: unspecified, locale: unspecified
, background: unspecified
)'
);
const
TextStyle
s7
=
const
TextStyle
(
fontFamily:
'test'
,
package:
'p'
);
expect
(
s7
.
fontFamily
,
'packages/p/test'
);
expect
(
s7
.
getTextStyle
().
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: packages/p/test, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: unspecified, locale: unspecified)'
);
expect
(
s7
.
getTextStyle
().
toString
(),
'TextStyle(color: unspecified, decoration: unspecified, decorationColor: unspecified, decorationStyle: unspecified, fontWeight: unspecified, fontStyle: unspecified, textBaseline: unspecified, fontFamily: packages/p/test, fontSize: unspecified, letterSpacing: unspecified, wordSpacing: unspecified, height: unspecified, locale: unspecified
, background: unspecified
)'
);
});
test
(
'TextStyle.debugLabel'
,
()
{
...
...
packages/flutter_tools/lib/src/vmservice.dart
View file @
bb4afb04
...
...
@@ -1344,7 +1344,7 @@ class ServiceMap extends ServiceObject implements Map<String, dynamic> {
@override
void
updateAll
(
dynamic
update
(
String
key
,
dynamic
value
))
=>
_map
.
updateAll
(
update
);
@override
Map
<
RK
,
RV
>
retype
<
RK
,
RV
>()
=>
_map
.
retype
<
RK
,
RV
>();
Map
<
RK
,
RV
>
retype
<
RK
,
RV
>()
=>
_map
.
retype
<
RK
,
RV
>();
// ignore: deprecated_member_use
@override
dynamic
update
(
String
key
,
dynamic
update
(
dynamic
value
),
{
dynamic
ifAbsent
()})
=>
_map
.
update
(
key
,
update
,
ifAbsent:
ifAbsent
);
}
...
...
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