Fabric: Debug Pretty-printing is now debug only feature

Summary: That should save us some app size kilobytes. Reviewed By: mdvacca Differential Revision: D10081499 fbshipit-source-id: 2b950768c609b412f9be332c22b6b1e96657e5ea
facebook · Sep 28, 2018 · e3b61f5 · e3b61f5
1 parent 02ad56f
commit e3b61f5
Show file tree

Hide file tree

Showing 39 changed files with 102 additions and 31 deletions.
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.cpp b/ReactCommon/fabric/attributedstring/AttributedString.cpp
@@ -81,6 +81,7 @@ bool AttributedString::operator!=(const AttributedString &rhs) const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList AttributedString::getDebugChildren() const {
   auto list = SharedDebugStringConvertibleList {};
 
@@ -103,6 +104,7 @@ SharedDebugStringConvertibleList AttributedString::getDebugChildren() const {
 
   return list;
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/AttributedString.h b/ReactCommon/fabric/attributedstring/AttributedString.h
@@ -77,7 +77,9 @@ class AttributedString:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugChildren() const override;
+#endif
 
 private:
 

diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp b/ReactCommon/fabric/attributedstring/ParagraphAttributes.cpp
@@ -16,6 +16,7 @@ namespace react {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
   return {
     debugStringConvertibleItem("maximumNumberOfLines", maximumNumberOfLines),
@@ -25,6 +26,7 @@ SharedDebugStringConvertibleList ParagraphAttributes::getDebugProps() const {
     debugStringConvertibleItem("maximumFontSize", maximumFontSize)
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/ParagraphAttributes.h b/ReactCommon/fabric/attributedstring/ParagraphAttributes.h
@@ -58,7 +58,9 @@ class ParagraphAttributes:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.cpp b/ReactCommon/fabric/attributedstring/TextAttributes.cpp
@@ -115,6 +115,7 @@ bool TextAttributes::operator!=(const TextAttributes &rhs) const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
   return {
     // Color
@@ -153,6 +154,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const {
     debugStringConvertibleItem("layoutDirection", layoutDirection),
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/attributedstring/TextAttributes.h b/ReactCommon/fabric/attributedstring/TextAttributes.h
@@ -78,7 +78,9 @@ class TextAttributes:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/image/ImageLocalData.cpp b/ReactCommon/fabric/components/image/ImageLocalData.cpp
@@ -23,6 +23,7 @@ const ImageRequest &ImageLocalData::getImageRequest() const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ImageLocalData::getDebugName() const {
   return "ImageLocalData";
 }
@@ -32,6 +33,7 @@ SharedDebugStringConvertibleList ImageLocalData::getDebugProps() const {
     debugStringConvertibleItem("imageSource", imageSource_)
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/image/ImageLocalData.h b/ReactCommon/fabric/components/image/ImageLocalData.h
@@ -44,8 +44,10 @@ class ImageLocalData:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 
 private:
 

diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.cpp
@@ -22,6 +22,7 @@ Size ScrollViewLocalData::getContentSize() const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ScrollViewLocalData::getDebugName() const {
   return "ScrollViewLocalData";
 }
@@ -31,6 +32,7 @@ SharedDebugStringConvertibleList ScrollViewLocalData::getDebugProps() const {
     debugStringConvertibleItem("contentBoundingRect", contentBoundingRect)
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h b/ReactCommon/fabric/components/scrollview/ScrollViewLocalData.h
@@ -38,8 +38,10 @@ class ScrollViewLocalData:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp b/ReactCommon/fabric/components/scrollview/ScrollViewProps.cpp
@@ -46,6 +46,7 @@ ScrollViewProps::ScrollViewProps(const ScrollViewProps &sourceProps, const RawPr
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
   auto defaultScrollViewProps = ScrollViewProps {};
 
@@ -79,6 +80,7 @@ SharedDebugStringConvertibleList ScrollViewProps::getDebugProps() const {
       debugStringConvertibleItem("snapToAlignment", snapToAlignment, defaultScrollViewProps.snapToAlignment),
     };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/scrollview/ScrollViewProps.h b/ReactCommon/fabric/components/scrollview/ScrollViewProps.h
@@ -51,7 +51,9 @@ class ScrollViewProps final:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp b/ReactCommon/fabric/components/text/basetext/BaseTextProps.cpp
@@ -60,9 +60,11 @@ BaseTextProps::BaseTextProps(const BaseTextProps &sourceProps, const RawProps &r
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList BaseTextProps::getDebugProps() const {
   return textAttributes.getDebugProps();
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/basetext/BaseTextProps.h b/ReactCommon/fabric/components/text/basetext/BaseTextProps.h
@@ -31,7 +31,9 @@ class BaseTextProps {
 
 #pragma mark - DebugStringConvertible (partially)
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.cpp
@@ -37,6 +37,7 @@ folly::dynamic ParagraphLocalData::getDynamic() const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 std::string ParagraphLocalData::getDebugName() const {
   return "ParagraphLocalData";
 }
@@ -46,6 +47,7 @@ SharedDebugStringConvertibleList ParagraphLocalData::getDebugProps() const {
     debugStringConvertibleItem("attributedString", attributedString_, "")
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h b/ReactCommon/fabric/components/text/paragraph/ParagraphLocalData.h
@@ -45,8 +45,10 @@ class ParagraphLocalData:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   std::string getDebugName() const override;
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 
 private:
 

diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.cpp
@@ -34,6 +34,7 @@ ParagraphProps::ParagraphProps(const ParagraphProps &sourceProps, const RawProps
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
   return
     ViewProps::getDebugProps() +
@@ -43,6 +44,7 @@ SharedDebugStringConvertibleList ParagraphProps::getDebugProps() const {
       debugStringConvertibleItem("isSelectable", isSelectable)
     };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h b/ReactCommon/fabric/components/text/paragraph/ParagraphProps.h
@@ -45,8 +45,9 @@ class ParagraphProps:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
-
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp b/ReactCommon/fabric/components/text/rawtext/RawTextProps.cpp
@@ -19,11 +19,13 @@ RawTextProps::RawTextProps(const RawTextProps &sourceProps, const RawProps &rawP
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList RawTextProps::getDebugProps() const {
   return {
     debugStringConvertibleItem("text", text)
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/rawtext/RawTextProps.h b/ReactCommon/fabric/components/text/rawtext/RawTextProps.h
@@ -32,7 +32,9 @@ class RawTextProps:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/text/text/TextProps.cpp b/ReactCommon/fabric/components/text/text/TextProps.cpp
@@ -15,9 +15,11 @@ TextProps::TextProps(const TextProps &sourceProps, const RawProps &rawProps):
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList TextProps::getDebugProps() const {
   return BaseTextProps::getDebugProps();
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/text/text/TextProps.h b/ReactCommon/fabric/components/text/text/TextProps.h
@@ -26,7 +26,9 @@ class TextProps:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h b/ReactCommon/fabric/components/view/ConcreteViewShadowNode.h
@@ -115,6 +115,7 @@ class ConcreteViewShadowNode:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override {
     auto list = SharedDebugStringConvertibleList {};
 
@@ -125,7 +126,7 @@ class ConcreteViewShadowNode:
 
     return list;
   }
-
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/view/ViewProps.cpp b/ReactCommon/fabric/components/view/ViewProps.cpp
@@ -65,6 +65,7 @@ BorderMetrics ViewProps::resolveBorderMetrics(bool isRTL) const {
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
   const auto &defaultViewProps = ViewProps();
 
@@ -78,6 +79,7 @@ SharedDebugStringConvertibleList ViewProps::getDebugProps() const {
       debugStringConvertibleItem("backgroundColor", backgroundColor, defaultViewProps.backgroundColor),
     };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/view/ViewProps.h b/ReactCommon/fabric/components/view/ViewProps.h
@@ -66,7 +66,9 @@ class ViewProps:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const override;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.cpp
@@ -27,6 +27,7 @@ YogaStylableProps::YogaStylableProps(const YogaStylableProps &sourceProps, const
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
   auto defaultYogaStyle = YGStyle {};
   return {
@@ -54,6 +55,7 @@ SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const {
     debugStringConvertibleItem("aspectRatio", yogaStyle.aspectRatio, defaultYogaStyle.aspectRatio),
   };
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h b/ReactCommon/fabric/components/view/yoga/YogaStylableProps.h
@@ -33,7 +33,9 @@ class YogaStylableProps {
 
 #pragma mark - DebugStringConvertible (Partial)
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 };
 
 } // namespace react

diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp b/ReactCommon/fabric/core/layout/LayoutableShadowNode.cpp
@@ -94,6 +94,7 @@ void LayoutableShadowNode::layoutChildren(LayoutContext layoutContext) {
   // Default implementation does nothing.
 }
 
+#if RN_DEBUG_STRING_CONVERTIBLE
 SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const {
   auto list = SharedDebugStringConvertibleList {};
 
@@ -128,6 +129,7 @@ SharedDebugStringConvertibleList LayoutableShadowNode::getDebugProps() const {
 
   return list;
 }
+#endif
 
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/fabric/core/layout/LayoutableShadowNode.h b/ReactCommon/fabric/core/layout/LayoutableShadowNode.h
@@ -108,7 +108,9 @@ class LayoutableShadowNode:
 
 #pragma mark - DebugStringConvertible
 
+#if RN_DEBUG_STRING_CONVERTIBLE
   SharedDebugStringConvertibleList getDebugProps() const;
+#endif
 
 private:
   LayoutMetrics layoutMetrics_ {};

diff --git a/ReactCommon/fabric/core/shadownode/LocalData.h b/ReactCommon/fabric/core/shadownode/LocalData.h
@@ -30,10 +30,12 @@ class LocalData:
   public Sealable,
   public DebugStringConvertible {
 
-  public:
-     virtual folly::dynamic getDynamic() const {
-       return folly::dynamic::object();
-     };
+public:
+  virtual ~LocalData() = default;
+
+  virtual folly::dynamic getDynamic() const {
+    return folly::dynamic::object();
+  }
 };
 
 } // namespace react