pr feedback

Author: intergalacticspacehighway

yoga/YGGridTrackList.cpp

@@ -9,32 +9,28 @@
 #include <yoga/node/Node.h>
 #include <yoga/style/GridTrack.h>
 #include <yoga/style/StyleSizeLength.h>
+#include <memory>
 #include <vector>
 
 using namespace facebook::yoga;
 
-// Internal representation of a grid track value
 struct YGGridTrackValue {
   enum class Type { Points, Percent, Fr, Auto, MinMax };
 
   Type type;
   float value;
-  YGGridTrackValue* minValue;
-  YGGridTrackValue* maxValue;
+  std::unique_ptr<YGGridTrackValue> minValue;
+  std::unique_ptr<YGGridTrackValue> maxValue;
 
-  YGGridTrackValue(Type t, float v = 0.0f)
-      : type(t), value(v), minValue(nullptr), maxValue(nullptr) {}
+  YGGridTrackValue(Type t, float v = 0.0f) : type(t), value(v) {}
 
-  YGGridTrackValue(YGGridTrackValue* min, YGGridTrackValue* max)
-      : type(Type::MinMax), value(0.0f), minValue(min), maxValue(max) {}
-
-  ~YGGridTrackValue() {
-    // MinMax owns its min/max values
-    if (type == Type::MinMax) {
-      delete minValue;
-      delete maxValue;
-    }
-  }
+  YGGridTrackValue(
+      std::unique_ptr<YGGridTrackValue> min,
+      std::unique_ptr<YGGridTrackValue> max)
+      : type(Type::MinMax),
+        value(0.0f),
+        minValue(std::move(min)),
+        maxValue(std::move(max)) {}
 
   StyleSizeLength toStyleSizeLength() const {
     switch (type) {
@@ -54,27 +50,20 @@ struct YGGridTrackValue {
   }
 };
 
-// Internal representation of a grid track list
 struct YGGridTrackList {
-  std::vector<YGGridTrackValue*> tracks;
+  std::vector<std::unique_ptr<YGGridTrackValue>> tracks;
 
   YGGridTrackList() = default;
   YGGridTrackList(const YGGridTrackList&) = delete;
   YGGridTrackList& operator=(const YGGridTrackList&) = delete;
   YGGridTrackList(YGGridTrackList&&) = delete;
   YGGridTrackList& operator=(YGGridTrackList&&) = delete;
 
-  ~YGGridTrackList() {
-    for (auto* track : tracks) {
-      delete track;
-    }
-  }
-
   GridTrackList toGridTrackList() const {
     GridTrackList result;
     result.reserve(tracks.size());
 
-    for (auto* track : tracks) {
+    for (const auto& track : tracks) {
       if (track->type == YGGridTrackValue::Type::MinMax) {
         auto min = track->minValue->toStyleSizeLength();
         auto max = track->maxValue->toStyleSizeLength();
@@ -116,28 +105,31 @@ void YGGridTrackListAddTrack(
     YGGridTrackListRef list,
     YGGridTrackValueRef trackValue) {
   if (list && trackValue) {
-    list->tracks.push_back(trackValue);
+    list->tracks.push_back(std::unique_ptr<YGGridTrackValue>(trackValue));
   }
 }
 
-YGGridTrackValueRef YGPoints(float points) {
+YGGridTrackValueRef YGGridTrackPoints(float points) {
   return new YGGridTrackValue(YGGridTrackValue::Type::Points, points);
 }
 
-YGGridTrackValueRef YGPercent(float percent) {
+YGGridTrackValueRef YGGridTrackPercent(float percent) {
   return new YGGridTrackValue(YGGridTrackValue::Type::Percent, percent);
 }
 
-YGGridTrackValueRef YGFr(float fr) {
+YGGridTrackValueRef YGGridTrackFr(float fr) {
   return new YGGridTrackValue(YGGridTrackValue::Type::Fr, fr);
 }
 
-YGGridTrackValueRef YGAuto() {
+YGGridTrackValueRef YGGridTrackAuto() {
   return new YGGridTrackValue(YGGridTrackValue::Type::Auto);
 }
 
-YGGridTrackValueRef YGMinMax(YGGridTrackValueRef min, YGGridTrackValueRef max) {
-  return new YGGridTrackValue(min, max);
+YGGridTrackValueRef
+YGGridTrackMinMax(YGGridTrackValueRef min, YGGridTrackValueRef max) {
+  return new YGGridTrackValue(
+      std::unique_ptr<YGGridTrackValue>(min),
+      std::unique_ptr<YGGridTrackValue>(max));
 }
 
 void YGNodeStyleSetGridTemplateRows(

yoga/YGGridTrackList.h

@@ -42,55 +42,27 @@ YG_EXPORT void YGGridTrackListAddTrack(
 /**
  * Create a grid track value with a points (px) length.
  */
-YG_EXPORT YGGridTrackValueRef YGPoints(float points);
+YG_EXPORT YGGridTrackValueRef YGGridTrackPoints(float points);
 
 /**
  * Create a grid track value with a percentage length.
  */
-YG_EXPORT YGGridTrackValueRef YGPercent(float percent);
+YG_EXPORT YGGridTrackValueRef YGGridTrackPercent(float percent);
 
 /**
  * Create a grid track value with a flexible (fr) length.
  */
-YG_EXPORT YGGridTrackValueRef YGFr(float fr);
+YG_EXPORT YGGridTrackValueRef YGGridTrackFr(float fr);
 
 /**
  * Create a grid track value with auto sizing.
  */
-YG_EXPORT YGGridTrackValueRef YGAuto(void);
+YG_EXPORT YGGridTrackValueRef YGGridTrackAuto(void);
 
 /**
  * Create a grid track value with minmax(min, max) sizing.
  */
-YG_EXPORT YGGridTrackValueRef
-YGMinMax(YGGridTrackValueRef min, YGGridTrackValueRef max);
-
-/**
- * Set the grid-template-rows property on a node.
- */
-YG_EXPORT void YGNodeStyleSetGridTemplateRows(
-    YGNodeRef node,
-    YGGridTrackListRef trackList);
-
-/**
- * Set the grid-template-columns property on a node.
- */
-YG_EXPORT void YGNodeStyleSetGridTemplateColumns(
-    YGNodeRef node,
-    YGGridTrackListRef trackList);
-
-/**
- * Set the grid-auto-rows property on a node.
- */
-YG_EXPORT void YGNodeStyleSetGridAutoRows(
-    YGNodeRef node,
-    YGGridTrackListRef trackList);
-
-/**
- * Set the grid-auto-columns property on a node.
- */
-YG_EXPORT void YGNodeStyleSetGridAutoColumns(
-    YGNodeRef node,
-    YGGridTrackListRef trackList);
+YG_EXPORT YGGridTrackValueRef 
+YGGridTrackMinMax(YGGridTrackValueRef min, YGGridTrackValueRef max);
 
 YG_EXTERN_C_END

yoga/YGNodeStyle.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <stddef.h>
+#include <yoga/YGGridTrackList.h>
 #include <yoga/YGNode.h>
 #include <yoga/YGValue.h>
 
@@ -178,4 +179,18 @@ YG_EXPORT void YGNodeStyleSetGridRowEndAuto(YGNodeRef node);
 YG_EXPORT void YGNodeStyleSetGridRowEndSpan(YGNodeRef node, int span);
 YG_EXPORT int YGNodeStyleGetGridRowEnd(YGNodeConstRef node);
 
+// Grid Container Properties
+YG_EXPORT void YGNodeStyleSetGridTemplateRows(
+    YGNodeRef node,
+    YGGridTrackListRef trackList);
+YG_EXPORT void YGNodeStyleSetGridTemplateColumns(
+    YGNodeRef node,
+    YGGridTrackListRef trackList);
+YG_EXPORT void YGNodeStyleSetGridAutoRows(
+    YGNodeRef node,
+    YGGridTrackListRef trackList);
+YG_EXPORT void YGNodeStyleSetGridAutoColumns(
+    YGNodeRef node,
+    YGGridTrackListRef trackList);
+
 YG_EXTERN_C_END