From 25566ef28b9a20212c9fe7e61653b7787b9ab00e Mon Sep 17 00:00:00 2001 From: David Aurelio Date: Thu, 21 Feb 2019 05:35:52 -0800 Subject: [PATCH] `setBaseLine` -> `setBaseline` Summary: @public `setBaseLine` was the only place where we used a capitalised *L.* Fixed here. Reviewed By: SidharthGuglani Differential Revision: D14152320 fbshipit-source-id: abf54fe7d6088e03775968baa8421c4bf43d6a6e --- .../src/main/jni/first-party/yogajni/jni/YGJNI.cpp | 2 +- ReactCommon/yoga/yoga/YGNode.h | 10 +++++----- ReactCommon/yoga/yoga/Yoga.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp index c6b4d9139..a249b2e6f 100644 --- a/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp +++ b/ReactAndroid/src/main/jni/first-party/yogajni/jni/YGJNI.cpp @@ -478,7 +478,7 @@ void jni_YGNodeSetHasBaselineFunc( jlong nativePointer, jboolean hasBaselineFunc) { _jlong2YGNodeRef(nativePointer) - ->setBaseLineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr); + ->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr); } void jni_YGNodeCopyStyle(jlong dstNativePointer, jlong srcNativePointer) { diff --git a/ReactCommon/yoga/yoga/YGNode.h b/ReactCommon/yoga/yoga/YGNode.h index 0eee85e7e..cf2367284 100644 --- a/ReactCommon/yoga/yoga/YGNode.h +++ b/ReactCommon/yoga/yoga/YGNode.h @@ -53,7 +53,7 @@ private: const float axisSize) const; void setMeasureFunc(decltype(measure_)); - void setBaseLineFunc(decltype(baseline_)); + void setBaselineFunc(decltype(baseline_)); public: YGNode() @@ -251,16 +251,16 @@ public: return setMeasureFunc(YGMeasureFunc{nullptr}); } - void setBaseLineFunc(YGBaselineFunc baseLineFunc) { + void setBaselineFunc(YGBaselineFunc baseLineFunc) { baselineUsesContext_ = false; baseline_.noContext = baseLineFunc; } - void setBaseLineFunc(BaselineWithContextFn baseLineFunc) { + void setBaselineFunc(BaselineWithContextFn baseLineFunc) { baselineUsesContext_ = true; baseline_.withContext = baseLineFunc; } - void setBaseLineFunc(std::nullptr_t) { - return setBaseLineFunc(YGBaselineFunc{nullptr}); + void setBaselineFunc(std::nullptr_t) { + return setBaselineFunc(YGBaselineFunc{nullptr}); } void setDirtiedFunc(YGDirtiedFunc dirtiedFunc) { diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp index ebba2476d..bbdf724e9 100644 --- a/ReactCommon/yoga/yoga/Yoga.cpp +++ b/ReactCommon/yoga/yoga/Yoga.cpp @@ -158,7 +158,7 @@ bool YGNodeHasBaselineFunc(YGNodeRef node) { } void YGNodeSetBaselineFunc(YGNodeRef node, YGBaselineFunc baselineFunc) { - node->setBaseLineFunc(baselineFunc); + node->setBaselineFunc(baselineFunc); } YGDirtiedFunc YGNodeGetDirtiedFunc(YGNodeRef node) {