Revert D74292949: Expose Unsnapped Dimensions

Differential Revision:
D74292949

Original commit changeset: 05011c66a9a9

Original Phabricator Diff: D74292949

fbshipit-source-id: c6ca51c7b882950d54b6a43e206973774db40429

tests/YGRoundingFunctionTest.cpp

@@ -161,23 +161,3 @@ TEST(YogaTest, per_node_point_scale_factor) {
   YGConfigFree(config2);
   YGConfigFree(config3);
 }
-
-TEST(YogaTest, raw_layout_dimensions) {
-  YGConfigRef config = YGConfigNew();
-  YGConfigSetPointScaleFactor(config, 0.5f);
-
-  YGNodeRef root = YGNodeNewWithConfig(config);
-  YGNodeStyleSetWidth(root, 11.5f);
-  YGNodeStyleSetHeight(root, 9.5f);
-
-  YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
-
-  ASSERT_EQ(YGNodeLayoutGetWidth(root), 12.0f);
-  ASSERT_EQ(YGNodeLayoutGetHeight(root), 10.0f);
-  ASSERT_EQ(YGNodeLayoutGetRawWidth(root), 11.5f);
-  ASSERT_EQ(YGNodeLayoutGetRawHeight(root), 9.5f);
-
-  YGNodeFreeRecursive(root);
-
-  YGConfigFree(config);
-}

yoga/YGNodeLayout.cpp

@@ -90,11 +90,3 @@ float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge) {
   return getResolvedLayoutProperty<&LayoutResults::padding>(
       node, scopedEnum(edge));
 }
-
-float YGNodeLayoutGetRawHeight(YGNodeConstRef node) {
-  return resolveRef(node)->getLayout().rawDimension(Dimension::Height);
-}
-
-float YGNodeLayoutGetRawWidth(YGNodeConstRef node) {
-  return resolveRef(node)->getLayout().rawDimension(Dimension::Width);
-}

yoga/YGNodeLayout.h

@@ -32,14 +32,4 @@ YG_EXPORT float YGNodeLayoutGetMargin(YGNodeConstRef node, YGEdge edge);
 YG_EXPORT float YGNodeLayoutGetBorder(YGNodeConstRef node, YGEdge edge);
 YG_EXPORT float YGNodeLayoutGetPadding(YGNodeConstRef node, YGEdge edge);
 
-/**
- * Return the measured height of the node, before layout rounding
- */
-YG_EXPORT float YGNodeLayoutGetRawHeight(YGNodeConstRef node);
-
-/**
- * Return the measured width of the node, before layout rounding
- */
-YG_EXPORT float YGNodeLayoutGetRawWidth(YGNodeConstRef node);
-
 YG_EXTERN_C_END

yoga/algorithm/PixelGrid.cpp

@@ -106,25 +106,25 @@ void roundLayoutResultsToPixelGrid(
     const bool hasFractionalHeight =
         !yoga::inexactEquals(round(scaledNodeHeight), scaledNodeHeight);
 
-    node->getLayout().setDimension(
-        Dimension::Width,
+    node->setLayoutDimension(
         roundValueToPixelGrid(
             absoluteNodeRight,
             pointScaleFactor,
             (textRounding && hasFractionalWidth),
             (textRounding && !hasFractionalWidth)) -
             roundValueToPixelGrid(
-                absoluteNodeLeft, pointScaleFactor, false, textRounding));
+                absoluteNodeLeft, pointScaleFactor, false, textRounding),
+        Dimension::Width);
 
-    node->getLayout().setDimension(
-        Dimension::Height,
+    node->setLayoutDimension(
         roundValueToPixelGrid(
             absoluteNodeBottom,
             pointScaleFactor,
             (textRounding && hasFractionalHeight),
             (textRounding && !hasFractionalHeight)) -
             roundValueToPixelGrid(
-                absoluteNodeTop, pointScaleFactor, false, textRounding));
+                absoluteNodeTop, pointScaleFactor, false, textRounding),
+        Dimension::Height);
   }
 
   for (yoga::Node* child : node->getChildren()) {

yoga/node/LayoutResults.h

@@ -66,18 +66,10 @@ struct LayoutResults {
     return measuredDimensions_[yoga::to_underlying(axis)];
   }
 
-  float rawDimension(Dimension axis) const {
-    return rawDimensions_[yoga::to_underlying(axis)];
-  }
-
   void setMeasuredDimension(Dimension axis, float dimension) {
     measuredDimensions_[yoga::to_underlying(axis)] = dimension;
   }
 
-  void setRawDimension(Dimension axis, float dimension) {
-    rawDimensions_[yoga::to_underlying(axis)] = dimension;
-  }
-
   float position(PhysicalEdge physicalEdge) const {
     return position_[yoga::to_underlying(physicalEdge)];
   }
@@ -121,7 +113,6 @@ struct LayoutResults {
 
   std::array<float, 2> dimensions_ = {{YGUndefined, YGUndefined}};
   std::array<float, 2> measuredDimensions_ = {{YGUndefined, YGUndefined}};
-  std::array<float, 2> rawDimensions_ = {{YGUndefined, YGUndefined}};
   std::array<float, 4> position_ = {};
   std::array<float, 4> margin_ = {};
   std::array<float, 4> border_ = {};

yoga/node/Node.cpp

@@ -247,7 +247,6 @@ void Node::setLayoutHadOverflow(bool hadOverflow) {
 
 void Node::setLayoutDimension(float lengthValue, Dimension dimension) {
   layout_.setDimension(dimension, lengthValue);
-  layout_.setRawDimension(dimension, lengthValue);
 }
 
 // If both left and right are defined, then use left. Otherwise return +left or