mirror of
https://github.com/flutter/flutter
synced 2024-09-20 00:32:02 +00:00
Manual engine roll with fixes: (#26252)
7112b72cc2...e5ec3cf3ea
git log
7112b72cc229e05d36716c3d7739885d3ffa72e6..e5ec3cf3ea5ce78c6c3116271601f60d30a799d4
--no-merges --oneline
e5ec3cf3e Dart SDK roll for 2019-01-08
08c95d27a Roll src/third_party/skia 55ff5d3ba881..1337f5b85978 (10
commits) (flutter/engine#7407)
e385f5cbb Roll src/third_party/skia 26d173fee72b..55ff5d3ba881 (12
commits) (flutter/engine#7406)
0f8273b0c Dart SDK roll for 2019-01-07
4036b260a Reset ParagraphBuilder after build() (flutter/engine#7401)
4820cbec4 Dart SDK roll for 2019-01-07
8eccb860d Add onStart hook to FlutterFragmentActivity
(flutter/engine#6719)
f2ea838b3 Roll src/third_party/skia b2fdcbf3033f..26d173fee72b (10
commits) (flutter/engine#7400)
5ca8aadaa Announce in/out of list (flutter/engine#6918)
4487d392d Replace Java code with equivalent, more concise code.
(flutter/engine#7398)
395b7852d Roll src/third_party/skia 46ee3f7a8ff5..b2fdcbf3033f (11
commits) (flutter/engine#7394)
5965f9084 Make `ParagraphConstraints` have const constructor
(flutter/engine#7346)
e02dd416a Roll src/third_party/skia a47eb455360f..46ee3f7a8ff5 (2
commits) (flutter/engine#7390)
f0038b3cc Roll src/third_party/skia 3ac3a4053f86..a47eb455360f (2
commits) (flutter/engine#7389)
This commit is contained in:
parent
094edf61db
commit
6412f35c5e
|
@ -1 +1 @@
|
|||
7112b72cc229e05d36716c3d7739885d3ffa72e6
|
||||
e5ec3cf3ea5ce78c6c3116271601f60d30a799d4
|
||||
|
|
|
@ -84,7 +84,7 @@ void main() {
|
|||
// Next, we supply a width that the text is permitted to occupy and we ask
|
||||
// the paragraph to the visual position of each its glyphs as well as its
|
||||
// overall size, subject to its sizing constraints.
|
||||
..layout(ui.ParagraphConstraints(width: 180.0));
|
||||
..layout(const ui.ParagraphConstraints(width: 180.0));
|
||||
|
||||
// Finally, we register our beginFrame callback and kick off the first frame.
|
||||
ui.window.onBeginFrame = beginFrame;
|
||||
|
|
|
@ -242,7 +242,7 @@ class TextPainter {
|
|||
builder.pushStyle(text.style.getTextStyle(textScaleFactor: textScaleFactor));
|
||||
builder.addText(' ');
|
||||
_layoutTemplate = builder.build()
|
||||
..layout(ui.ParagraphConstraints(width: double.infinity));
|
||||
..layout(const ui.ParagraphConstraints(width: double.infinity));
|
||||
}
|
||||
return _layoutTemplate.height;
|
||||
}
|
||||
|
|
|
@ -13,7 +13,7 @@ void main() {
|
|||
final Paragraph paragraph = builder.build();
|
||||
expect(paragraph, isNotNull);
|
||||
|
||||
paragraph.layout(ParagraphConstraints(width: 800.0));
|
||||
paragraph.layout(const ParagraphConstraints(width: 800.0));
|
||||
expect(paragraph.width, isNonZero);
|
||||
expect(paragraph.height, isNonZero);
|
||||
});
|
||||
|
|
|
@ -20,7 +20,7 @@ void main() {
|
|||
));
|
||||
builder.addText('Test');
|
||||
final Paragraph paragraph = builder.build();
|
||||
paragraph.layout(ParagraphConstraints(width: 400.0));
|
||||
paragraph.layout(const ParagraphConstraints(width: 400.0));
|
||||
|
||||
expect(paragraph.height, closeTo(fontSize, 0.001));
|
||||
expect(paragraph.width, closeTo(400.0, 0.001));
|
||||
|
|
Loading…
Reference in a new issue