From 0d042c2ef4159578b5daf34a3154ab5379bfec04 Mon Sep 17 00:00:00 2001 From: Martin Kralik Date: Tue, 15 Dec 2015 04:48:45 -0800 Subject: [PATCH] updated css-layout and fixed callsites Summary: This diff pulls in my changes to css-layout algorithm. (The change: https://github.com/facebook/css-layout/pull/154) This is a breaking change, since it adds a new `height` parameter to all measure functions. So I've fixed all existing implementations just by adding a new unused parameter `height` - it's up to owners of these functions whether they want to use it or not. Reviewed By: foghina Differential Revision: D2757965 --- ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java index 5920e09f4..5bc51a93d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTText.java @@ -61,7 +61,7 @@ import com.facebook.react.uimanager.ViewProps; } @Override - public void measure(CSSNode node, float width, MeasureOutput measureOutput) { + public void measure(CSSNode node, float width, float height, MeasureOutput measureOutput) { CharSequence text = getText(); if (TextUtils.isEmpty(text)) {