From 91387129346ea7bc7a90fa23cd4b2d5710985d52 Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Tue, 15 Nov 2022 08:06:45 -0800 Subject: [PATCH] decouple various files from Geometry.h Summary: a lot of files were depending on Geometry even though they didn't use Vector, this will help with future modularity Changelog: [Internal] Reviewed By: sammy-SC Differential Revision: D41127194 fbshipit-source-id: 024519c638a1f0df3fdbfbdd937eac84b9adee6e --- .../react/renderer/attributedstring/TextAttributes.h | 3 ++- .../renderer/components/safeareaview/SafeAreaViewState.h | 2 +- .../react/renderer/components/scrollview/ScrollViewState.h | 5 ++++- ReactCommon/react/renderer/components/view/PointerEvent.h | 2 +- ReactCommon/react/renderer/components/view/Touch.h | 2 +- ReactCommon/react/renderer/components/view/primitives.h | 3 ++- ReactCommon/react/renderer/core/LayoutConstraints.h | 2 +- ReactCommon/react/renderer/core/LayoutMetrics.h | 3 ++- ReactCommon/react/renderer/graphics/Geometry.h | 5 ----- ReactCommon/react/renderer/graphics/Transform.h | 3 +++ ReactCommon/react/renderer/graphics/conversions.h | 6 +++++- ReactCommon/react/renderer/imagemanager/primitives.h | 3 ++- 12 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/ReactCommon/react/renderer/attributedstring/TextAttributes.h index 69400f2ed17..4d1a19a04bc 100644 --- a/ReactCommon/react/renderer/attributedstring/TextAttributes.h +++ b/ReactCommon/react/renderer/attributedstring/TextAttributes.h @@ -17,7 +17,8 @@ #include #include #include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h index a2d272b8c6e..6216cf664ab 100644 --- a/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h +++ b/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewState.h @@ -7,7 +7,7 @@ #pragma once -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h index d0846baecc6..7d767b52e8f 100644 --- a/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h +++ b/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h @@ -7,7 +7,10 @@ #pragma once -#include +#include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/react/renderer/components/view/PointerEvent.h b/ReactCommon/react/renderer/components/view/PointerEvent.h index bc724c54e9b..6b0022eeb9b 100644 --- a/ReactCommon/react/renderer/components/view/PointerEvent.h +++ b/ReactCommon/react/renderer/components/view/PointerEvent.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/components/view/Touch.h b/ReactCommon/react/renderer/components/view/Touch.h index 415fdc49943..14afeb52dd8 100644 --- a/ReactCommon/react/renderer/components/view/Touch.h +++ b/ReactCommon/react/renderer/components/view/Touch.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/components/view/primitives.h b/ReactCommon/react/renderer/components/view/primitives.h index 1ecf4415626..b3ab4cfe0fb 100644 --- a/ReactCommon/react/renderer/components/view/primitives.h +++ b/ReactCommon/react/renderer/components/view/primitives.h @@ -8,7 +8,8 @@ #pragma once #include -#include +#include +#include #include #include diff --git a/ReactCommon/react/renderer/core/LayoutConstraints.h b/ReactCommon/react/renderer/core/LayoutConstraints.h index fd21538a0f7..4212e972234 100644 --- a/ReactCommon/react/renderer/core/LayoutConstraints.h +++ b/ReactCommon/react/renderer/core/LayoutConstraints.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/core/LayoutMetrics.h b/ReactCommon/react/renderer/core/LayoutMetrics.h index 2ba3b5dfc07..97bc25f3319 100644 --- a/ReactCommon/react/renderer/core/LayoutMetrics.h +++ b/ReactCommon/react/renderer/core/LayoutMetrics.h @@ -11,7 +11,8 @@ #include #include #include -#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/graphics/Geometry.h b/ReactCommon/react/renderer/graphics/Geometry.h index 409ee06667f..f8b8f7b94be 100644 --- a/ReactCommon/react/renderer/graphics/Geometry.h +++ b/ReactCommon/react/renderer/graphics/Geometry.h @@ -8,11 +8,6 @@ #pragma once #include -#include -#include -#include -#include -#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/graphics/Transform.h b/ReactCommon/react/renderer/graphics/Transform.h index 50a70161207..76c0d1d6cea 100644 --- a/ReactCommon/react/renderer/graphics/Transform.h +++ b/ReactCommon/react/renderer/graphics/Transform.h @@ -13,6 +13,9 @@ #include #include #include +#include +#include +#include #ifdef ANDROID #include diff --git a/ReactCommon/react/renderer/graphics/conversions.h b/ReactCommon/react/renderer/graphics/conversions.h index cb7aa05ee6d..8ce4f341f79 100644 --- a/ReactCommon/react/renderer/graphics/conversions.h +++ b/ReactCommon/react/renderer/graphics/conversions.h @@ -13,8 +13,12 @@ #include #include #include -#include #include +#include +#include +#include +#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/react/renderer/imagemanager/primitives.h b/ReactCommon/react/renderer/imagemanager/primitives.h index 0d9ec9fc253..a818b62b531 100644 --- a/ReactCommon/react/renderer/imagemanager/primitives.h +++ b/ReactCommon/react/renderer/imagemanager/primitives.h @@ -10,7 +10,8 @@ #include #include -#include +#include +#include namespace facebook { namespace react {