Revert D45904748: Move LayoutMetrics and LayoutPrimitives from core to graphics folder

Differential Revision:
D45904748

Original commit changeset: a4e666d7c739

Original Phabricator Diff: D45904748

fbshipit-source-id: c2da28836cb51966854c81d4e380a2abeb742cda

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.h

@@ -14,8 +14,8 @@
 #import <react/renderer/components/view/ViewEventEmitter.h>
 #import <react/renderer/components/view/ViewProps.h>
 #import <react/renderer/core/EventEmitter.h>
+#import <react/renderer/core/LayoutMetrics.h>
 #import <react/renderer/core/Props.h>
-#import <react/renderer/graphics/LayoutMetrics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/react-native/React/Fabric/Mounting/RCTComponentViewProtocol.h

@@ -9,9 +9,9 @@
 
 #import <react/renderer/componentregistry/ComponentDescriptorProvider.h>
 #import <react/renderer/core/EventEmitter.h>
+#import <react/renderer/core/LayoutMetrics.h>
 #import <react/renderer/core/Props.h>
 #import <react/renderer/core/State.h>
-#import <react/renderer/graphics/LayoutMetrics.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

packages/react-native/React/Fabric/RCTConversions.h

@@ -9,8 +9,8 @@
 
 #import <react/renderer/components/view/AccessibilityPrimitives.h>
 #import <react/renderer/components/view/primitives.h>
+#import <react/renderer/core/LayoutPrimitives.h>
 #import <react/renderer/graphics/Color.h>
-#import <react/renderer/graphics/LayoutPrimitives.h>
 #import <react/renderer/graphics/Transform.h>
 
 NS_ASSUME_NONNULL_BEGIN

packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp

@@ -20,10 +20,10 @@
 #include <react/renderer/components/image/ImageProps.h>
 #include <react/renderer/components/view/ViewProps.h>
 #include <react/renderer/core/ComponentDescriptor.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/core/RawValue.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
 #include <react/renderer/mounting/ShadowView.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>

packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h

@@ -14,11 +14,11 @@
 #include <folly/Hash.h>
 #include <react/renderer/attributedstring/primitives.h>
 #include <react/renderer/components/view/AccessibilityPrimitives.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/graphics/Color.h>
 #include <react/renderer/graphics/Float.h>
-#include <react/renderer/graphics/LayoutPrimitives.h>
 #include <react/renderer/graphics/Size.h>
 
 namespace facebook::react {

packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp

@@ -8,7 +8,7 @@
 #include "ScrollViewShadowNode.h"
 
 #include <react/debug/react_native_assert.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
+#include <react/renderer/core/LayoutMetrics.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.h

@@ -10,9 +10,9 @@
 #include <react/renderer/components/view/PointerEvent.h>
 #include <react/renderer/components/view/TouchEvent.h>
 #include <react/renderer/core/EventEmitter.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/components/view/ViewEventEmitter.h

@@ -10,8 +10,8 @@
 #include <memory>
 #include <mutex>
 
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 
 #include "TouchEventEmitter.h"
 

packages/react-native/ReactCommon/react/renderer/components/view/ViewProps.h

@@ -10,10 +10,10 @@
 #include <react/renderer/components/view/AccessibilityProps.h>
 #include <react/renderer/components/view/YogaStylableProps.h>
 #include <react/renderer/components/view/primitives.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/PropsParserContext.h>
 #include <react/renderer/graphics/Color.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 #include <react/renderer/graphics/Transform.h>
 
 #include <optional>

packages/react-native/ReactCommon/react/renderer/components/view/conversions.h

@@ -13,8 +13,8 @@
 #include <glog/logging.h>
 #include <react/debug/react_native_expect.h>
 #include <react/renderer/components/view/primitives.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/PropsParserContext.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 #include <react/renderer/graphics/Transform.h>
 #include <stdlib.h>
 #include <yoga/YGEnums.h>

packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h

@@ -10,7 +10,7 @@
 #include <limits>
 
 #include <folly/Hash.h>
-#include <react/renderer/graphics/LayoutPrimitives.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/graphics/Size.h>
 
 namespace facebook::react {

packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h

@@ -8,9 +8,9 @@
 #pragma once
 
 #include <folly/Hash.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
 #include <react/renderer/debug/flags.h>
-#include <react/renderer/graphics/LayoutPrimitives.h>
 #include <react/renderer/graphics/Rect.h>
 #include <react/renderer/graphics/RectangleEdges.h>
 

packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp

@@ -9,11 +9,11 @@
 
 #include <react/renderer/core/LayoutConstraints.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/TraitCast.h>
 #include <react/renderer/core/graphicsConversions.h>
 #include <react/renderer/debug/DebugStringConvertibleItem.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h

@@ -14,10 +14,10 @@
 
 #include <butter/small_vector.h>
 #include <react/debug/react_native_assert.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/core/ShadowNodeFragment.h>
 #include <react/renderer/debug/DebugStringConvertible.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 #include <react/renderer/graphics/Transform.h>
 
 namespace facebook::react {

packages/react-native/ReactCommon/react/renderer/core/conversions.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/renderer/graphics/LayoutPrimitives.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp

@@ -11,6 +11,7 @@
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewShadowNode.h>
 #include <react/renderer/core/LayoutContext.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/debug/SystraceSection.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
 #include <react/renderer/mounting/ShadowViewMutation.h>

packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp

@@ -7,9 +7,9 @@
 
 #include "ShadowView.h"
 
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/LayoutableShadowNode.h>
 #include <react/renderer/core/TraitCast.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h

@@ -10,11 +10,11 @@
 #include <butter/small_vector.h>
 #include <folly/Hash.h>
 #include <react/renderer/core/EventEmitter.h>
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/renderer/core/ShadowNode.h>
 #include <react/renderer/debug/flags.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 
 namespace facebook::react {
 

packages/react-native/ReactCommon/react/renderer/mounting/StubView.h

@@ -10,9 +10,9 @@
 #include <memory>
 #include <vector>
 
+#include <react/renderer/core/LayoutMetrics.h>
 #include <react/renderer/core/State.h>
 #include <react/renderer/debug/debugStringConvertibleUtils.h>
-#include <react/renderer/graphics/LayoutMetrics.h>
 #include <react/renderer/mounting/ShadowView.h>
 
 namespace facebook::react {

packages/react-native/ReactCommon/react/renderer/timeline/TimelineFrame.h

@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <react/renderer/graphics/LayoutPrimitives.h>
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>
 #include <react/utils/Telemetry.h>
 

packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.h

@@ -7,6 +7,7 @@
 
 #pragma once
 
+#include <react/renderer/core/LayoutPrimitives.h>
 #include <react/renderer/timeline/TimelineFrame.h>
 #include <react/renderer/uimanager/UIManagerCommitHook.h>