From a3296ff40fe0d960f61684346d5e1dd05a523389 Mon Sep 17 00:00:00 2001 From: Yuan Du Date: Sat, 23 Mar 2019 13:05:12 -0700 Subject: [PATCH] Revert D14572430: [Fabric][Android] ReactTTRCRenderFlag component in Fabric android Differential Revision: D14572430 Original commit changeset: 0e7c6cb5520b fbshipit-source-id: 2cde5c9316c055c3836aab656a06c508f3e468af --- .../react/fabric/FabricUIManager.java | 1 - .../fabric/components/view/conversions.h | 22 +++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java index b714850e9..22b08f14f 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java @@ -81,7 +81,6 @@ public class FabricUIManager implements UIManager, LifecycleEventListener { sComponentNames.put("ScrollView", "RCTScrollView"); sComponentNames.put("Slider", "RCTSlider"); sComponentNames.put("ReactPerformanceLoggerFlag", "ReactPerformanceLoggerFlag"); - sComponentNames.put("ReactTTRCRenderFlag", "ReactTTRCRenderFlag"); sComponentNames.put("Paragraph", "RCTText"); sComponentNames.put("Text", "RCText"); sComponentNames.put("RawText", "RCTRawText"); diff --git a/ReactCommon/fabric/components/view/conversions.h b/ReactCommon/fabric/components/view/conversions.h index 4599d87ea..82d1556f7 100644 --- a/ReactCommon/fabric/components/view/conversions.h +++ b/ReactCommon/fabric/components/view/conversions.h @@ -144,7 +144,7 @@ inline void fromRawValue(const RawValue &value, YGDirection &result) { result = YGDirectionRTL; return; } - LOG(FATAL) << "Could not parse YGDirection:" << stringValue; + LOG(FATAL) << "Could not parse YGDirection " << stringValue; } inline void fromRawValue(const RawValue &value, YGFlexDirection &result) { @@ -166,7 +166,7 @@ inline void fromRawValue(const RawValue &value, YGFlexDirection &result) { result = YGFlexDirectionRowReverse; return; } - LOG(FATAL) << "Could not parse YGFlexDirection:" << stringValue; + LOG(FATAL) << "Could not parse YGFlexDirection " << stringValue; } inline void fromRawValue(const RawValue &value, YGJustify &result) { @@ -196,7 +196,7 @@ inline void fromRawValue(const RawValue &value, YGJustify &result) { result = YGJustifySpaceEvenly; return; } - LOG(FATAL) << "Could not parse YGJustify:" << stringValue; + LOG(FATAL) << "Could not parse YGJustify " << stringValue; } inline void fromRawValue(const RawValue &value, YGAlign &result) { @@ -234,7 +234,7 @@ inline void fromRawValue(const RawValue &value, YGAlign &result) { result = YGAlignSpaceAround; return; } - LOG(FATAL) << "Could not parse YGAlign:" << stringValue; + LOG(FATAL) << "Could not parse YGAlign " << stringValue; } inline void fromRawValue(const RawValue &value, YGPositionType &result) { @@ -248,7 +248,7 @@ inline void fromRawValue(const RawValue &value, YGPositionType &result) { result = YGPositionTypeAbsolute; return; } - LOG(FATAL) << "Could not parse YGPositionType:" << stringValue; + LOG(FATAL) << "Could not parse YGPositionType " << stringValue; } inline void fromRawValue(const RawValue &value, YGWrap &result) { @@ -266,7 +266,7 @@ inline void fromRawValue(const RawValue &value, YGWrap &result) { result = YGWrapWrapReverse; return; } - LOG(FATAL) << "Could not parse YGWrap:" << stringValue; + LOG(FATAL) << "Could not parse YGWrap " << stringValue; } inline void fromRawValue(const RawValue &value, YGOverflow &result) { @@ -284,7 +284,7 @@ inline void fromRawValue(const RawValue &value, YGOverflow &result) { result = YGOverflowScroll; return; } - LOG(FATAL) << "Could not parse YGOverflow:" << stringValue; + LOG(FATAL) << "Could not parse YGOverflow " << stringValue; } inline void fromRawValue(const RawValue &value, YGDisplay &result) { @@ -298,7 +298,7 @@ inline void fromRawValue(const RawValue &value, YGDisplay &result) { result = YGDisplayNone; return; } - LOG(FATAL) << "Could not parse YGDisplay:" << stringValue; + LOG(FATAL) << "Could not parse YGDisplay " << stringValue; } inline void fromRawValue( @@ -338,7 +338,7 @@ inline void fromRawValue(const RawValue &value, YGFloatOptional &result) { return; } } - LOG(FATAL) << "Could not parse YGFloatOptional"; + LOG(FATAL) << "Could not parse YGFloatOptional " << value; } inline Float toRadians(const RawValue &value) { @@ -442,7 +442,7 @@ inline void fromRawValue(const RawValue &value, PointerEventsMode &result) { result = PointerEventsMode::BoxOnly; return; } - LOG(FATAL) << "Could not parse PointerEventsMode:" << stringValue; + LOG(FATAL) << "Could not parse PointerEventsMode " << stringValue; } inline void fromRawValue(const RawValue &value, BorderStyle &result) { @@ -460,7 +460,7 @@ inline void fromRawValue(const RawValue &value, BorderStyle &result) { result = BorderStyle::Dashed; return; } - LOG(FATAL) << "Could not parse BorderStyle:" << stringValue; + LOG(FATAL) << "Could not parse BorderStyle " << stringValue; } inline std::string toString(