Sample workspace: remove XML comment

Summary:
@public

Xcode does not like it

Reviewed By: astreet

Differential Revision: D14580168

fbshipit-source-id: 6d26b3961b45a59ef9dc977b21493e60e3cf9396

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,10 +1,3 @@
-<!--
-  Copyright (c) Facebook, Inc. and its affiliates.
-
-  This source code is licensed under the MIT license found in the
-  LICENSE file in the root directory of this source tree.
--->
-
 <?xml version="1.0" encoding="UTF-8"?>
 <Workspace
    version = "1.0">

java/com/facebook/yoga/YogaNative.java

@@ -69,40 +69,40 @@ public class YogaNative {
   static native void jni_YGNodeStyleSetFlexGrow(long nativePointer, float flexGrow);
   static native float jni_YGNodeStyleGetFlexShrink(long nativePointer);
   static native void jni_YGNodeStyleSetFlexShrink(long nativePointer, float flexShrink);
-  static native Object jni_YGNodeStyleGetFlexBasis(long nativePointer);
+  static native long jni_YGNodeStyleGetFlexBasis(long nativePointer);
   static native void jni_YGNodeStyleSetFlexBasis(long nativePointer, float flexBasis);
   static native void jni_YGNodeStyleSetFlexBasisPercent(long nativePointer, float percent);
   static native void jni_YGNodeStyleSetFlexBasisAuto(long nativePointer);
-  static native Object jni_YGNodeStyleGetMargin(long nativePointer, int edge);
+  static native long jni_YGNodeStyleGetMargin(long nativePointer, int edge);
   static native void jni_YGNodeStyleSetMargin(long nativePointer, int edge, float margin);
   static native void jni_YGNodeStyleSetMarginPercent(long nativePointer, int edge, float percent);
   static native void jni_YGNodeStyleSetMarginAuto(long nativePointer, int edge);
-  static native Object jni_YGNodeStyleGetPadding(long nativePointer, int edge);
+  static native long jni_YGNodeStyleGetPadding(long nativePointer, int edge);
   static native void jni_YGNodeStyleSetPadding(long nativePointer, int edge, float padding);
   static native void jni_YGNodeStyleSetPaddingPercent(long nativePointer, int edge, float percent);
   static native float jni_YGNodeStyleGetBorder(long nativePointer, int edge);
   static native void jni_YGNodeStyleSetBorder(long nativePointer, int edge, float border);
-  static native Object jni_YGNodeStyleGetPosition(long nativePointer, int edge);
+  static native long jni_YGNodeStyleGetPosition(long nativePointer, int edge);
   static native void jni_YGNodeStyleSetPosition(long nativePointer, int edge, float position);
   static native void jni_YGNodeStyleSetPositionPercent(long nativePointer, int edge, float percent);
-  static native Object jni_YGNodeStyleGetWidth(long nativePointer);
+  static native long jni_YGNodeStyleGetWidth(long nativePointer);
   static native void jni_YGNodeStyleSetWidth(long nativePointer, float width);
   static native void jni_YGNodeStyleSetWidthPercent(long nativePointer, float percent);
   static native void jni_YGNodeStyleSetWidthAuto(long nativePointer);
-  static native Object jni_YGNodeStyleGetHeight(long nativePointer);
+  static native long jni_YGNodeStyleGetHeight(long nativePointer);
   static native void jni_YGNodeStyleSetHeight(long nativePointer, float height);
   static native void jni_YGNodeStyleSetHeightPercent(long nativePointer, float percent);
   static native void jni_YGNodeStyleSetHeightAuto(long nativePointer);
-  static native Object jni_YGNodeStyleGetMinWidth(long nativePointer);
+  static native long jni_YGNodeStyleGetMinWidth(long nativePointer);
   static native void jni_YGNodeStyleSetMinWidth(long nativePointer, float minWidth);
   static native void jni_YGNodeStyleSetMinWidthPercent(long nativePointer, float percent);
-  static native Object jni_YGNodeStyleGetMinHeight(long nativePointer);
+  static native long jni_YGNodeStyleGetMinHeight(long nativePointer);
   static native void jni_YGNodeStyleSetMinHeight(long nativePointer, float minHeight);
   static native void jni_YGNodeStyleSetMinHeightPercent(long nativePointer, float percent);
-  static native Object jni_YGNodeStyleGetMaxWidth(long nativePointer);
+  static native long jni_YGNodeStyleGetMaxWidth(long nativePointer);
   static native void jni_YGNodeStyleSetMaxWidth(long nativePointer, float maxWidth);
   static native void jni_YGNodeStyleSetMaxWidthPercent(long nativePointer, float percent);
-  static native Object jni_YGNodeStyleGetMaxHeight(long nativePointer);
+  static native long jni_YGNodeStyleGetMaxHeight(long nativePointer);
   static native void jni_YGNodeStyleSetMaxHeight(long nativePointer, float maxheight);
   static native void jni_YGNodeStyleSetMaxHeightPercent(long nativePointer, float percent);
   static native float jni_YGNodeStyleGetAspectRatio(long nativePointer);

java/com/facebook/yoga/YogaNodeJNIBase.java

@@ -349,7 +349,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getFlexBasis() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetFlexBasis(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetFlexBasis(mNativePointer));
   }
 
   public void setFlexBasis(float flexBasis) {
@@ -365,7 +365,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getMargin(YogaEdge edge) {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue());
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMargin(mNativePointer, edge.intValue()));
   }
 
   public void setMargin(YogaEdge edge, float margin) {
@@ -381,7 +381,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getPadding(YogaEdge edge) {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue());
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetPadding(mNativePointer, edge.intValue()));
   }
 
   public void setPadding(YogaEdge edge, float padding) {
@@ -401,7 +401,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getPosition(YogaEdge edge) {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue());
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetPosition(mNativePointer, edge.intValue()));
   }
 
   public void setPosition(YogaEdge edge, float position) {
@@ -413,7 +413,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getWidth() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetWidth(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetWidth(mNativePointer));
   }
 
   public void setWidth(float width) {
@@ -429,7 +429,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getHeight() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetHeight(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetHeight(mNativePointer));
   }
 
   public void setHeight(float height) {
@@ -445,7 +445,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getMinWidth() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetMinWidth(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMinWidth(mNativePointer));
   }
 
   public void setMinWidth(float minWidth) {
@@ -457,7 +457,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getMinHeight() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetMinHeight(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMinHeight(mNativePointer));
   }
 
   public void setMinHeight(float minHeight) {
@@ -469,7 +469,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getMaxWidth() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetMaxWidth(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxWidth(mNativePointer));
   }
 
   public void setMaxWidth(float maxWidth) {
@@ -481,7 +481,7 @@ public abstract class YogaNodeJNIBase extends YogaNode {
   }
 
   public YogaValue getMaxHeight() {
-    return (YogaValue) YogaNative.jni_YGNodeStyleGetMaxHeight(mNativePointer);
+    return valueFromLong(YogaNative.jni_YGNodeStyleGetMaxHeight(mNativePointer));
   }
 
   public void setMaxHeight(float maxheight) {
@@ -656,4 +656,8 @@ public abstract class YogaNodeJNIBase extends YogaNode {
     newNode.mOwner = this;
     return newNode.mNativePointer;
   }
+
+  private static YogaValue valueFromLong(long raw) {
+    return new YogaValue(Float.intBitsToFloat((int) raw), (int) (raw >> 32));
+  }
 }

java/com/facebook/yoga/YogaValue.java

@@ -6,9 +6,6 @@
  */
 package com.facebook.yoga;
 
-import com.facebook.proguard.annotations.DoNotStrip;
-
-@DoNotStrip
 public class YogaValue {
   static final YogaValue UNDEFINED = new YogaValue(YogaConstants.UNDEFINED, YogaUnit.UNDEFINED);
   static final YogaValue ZERO = new YogaValue(0, YogaUnit.POINT);
@@ -22,7 +19,6 @@ public class YogaValue {
     this.unit = unit;
   }
 
-  @DoNotStrip
   YogaValue(float value, int unit) {
     this(value, YogaUnit.fromInt(unit));
   }

java/jni/YGJNI.cpp

@@ -9,6 +9,7 @@
 #include <yoga/Yoga.h>
 #include <yoga/log.h>
 #include <cstdint>
+#include <cstring>
 #include <iostream>
 #include <map>
 
@@ -128,6 +129,19 @@ public:
   }
 };
 
+struct YogaValue {
+  static constexpr jint NAN_BYTES = 0x7fc00000;
+
+  static jlong asJavaLong(const YGValue& value) {
+    uint32_t valueBytes = 0;
+    memcpy(&valueBytes, &value.value, sizeof valueBytes);
+    return ((jlong) value.unit) << 32 | valueBytes;
+  }
+  constexpr static jlong undefinedAsJavaLong() {
+    return ((jlong) YGUnitUndefined) << 32 | NAN_BYTES;
+  }
+};
+
 } // namespace
 
 static inline local_ref<JYogaNode> YGNodeJobject(
@@ -472,9 +486,8 @@ void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) {
   }
 
 #define YG_NODE_JNI_STYLE_UNIT_PROP(name)                                     \
-  local_ref<jobject> jni_YGNodeStyleGet##name(                                \
-      alias_ref<jclass>, jlong nativePointer) {                               \
-    return JYogaValue::create(                                                \
+  jlong jni_YGNodeStyleGet##name(jlong nativePointer) {                       \
+    return YogaValue::asJavaLong(                                             \
         YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)));               \
   }                                                                           \
                                                                               \
@@ -509,9 +522,8 @@ void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) {
   }
 
 #define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name)                        \
-  local_ref<jobject> jni_YGNodeStyleGet##name(                        \
-      alias_ref<jclass>, jlong nativePointer, jint edge) {            \
-    return JYogaValue::create(YGNodeStyleGet##name(                   \
+  jlong jni_YGNodeStyleGet##name(jlong nativePointer, jint edge) {    \
+    return YogaValue::asJavaLong(YGNodeStyleGet##name(                \
         _jlong2YGNodeRef(nativePointer), static_cast<YGEdge>(edge))); \
   }                                                                   \
                                                                       \
@@ -841,15 +853,12 @@ jint jni_YGNodeGetInstanceCount() {
   return YGNodeGetInstanceCount();
 }
 
-local_ref<jobject> jni_YGNodeStyleGetMargin(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jint edge) {
+jlong jni_YGNodeStyleGetMargin(jlong nativePointer, jint edge) {
   YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
   if (!YGNodeEdges{yogaNodeRef}.has(YGNodeEdges::MARGIN)) {
-    return JYogaValue::create(YGValueUndefined);
+    return YogaValue::undefinedAsJavaLong();
   }
-  return JYogaValue::create(
+  return YogaValue::asJavaLong(
       YGNodeStyleGetMargin(yogaNodeRef, static_cast<YGEdge>(edge)));
 }
 
@@ -876,15 +885,12 @@ void jni_YGNodeStyleSetMarginAuto(jlong nativePointer, jint edge) {
   YGNodeStyleSetMarginAuto(yogaNodeRef, static_cast<YGEdge>(edge));
 }
 
-local_ref<jobject> jni_YGNodeStyleGetPadding(
-    alias_ref<jclass>,
-    jlong nativePointer,
-    jint edge) {
+jlong jni_YGNodeStyleGetPadding(jlong nativePointer, jint edge) {
   YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer);
   if (!YGNodeEdges{yogaNodeRef}.has(YGNodeEdges::PADDING)) {
-    return JYogaValue::create(YGValueUndefined);
+    return YogaValue::undefinedAsJavaLong();
   }
-  return JYogaValue::create(
+  return YogaValue::asJavaLong(
       YGNodeStyleGetPadding(yogaNodeRef, static_cast<YGEdge>(edge)));
 }
 
@@ -972,40 +978,40 @@ jint JNI_OnLoad(JavaVM* vm, void*) {
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexGrow),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexShrink),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexShrink),
-            YGMakeNativeMethod(jni_YGNodeStyleGetFlexBasis),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetFlexBasis),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasis),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetFlexBasisAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMargin),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMargin),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMargin),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMarginAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetPadding),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPadding),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPadding),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPaddingPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleGetBorder),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetBorder),
-            YGMakeNativeMethod(jni_YGNodeStyleGetPosition),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetPosition),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPosition),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetPositionPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetWidth),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetWidthAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetHeight),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetHeightAuto),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMinWidth),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMinWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinWidthPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMinHeight),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMinHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMinHeightPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMaxWidth),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMaxWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidth),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxWidthPercent),
-            YGMakeNativeMethod(jni_YGNodeStyleGetMaxHeight),
+            YGMakeCriticalNativeMethod(jni_YGNodeStyleGetMaxHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeight),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleSetMaxHeightPercent),
             YGMakeCriticalNativeMethod(jni_YGNodeStyleGetAspectRatio),

java/jni/YGJTypes.h

@@ -28,11 +28,3 @@ struct JYogaLogger : public facebook::jni::JavaClass<JYogaLogger> {
       facebook::jni::alias_ref<JYogaLogLevel>,
       jstring);
 };
-
-struct JYogaValue : public facebook::jni::JavaClass<JYogaValue> {
-  constexpr static auto kJavaDescriptor = "Lcom/facebook/yoga/YogaValue;";
-
-  static facebook::jni::local_ref<javaobject> create(YGValue value) {
-    return newInstance(value.value, static_cast<int>(value.unit));
-  }
-};

java/tests/com/facebook/yoga/YogaNodeStylePropertiesTest.java

@@ -1,9 +1,8 @@
-/*
- *  Copyright (c) Facebook, Inc. and its affiliates.
- *
- *  This source code is licensed under the MIT license found in the LICENSE
- *  file in the root directory of this source tree.
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
  *
+ * This source code is licensed under the MIT license found in the LICENSE
+ * file in the root directory of this source tree.
  */
 package com.facebook.yoga;
 
@@ -401,6 +400,21 @@ public class YogaNodeStylePropertiesTest {
     }
   }
 
+  @Test
+  public void testNegativeMarginAssignment() {
+    final YogaNode node = createNode();
+    for (YogaEdge edge : YogaEdge.values()) {
+      node.setMargin(edge, -25);
+      assertEquals(new YogaValue(-25, YogaUnit.POINT), node.getMargin(edge));
+
+      node.setMarginPercent(edge, -5);
+      assertEquals(new YogaValue(-5, YogaUnit.PERCENT), node.getMargin(edge));
+
+      node.setMarginAuto(edge);
+      assertEquals(YogaValue.AUTO, node.getMargin(edge));
+    }
+  }
+
   @Test
   public void testMarginPointAffectsLayout() {
     final YogaNode node = style().margin(YogaEdge.TOP, 42).node();