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

Make Java measure thread-safe.

Browse Source
This commit is contained in:
Tom Mulcahy
2015-03-23 17:49:47 +00:00
parent a7a8d1d40d
commit ddd7a899ac
9 changed files with 72 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/java/src/com/facebook/csslayout/CSSNode.java
View File

@@ -39,10 +39,6 @@ public class CSSNode {
UP_TO_DATE,
}
// Only one copy kept around to keep from allocating a bunch of MeasureOutput objects
// NOT THREAD SAFE! NOT RE-ENTRANT SAFE!
private static final MeasureOutput MEASURE_OUTPUT = new MeasureOutput();
public static interface MeasureFunction {
/**
@@ -114,22 +110,22 @@ public class CSSNode {
return mMeasureFunction != null;
}
/*package*/ MeasureOutput measure(float width) {
/*package*/ MeasureOutput measure(MeasureOutput measureOutput, float width) {
if (!isMeasureDefined()) {
throw new RuntimeException("Measure function isn't defined!");
}
MEASURE_OUTPUT.height = CSSConstants.UNDEFINED;
MEASURE_OUTPUT.width = CSSConstants.UNDEFINED;
Assertions.assertNotNull(mMeasureFunction).measure(this, width, MEASURE_OUTPUT);
return MEASURE_OUTPUT;
measureOutput.height = CSSConstants.UNDEFINED;
measureOutput.width = CSSConstants.UNDEFINED;
Assertions.assertNotNull(mMeasureFunction).measure(this, width, measureOutput);
return measureOutput;
}
/**
* Performs the actual layout and saves the results in {@link #layout}
*/
public void calculateLayout() {
public void calculateLayout(CSSLayoutContext layoutContext) {
layout.resetResult();
LayoutEngine.layoutNode(this, CSSConstants.UNDEFINED);
LayoutEngine.layoutNode(layoutContext, this, CSSConstants.UNDEFINED);
}
/**