From aee2ad5a2841bd102b3f6169ed843e82e40d920a Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Fri, 11 Mar 2016 15:03:42 -0800 Subject: [PATCH] Update engine --- bin/cache/engine.version | 2 +- packages/flutter/lib/src/rendering/child_view.dart | 2 +- packages/flutter/lib/src/rendering/layer.dart | 4 +++- packages/flutter/lib/src/rendering/object.dart | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/cache/engine.version b/bin/cache/engine.version index 3b86491453..793b401223 100644 --- a/bin/cache/engine.version +++ b/bin/cache/engine.version @@ -1 +1 @@ -87de3c265ee01c2747695cd3fd053fd8362967a2 +787e69fc453787089140b3b031ada932d7dad38e diff --git a/packages/flutter/lib/src/rendering/child_view.dart b/packages/flutter/lib/src/rendering/child_view.dart index 4bebb5d7ad..33e5267807 100644 --- a/packages/flutter/lib/src/rendering/child_view.dart +++ b/packages/flutter/lib/src/rendering/child_view.dart @@ -205,7 +205,7 @@ class RenderChildView extends RenderBox { void paint(PaintingContext context, Offset offset) { assert(needsCompositing); if (_layoutInfo != null) - context.pushChildScene(offset, _layoutInfo); + context.pushChildScene(offset, scale, _layoutInfo); } void debugFillDescription(List description) { diff --git a/packages/flutter/lib/src/rendering/layer.dart b/packages/flutter/lib/src/rendering/layer.dart index ce13588ab3..9d3b3c2f53 100644 --- a/packages/flutter/lib/src/rendering/layer.dart +++ b/packages/flutter/lib/src/rendering/layer.dart @@ -108,14 +108,16 @@ class PictureLayer extends Layer { } class ChildSceneLayer extends Layer { - ChildSceneLayer({ this.offset, this.layoutInfo }); + ChildSceneLayer({ this.offset, this.devicePixelRatio, this.layoutInfo }); Offset offset; + double devicePixelRatio; mojom.ViewLayoutInfo layoutInfo; void addToScene(ui.SceneBuilder builder, Offset layerOffset) { builder.addChildScene( offset + layerOffset, + devicePixelRatio, layoutInfo.size.width, layoutInfo.size.height, layoutInfo.sceneToken.value diff --git a/packages/flutter/lib/src/rendering/object.dart b/packages/flutter/lib/src/rendering/object.dart index 00df537f68..e944ac6f01 100644 --- a/packages/flutter/lib/src/rendering/object.dart +++ b/packages/flutter/lib/src/rendering/object.dart @@ -191,9 +191,9 @@ class PaintingContext { )); } - void pushChildScene(Offset offset, mojom.ViewLayoutInfo layoutInfo) { + void pushChildScene(Offset offset, double devicePixelRatio, mojom.ViewLayoutInfo layoutInfo) { _stopRecordingIfNeeded(); - _appendLayer(new ChildSceneLayer(offset: offset, layoutInfo: layoutInfo)); + _appendLayer(new ChildSceneLayer(offset: offset, devicePixelRatio: devicePixelRatio, layoutInfo: layoutInfo)); } /// Push a rectangular clip rect.