firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2630 from abarth/rev_engine

Browse Source 
Update engine
This commit is contained in:
Adam Barth 2016-03-11 15:22:41 -08:00
commit 91bcf66389
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cache/engine.version vendored
View File

@ -1 +1 @@
87de3c265ee01c2747695cd3fd053fd8362967a2 787e69fc453787089140b3b031ada932d7dad38e

2
packages/flutter/lib/src/rendering/child_view.dart
View File

@ -205,7 +205,7 @@ class RenderChildView extends RenderBox {
void paint(PaintingContext context, Offset offset) { void paint(PaintingContext context, Offset offset) {
assert(needsCompositing); assert(needsCompositing);
if (_layoutInfo != null) if (_layoutInfo != null)
context.pushChildScene(offset, _layoutInfo); context.pushChildScene(offset, scale, _layoutInfo);
} }
void debugFillDescription(List<String> description) { void debugFillDescription(List<String> description) {

4
packages/flutter/lib/src/rendering/layer.dart
View File

@ -108,14 +108,16 @@ class PictureLayer extends Layer {
} }
class ChildSceneLayer extends Layer { class ChildSceneLayer extends Layer {
ChildSceneLayer({ this.offset, this.layoutInfo }); ChildSceneLayer({ this.offset, this.devicePixelRatio, this.layoutInfo });
Offset offset; Offset offset;
double devicePixelRatio;
mojom.ViewLayoutInfo layoutInfo; mojom.ViewLayoutInfo layoutInfo;
void addToScene(ui.SceneBuilder builder, Offset layerOffset) { void addToScene(ui.SceneBuilder builder, Offset layerOffset) {
builder.addChildScene( builder.addChildScene(
offset + layerOffset, offset + layerOffset,
devicePixelRatio,
layoutInfo.size.width, layoutInfo.size.width,
layoutInfo.size.height, layoutInfo.size.height,
layoutInfo.sceneToken.value layoutInfo.sceneToken.value

4
packages/flutter/lib/src/rendering/object.dart
View File

@ -191,9 +191,9 @@ class PaintingContext {
)); ));
} }
void pushChildScene(Offset offset, mojom.ViewLayoutInfo layoutInfo) { void pushChildScene(Offset offset, double devicePixelRatio, mojom.ViewLayoutInfo layoutInfo) {
_stopRecordingIfNeeded(); _stopRecordingIfNeeded();
_appendLayer(new ChildSceneLayer(offset: offset, layoutInfo: layoutInfo)); _appendLayer(new ChildSceneLayer(offset: offset, devicePixelRatio: devicePixelRatio, layoutInfo: layoutInfo));
} }
/// Push a rectangular clip rect. /// Push a rectangular clip rect.