File tree Expand file tree Collapse file tree 2 files changed +4
-17
lines changed
Expand file tree Collapse file tree 2 files changed +4
-17
lines changed Original file line number Diff line number Diff line change @@ -13,10 +13,8 @@ YG_EXTERN_C_BEGIN
1313typedef struct YGNode * YGNodeRef;
1414typedef struct YGConfig * YGConfigRef;
1515
16- typedef YG_ENUM_BEGIN (YGMarker){
17- YGMarkerMeasure,
18- YGMarkerBaselineFn,
19- } YG_ENUM_END(YGMarker);
16+ typedef YG_ENUM_BEGIN (YGMarker) {}
17+ YG_ENUM_END (YGMarker);
2018
2119typedef struct {
2220 int layouts;
@@ -62,13 +60,6 @@ struct NoMarkerData {
6260 using type = YGMarkerNoData;
6361 static type*& get (YGMarkerData& d) { return d.noData ; }
6462};
65-
66- template <>
67- struct MarkerData <YGMarkerMeasure> : NoMarkerData {};
68-
69- template <>
70- struct MarkerData <YGMarkerBaselineFn> : NoMarkerData {};
71-
7263} // namespace detail
7364
7465template <YGMarker M>
Original file line number Diff line number Diff line change @@ -1000,9 +1000,7 @@ static float YGBaseline(const YGNodeRef node, void* layoutContext) {
10001000
10011001 Event::publish<Event::NodeBaselineStart>(node);
10021002
1003- const float baseline = marker::MarkerSection<YGMarkerBaselineFn>::wrap (
1004- node,
1005- &YGNode::baseline,
1003+ const float baseline = node->baseline (
10061004 node->getLayout ().measuredDimensions [YGDimensionWidth],
10071005 node->getLayout ().measuredDimensions [YGDimensionHeight],
10081006 layoutContext);
@@ -1638,9 +1636,7 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
16381636 Event::publish<Event::MeasureCallbackStart>(node);
16391637
16401638 // Measure the text under the current constraints.
1641- const YGSize measuredSize = marker::MarkerSection<YGMarkerMeasure>::wrap (
1642- node,
1643- &YGNode::measure,
1639+ const YGSize measuredSize = node->measure (
16441640 innerWidth,
16451641 widthMeasureMode,
16461642 innerHeight,
You can’t perform that action at this time.
0 commit comments