From f5d736743cb38444d915372cfbe77391f6599453 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Tue, 9 Jun 2015 14:07:17 -0700
Subject: [PATCH] Fix the Sky tests

Instead of triggering layout synchronously during AppView construction, we now
schedule the initial layout using a magic bootstrapping function.

TBR=ianh@google.com

Review URL: https://codereview.chromium.org/1172123003.
---
 engine/src/flutter/tests/raw/padding_deflate.dart | 6 +++++-
 engine/src/flutter/tests/raw/render_box.dart      | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/engine/src/flutter/tests/raw/padding_deflate.dart b/engine/src/flutter/tests/raw/padding_deflate.dart
index e1996d87640..091db772f8e 100644
--- a/engine/src/flutter/tests/raw/padding_deflate.dart
+++ b/engine/src/flutter/tests/raw/padding_deflate.dart
@@ -7,6 +7,7 @@ import '../resources/third_party/unittest/unittest.dart';
 import '../resources/unit.dart';
 import '../resources/display_list.dart';
 import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/object.dart';
 
 void main() {
   initUnit();
@@ -22,7 +23,10 @@ void main() {
       child: paddingBox
     );
     TestView renderView = new TestView(child: root);
-    renderView.layout(new ViewConstraints(width: sky.view.width, height: sky.view.height));
+    renderView.attach();
+    renderView.rootConstraints = new ViewConstraints(width: sky.view.width, height: sky.view.height);
+    renderView.scheduleInitialLayout();
+    RenderObject.flushLayout();
     expect(coloredBox.size.width, equals(sky.view.width - 20));
     expect(coloredBox.size.height, equals(sky.view.height - 20));
   });
diff --git a/engine/src/flutter/tests/raw/render_box.dart b/engine/src/flutter/tests/raw/render_box.dart
index 111beb41a42..25ff3bb8d79 100644
--- a/engine/src/flutter/tests/raw/render_box.dart
+++ b/engine/src/flutter/tests/raw/render_box.dart
@@ -7,6 +7,7 @@ import '../resources/unit.dart';
 import '../resources/display_list.dart';
 import 'dart:sky' as sky;
 import 'package:sky/framework/rendering/box.dart';
+import 'package:sky/framework/rendering/object.dart';
 
 void main() {
   initUnit();
@@ -18,7 +19,10 @@ void main() {
       )
     );
     TestView renderView = new TestView(child: root);
-    renderView.layout(new ViewConstraints(width: sky.view.width, height: sky.view.height));
+    renderView.attach();
+    renderView.rootConstraints = new ViewConstraints(width: sky.view.width, height: sky.view.height);
+    renderView.scheduleInitialLayout();
+    RenderObject.flushLayout();
     expect(root.size.width, equals(sky.view.width));
     expect(root.size.height, equals(sky.view.height));
     renderView.paintFrame();