From 08dbc60abd3a6da27591df1792d5e7b287702032 Mon Sep 17 00:00:00 2001
From: Ojan Vafai <ojan@chromium.org>
Date: Mon, 6 Apr 2015 12:53:35 -0700
Subject: [PATCH] Make custom layout actually work.

-Temporarily add setting override width as well so that we correctly bypass in RenderBox::computeLogicalWidth.
-Add setNeedsLayout so that the author code can force layouts (e.g. when the container's width changes).
-Have setLayoutManager force a reattach of the element if it's renderer wasn't a custom layout one before.
-Remove the laying out of children from RenderCustomLayout::layout. This is the job of the author code.
-Add a test case.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/1055263002
---
 .../flutter/tests/layout/custom-expected.txt  |  6 ++
 engine/src/flutter/tests/layout/custom.sky    | 85 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 engine/src/flutter/tests/layout/custom-expected.txt
 create mode 100644 engine/src/flutter/tests/layout/custom.sky

diff --git a/engine/src/flutter/tests/layout/custom-expected.txt b/engine/src/flutter/tests/layout/custom-expected.txt
new file mode 100644
index 00000000000..6b56ff06943
--- /dev/null
+++ b/engine/src/flutter/tests/layout/custom-expected.txt
@@ -0,0 +1,6 @@
+CONSOLE: unittest-suite-wait-for-done
+CONSOLE: PASS: should have the right sizes after layout
+CONSOLE: 
+CONSOLE: All 1 tests passed.
+CONSOLE: unittest-suite-success
+DONE
diff --git a/engine/src/flutter/tests/layout/custom.sky b/engine/src/flutter/tests/layout/custom.sky
new file mode 100644
index 00000000000..fc7399930e3
--- /dev/null
+++ b/engine/src/flutter/tests/layout/custom.sky
@@ -0,0 +1,85 @@
+<parent style='background-color: lightblue;'>
+  <child style='background-color: pink;'>
+    <grandchild style='background-color: red; width: 25px; height: 25px;'></grandchild>
+  </child>
+  <child2 style='background-color: salmon; height: 25px;' />
+</parent>
+
+<script>
+import "../resources/third_party/unittest/unittest.dart";
+import "../resources/unit.dart";
+
+import 'dart:async';
+import 'dart:sky';
+
+void main() {
+  initUnit();
+
+  var first = true;
+
+  var parent = document.querySelector('parent');
+  var firstChild = parent.firstElementChild;
+  var secondChild = parent.lastElementChild;
+
+  parent.setLayoutManager(() {
+    if (first) {
+      first = false;
+      parent.width = 200.0;
+    } else {
+      parent.width = 150.0;
+    }
+
+    firstChild.width = 100.0;
+    firstChild.layout();
+    firstChild.x = 100.0;
+    firstChild.y = 50.0;
+    firstChild.height = 50.0;
+
+    // The second element correctly gets it's width from it's container.
+    // TODO(ojan): Change the layout method to take in availableWidth
+    // so code doesn't need to mess with setNeedsLayout dirty bits
+    // in the middle of layout and so the parent and child don't need
+    // to coordinate as much about expectations.
+    secondChild.setNeedsLayout();
+    secondChild.layout();
+
+    parent.height = 100.0;
+  });
+
+  void assertNonChangingValues() {
+    expect(parent.offsetHeight, equals(100));
+    expect(parent.offsetTop, equals(0));
+    expect(parent.offsetLeft, equals(0));
+
+    expect(firstChild.offsetWidth, equals(100));
+    expect(firstChild.offsetHeight, equals(50));
+    expect(firstChild.offsetTop, equals(50));
+    expect(firstChild.offsetLeft, equals(100));
+
+    expect(secondChild.offsetHeight, equals(25));
+    expect(secondChild.offsetTop, equals(0));
+    expect(secondChild.offsetLeft, equals(0));
+  };
+
+  test("should have the right sizes after layout", () {
+    Completer completer = new Completer();
+
+    window.requestAnimationFrame((_) {
+      expect(parent.offsetWidth, equals(200));
+      expect(secondChild.offsetWidth, equals(200));
+      assertNonChangingValues();
+
+      parent.setNeedsLayout();
+
+      window.requestAnimationFrame((_) {
+        expect(parent.offsetWidth, equals(150));
+        expect(secondChild.offsetWidth, equals(150));
+        assertNonChangingValues();
+        completer.complete();
+      });
+    });
+
+    return completer.future;
+  });
+}
+</script>