Add support for measure mode

2016-01-06 16:56:56 +00:00
parent 68e0b0cc58
commit 7bd6b2b7dd
26 changed files with 237 additions and 45 deletions
--- a/src/java/tests/com/facebook/csslayout/LayoutCachingTest.java
+++ b/src/java/tests/com/facebook/csslayout/LayoutCachingTest.java
@@ -223,7 +223,7 @@ public class LayoutCachingTest {

    c1.setMeasureFunction(new CSSNode.MeasureFunction() {
      @Override
-      public void measure(CSSNode node, float width, float height, MeasureOutput measureOutput) {
+      public void measure(CSSNode node, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode, MeasureOutput measureOutput) {
        measureOutput.width = 100;
        measureOutput.height = 20;
      }