DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

BREAKING - Make first parameter of measure and print functions CSSNodeRef instead of just context

Browse Source 
Summary: To perform some JNI optimizations for java we need a reference to the node in the measure function. This updates the API to provide the whole node as input instead of just the context.

Reviewed By: javache

Differential Revision: D4081544

fbshipit-source-id: d49679025cea027cf7b8482898de0a01fe0f9d40
This commit is contained in:
Emil Sjolander
2016-10-27 10:52:11 -07:00
committed by Facebook Github Bot
parent b59ce09109
commit 46823878a5
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CSSLayout/CSSLayout.c
View File

@@ -456,7 +456,7 @@ static void _CSSNodePrint(const CSSNodeRef node,
gLogger("{"); gLogger("{");
if (node->print) { if (node->print) {
node->print(node->context); node->print(node);
} }
if (options & CSSPrintOptionsLayout) { if (options & CSSPrintOptionsLayout) {
@@ -1263,7 +1263,7 @@ static void layoutNodeImpl(const CSSNodeRef node,
} else { } else {
// Measure the text under the current constraints. // Measure the text under the current constraints.
const CSSSize measuredSize = const CSSSize measuredSize =
node->measure(node->context, innerWidth, widthMeasureMode, innerHeight, heightMeasureMode); node->measure(node, innerWidth, widthMeasureMode, innerHeight, heightMeasureMode);
node->layout.measuredDimensions[CSSDimensionWidth] = node->layout.measuredDimensions[CSSDimensionWidth] =
boundAxis(node, boundAxis(node,
@@ -2284,7 +2284,7 @@ bool layoutNodeInternal(const CSSNodeRef node,
if (gPrintChanges && gPrintSkips) { if (gPrintChanges && gPrintSkips) {
printf("%s%d.{[skipped] ", getSpacer(gDepth), gDepth); printf("%s%d.{[skipped] ", getSpacer(gDepth), gDepth);
if (node->print) { if (node->print) {
node->print(node->context); node->print(node);
} }
printf("wm: %s, hm: %s, aw: %f ah: %f => d: (%f, %f) %s\n", printf("wm: %s, hm: %s, aw: %f ah: %f => d: (%f, %f) %s\n",
getModeName(widthMeasureMode, performLayout), getModeName(widthMeasureMode, performLayout),
@@ -2299,7 +2299,7 @@ bool layoutNodeInternal(const CSSNodeRef node,
if (gPrintChanges) { if (gPrintChanges) {
printf("%s%d.{%s", getSpacer(gDepth), gDepth, needToVisitNode ? "*" : ""); printf("%s%d.{%s", getSpacer(gDepth), gDepth, needToVisitNode ? "*" : "");
if (node->print) { if (node->print) {
node->print(node->context); node->print(node);
} }
printf("wm: %s, hm: %s, aw: %f ah: %f %s\n", printf("wm: %s, hm: %s, aw: %f ah: %f %s\n",
getModeName(widthMeasureMode, performLayout), getModeName(widthMeasureMode, performLayout),
@@ -2320,7 +2320,7 @@ bool layoutNodeInternal(const CSSNodeRef node,
if (gPrintChanges) { if (gPrintChanges) {
printf("%s%d.}%s", getSpacer(gDepth), gDepth, needToVisitNode ? "*" : ""); printf("%s%d.}%s", getSpacer(gDepth), gDepth, needToVisitNode ? "*" : "");
if (node->print) { if (node->print) {
node->print(node->context); node->print(node);
} }
printf("wm: %s, hm: %s, d: (%f, %f) %s\n", printf("wm: %s, hm: %s, d: (%f, %f) %s\n",
getModeName(widthMeasureMode, performLayout), getModeName(widthMeasureMode, performLayout),

4
CSSLayout/CSSLayout.h
View File

@@ -116,12 +116,12 @@ typedef struct CSSSize {
} CSSSize; } CSSSize;
typedef struct CSSNode *CSSNodeRef; typedef struct CSSNode *CSSNodeRef;
typedef CSSSize (*CSSMeasureFunc)(void *context, typedef CSSSize (*CSSMeasureFunc)(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode); CSSMeasureMode heightMode);
typedef void (*CSSPrintFunc)(void *context); typedef void (*CSSPrintFunc)(CSSNodeRef node);
typedef int (*CSSLogger)(const char *format, ...); typedef int (*CSSLogger)(const char *format, ...);
#ifdef CSS_ASSERT_FAIL_ENABLED #ifdef CSS_ASSERT_FAIL_ENABLED

2
benchmark/CSSBenchmark.c
View File

@@ -11,7 +11,7 @@
#include <CSSLayout/CSSLayout.h> #include <CSSLayout/CSSLayout.h>
static CSSSize _measure(void *context, static CSSSize _measure(CSSNodeRef node
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,

2
csharp/Facebook.CSSLayout/CSSMeasureFunc.cs
View File

@@ -14,7 +14,7 @@ namespace Facebook.CSSLayout
{ {
[UnmanagedFunctionPointer(CallingConvention.Cdecl)] [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
public delegate CSSSize CSSMeasureFunc( public delegate CSSSize CSSMeasureFunc(
IntPtr context, IntPtr node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,

2
csharp/Facebook.CSSLayout/CSSNode.cs
View File

@@ -532,7 +532,7 @@ namespace Facebook.CSSLayout
} }
private CSSSize MeasureInternal( private CSSSize MeasureInternal(
IntPtr context, IntPtr node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,

8
java/jni/CSSJNI.cpp
View File

@@ -14,17 +14,17 @@
using namespace facebook::jni; using namespace facebook::jni;
using namespace std; using namespace std;
static void _jniPrint(void *context) { static void _jniPrint(CSSNodeRef node) {
auto obj = adopt_local(Environment::current()->NewLocalRef(reinterpret_cast<jweak>(context))); auto obj = adopt_local(Environment::current()->NewLocalRef(reinterpret_cast<jweak>(CSSNodeGetContext(node))));
cout << obj->toString() << endl; cout << obj->toString() << endl;
} }
static CSSSize _jniMeasureFunc(void *context, static CSSSize _jniMeasureFunc(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
auto obj = adopt_local(Environment::current()->NewLocalRef(reinterpret_cast<jweak>(context))); auto obj = adopt_local(Environment::current()->NewLocalRef(reinterpret_cast<jweak>(CSSNodeGetContext(node))));
static auto measureFunc = static auto measureFunc =
obj->getClass()->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure"); obj->getClass()->getMethod<jlong(jfloat, jint, jfloat, jint)>("measure");
const auto measureResult = measureFunc(obj, width, widthMode, height, heightMode); const auto measureResult = measureFunc(obj, width, widthMode, height, heightMode);

8
tests/CSSLayoutMeasureCacheTest.cpp
View File

@@ -10,13 +10,13 @@
#include <CSSLayout/CSSLayout.h> #include <CSSLayout/CSSLayout.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
static CSSSize _measureMax(void *context, static CSSSize _measureMax(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
int *measureCount = (int *)context; int *measureCount = (int *)CSSNodeGetContext(node);
*measureCount = *measureCount + 1; *measureCount = *measureCount + 1;
return CSSSize { return CSSSize {
.width = widthMode == CSSMeasureModeUndefined ? 10 : width, .width = widthMode == CSSMeasureModeUndefined ? 10 : width,
@@ -24,13 +24,13 @@ static CSSSize _measureMax(void *context,
}; };
} }
static CSSSize _measureMin(void *context, static CSSSize _measureMin(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
int *measureCount = (int *)context; int *measureCount = (int *)CSSNodeGetContext(node);
*measureCount = *measureCount + 1; *measureCount = *measureCount + 1;
return CSSSize { return CSSSize {
.width = widthMode == CSSMeasureModeUndefined || (widthMode == CSSMeasureModeAtMost && width > 10) ? 10 : width, .width = widthMode == CSSMeasureModeUndefined || (widthMode == CSSMeasureModeAtMost && width > 10) ? 10 : width,

4
tests/CSSLayoutMeasureModeTest.cpp
View File

@@ -22,12 +22,12 @@ struct _MeasureConstraintList {
struct _MeasureConstraint *constraints; struct _MeasureConstraint *constraints;
}; };
static CSSSize _measure(void *context, static CSSSize _measure(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
struct _MeasureConstraintList *constraintList = (struct _MeasureConstraintList *)context; struct _MeasureConstraintList *constraintList = (struct _MeasureConstraintList *)CSSNodeGetContext(node);
struct _MeasureConstraint *constraints = constraintList->constraints; struct _MeasureConstraint *constraints = constraintList->constraints;
uint32_t currentIndex = constraintList->length; uint32_t currentIndex = constraintList->length;
(&constraints[currentIndex])->width = width; (&constraints[currentIndex])->width = width;

4
tests/CSSLayoutMeasureTest.cpp
View File

@@ -10,12 +10,12 @@
#include <CSSLayout/CSSLayout.h> #include <CSSLayout/CSSLayout.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
static CSSSize _measure(void *context, static CSSSize _measure(CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
CSSMeasureMode heightMode) { CSSMeasureMode heightMode) {
int *measureCount = (int *)context; int *measureCount = (int *)CSSNodeGetContext(node);
*measureCount = *measureCount + 1; *measureCount = *measureCount + 1;
return CSSSize { return CSSSize {
.width = widthMode == CSSMeasureModeUndefined ? 10 : width, .width = widthMode == CSSMeasureModeUndefined ? 10 : width,

4
uikit/CSSLayout/UIView+CSSLayout.m
View File

@@ -206,7 +206,7 @@ static void _updateFrameRecursive(UIView *view);
#pragma mark - Private #pragma mark - Private
static CSSSize _measure( static CSSSize _measure(
void *context, CSSNodeRef node,
float width, float width,
CSSMeasureMode widthMode, CSSMeasureMode widthMode,
float height, float height,
@@ -222,7 +222,7 @@ static CSSSize _measure(
}; };
} }
UIView *view = (__bridge UIView*) context; UIView *view = (__bridge UIView*) CSSNodeGetContext(node);
const CGSize sizeThatFits = [view sizeThatFits:(CGSize) { const CGSize sizeThatFits = [view sizeThatFits:(CGSize) {
.width = widthMode == CSSMeasureModeUndefined ? CGFLOAT_MAX : width, .width = widthMode == CSSMeasureModeUndefined ? CGFLOAT_MAX : width,
.height = heightMode == CSSMeasureModeUndefined ? CGFLOAT_MAX : height, .height = heightMode == CSSMeasureModeUndefined ? CGFLOAT_MAX : height,