Move configuration to new YGConfig and pass them down to CalculateLayout
Summary: Move configuration to new ```YGConfig``` and pass them down to CalculateLayout. See #418 . Adds ```YGConfigNew()``` + ```YGConfigFree```, and changed ```YGSetExperimentalFeatureEnabled``` to use the config. New function for calculation is ```YGNodeCalculateLayoutWithConfig```. Closes https://github.com/facebook/yoga/pull/432 Reviewed By: astreet Differential Revision: D4611359 Pulled By: emilsjolander fbshipit-source-id: a1332f0e1b21cec02129dd021ee57408449e10b0
This commit is contained in:
committed by
Facebook Github Bot
parent
8668e43f6d
commit
37c48257ae
@@ -40,16 +40,15 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
this.push('TEST(YogaTest, ' + name + ') {');
|
||||
this.pushIndent();
|
||||
|
||||
if (experiments.length > 0) {
|
||||
for (var i in experiments) {
|
||||
this.push('YGSetExperimentalFeatureEnabled(YGExperimentalFeature' + experiments[i] +', true);');
|
||||
}
|
||||
this.push('');
|
||||
this.push('const YGConfigRef config = YGConfigNew();')
|
||||
for (var i in experiments) {
|
||||
this.push('YGConfigSetExperimentalFeatureEnabled(config, YGExperimentalFeature' + experiments[i] +', true);');
|
||||
}
|
||||
this.push('');
|
||||
}},
|
||||
|
||||
emitTestTreePrologue:{value:function(nodeName) {
|
||||
this.push('const YGNodeRef ' + nodeName + ' = YGNodeNew();');
|
||||
this.push('const YGNodeRef ' + nodeName + ' = YGNodeNewWithConfig(config);');
|
||||
}},
|
||||
|
||||
emitTestEpilogue:{value:function(experiments) {
|
||||
@@ -58,12 +57,8 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
'YGNodeFreeRecursive(root);',
|
||||
]);
|
||||
|
||||
if (experiments.length > 0) {
|
||||
this.push('');
|
||||
for (var i in experiments) {
|
||||
this.push('YGSetExperimentalFeatureEnabled(YGExperimentalFeature' + experiments[i] +', false);');
|
||||
}
|
||||
}
|
||||
this.push('');
|
||||
this.push('YGConfigFree(config);')
|
||||
|
||||
this.popIndent();
|
||||
this.push([
|
||||
@@ -127,7 +122,7 @@ CPPEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
YGAuto:{value:'YGAuto'},
|
||||
|
||||
|
||||
YGNodeCalculateLayout:{value:function(node, dir) {
|
||||
YGNodeCalculateLayout:{value:function(node, dir, experiments) {
|
||||
this.push('YGNodeCalculateLayout(' + node + ', YGUndefined, YGUndefined, ' + dir + ');');
|
||||
}},
|
||||
|
||||
|
@@ -53,25 +53,18 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
this.push('{');
|
||||
this.pushIndent();
|
||||
|
||||
if (experiments.length > 0) {
|
||||
for (var i in experiments) {
|
||||
this.push('YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.' + experiments[i] +', true);');
|
||||
}
|
||||
this.push('');
|
||||
this.push('YogaConfig config = new YogaConfig();')
|
||||
for (var i in experiments) {
|
||||
this.push('config.SetExperimentalFeatureEnabled(YogaExperimentalFeature.' + experiments[i] +', true);');
|
||||
}
|
||||
this.push('');
|
||||
}},
|
||||
|
||||
emitTestTreePrologue:{value:function(nodeName) {
|
||||
this.push('YogaNode ' + nodeName + ' = new YogaNode();');
|
||||
this.push('YogaNode ' + nodeName + ' = new YogaNode(config);');
|
||||
}},
|
||||
|
||||
emitTestEpilogue:{value:function(experiments) {
|
||||
if (experiments.length > 0) {
|
||||
this.push('');
|
||||
for (var i in experiments) {
|
||||
this.push('YogaNode.SetExperimentalFeatureEnabled(YogaExperimentalFeature.' + experiments[i] +', false);');
|
||||
}
|
||||
}
|
||||
|
||||
this.popIndent();
|
||||
this.push([
|
||||
@@ -142,7 +135,7 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
YGWrapWrap:{value:'YogaWrap.Wrap'},
|
||||
YGWrapWrapReverse:{value: 'YogaWrap.WrapReverse'},
|
||||
|
||||
YGNodeCalculateLayout:{value:function(node, dir) {
|
||||
YGNodeCalculateLayout:{value:function(node, dir, experiments) {
|
||||
this.push(node + '.StyleDirection = ' + dir + ';');
|
||||
this.push(node + '.CalculateLayout();');
|
||||
}},
|
||||
|
@@ -58,26 +58,18 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
this.push('public void test_' + name + '() {');
|
||||
this.pushIndent();
|
||||
|
||||
if (experiments.length > 0) {
|
||||
for (var i in experiments) {
|
||||
this.push('YogaNode.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
|
||||
}
|
||||
this.push('');
|
||||
this.push("YogaConfig config = new YogaConfig();")
|
||||
for (var i in experiments) {
|
||||
this.push('config.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
|
||||
}
|
||||
this.push('');
|
||||
}},
|
||||
|
||||
emitTestTreePrologue:{value:function(nodeName) {
|
||||
this.push('final YogaNode ' + nodeName + ' = new YogaNode();');
|
||||
this.push('final YogaNode ' + nodeName + ' = new YogaNode(config);');
|
||||
}},
|
||||
|
||||
emitTestEpilogue:{value:function(experiments) {
|
||||
if (experiments.length > 0) {
|
||||
this.push('');
|
||||
for (var i in experiments) {
|
||||
this.push('YogaNode.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', false);');
|
||||
}
|
||||
}
|
||||
|
||||
this.popIndent();
|
||||
this.push([
|
||||
'}',
|
||||
@@ -145,7 +137,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
YGWrapWrap:{value:'YogaWrap.WRAP'},
|
||||
YGWrapWrapReverse:{value: 'YogaWrap.WRAP_REVERSE'},
|
||||
|
||||
YGNodeCalculateLayout:{value:function(node, dir) {
|
||||
YGNodeCalculateLayout:{value:function(node, dir, experiments) {
|
||||
this.push(node + '.setDirection(' + dir + ');');
|
||||
this.push(node + '.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);');
|
||||
}},
|
||||
|
@@ -56,7 +56,7 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
}},
|
||||
|
||||
emitTestTreePrologue:{value:function(nodeName) {
|
||||
this.push('var ' + nodeName + ' = Yoga.Node.create();');
|
||||
this.push('var ' + nodeName + ' = Yoga.Node.create(config);');
|
||||
}},
|
||||
|
||||
emitTestEpilogue:{value:function(experiments) {
|
||||
@@ -140,7 +140,7 @@ JavascriptEmitter.prototype = Object.create(Emitter.prototype, {
|
||||
YGDisplayFlex:{value:'Yoga.DISPLAY_FLEX'},
|
||||
YGDisplayNone:{value:'Yoga.DISPLAY_NONE'},
|
||||
|
||||
YGNodeCalculateLayout:{value:function(node, dir) {
|
||||
YGNodeCalculateLayout:{value:function(node, dir, experiments) {
|
||||
this.push(node + '.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, ' + dir + ');');
|
||||
}},
|
||||
|
||||
|
@@ -93,13 +93,13 @@ function printTest(e, LTRContainer, RTLContainer, genericContainer) {
|
||||
'root',
|
||||
null);
|
||||
|
||||
e.YGNodeCalculateLayout('root', e.YGDirectionLTR);
|
||||
e.YGNodeCalculateLayout('root', e.YGDirectionLTR, genericLayoutTree[i].experiments);
|
||||
e.push('');
|
||||
|
||||
assertTestTree(e, LTRLayoutTree[i], 'root', null);
|
||||
e.push('');
|
||||
|
||||
e.YGNodeCalculateLayout('root', e.YGDirectionRTL);
|
||||
e.YGNodeCalculateLayout('root', e.YGDirectionRTL, genericLayoutTree[i].experiments);
|
||||
e.push('');
|
||||
|
||||
assertTestTree(e, RTLLayoutTree[i], 'root', null);
|
||||
|
Reference in New Issue
Block a user