Skip to content

Commit 7f600b9

Browse files
j-piaseckifacebook-github-bot
authored andcommitted
Use umbrellas instead of direct includes in renderer/imagemanager module (#58708)
Summary: Changelog: [Internal] Part of the C++ stable API migration to umbrella includes. The `renderer/imagemanager` headers included other public modules through their fine-grained, `UmbrellaGuard`-protected headers. They now include those modules' umbrellas instead: `<React/RendererCore.h>`, `<React/Utils.h>`, `<React/Graphics.h>`, `<React/Debug.h>`, `<React/RendererDebug.h>`, `<React/FeatureFlags.h>` and `<React/MapBuffer.h>`. Includes of the module's own headers and all `.cpp`/`.mm` files are unchanged. No functional change. Differential Revision: D122119728
1 parent 108c94b commit 7f600b9

11 files changed

Lines changed: 19 additions & 23 deletions

File tree

‎packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
#include <memory>
1313

14-
#include <react/renderer/core/ReactPrimitives.h>
14+
#include <React/RendererCore.h>
15+
#include <React/Utils.h>
1516
#include <react/renderer/imagemanager/ImageRequest.h>
1617
#include <react/renderer/imagemanager/ImageRequestParams.h>
1718
#include <react/renderer/imagemanager/primitives.h>
18-
#include <react/utils/ContextContainer.h>
1919

2020
namespace facebook::react {
2121

‎packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12+
#include <React/Utils.h>
1213
#include <react/renderer/imagemanager/ImageResponse.h>
1314
#include <react/renderer/imagemanager/ImageResponseObserver.h>
1415
#include <react/renderer/imagemanager/ImageResponseObserverCoordinator.h>
1516
#include <react/renderer/imagemanager/ImageTelemetry.h>
1617
#include <react/renderer/imagemanager/primitives.h>
17-
#include <react/utils/SharedFunction.h>
1818

1919
namespace facebook::react {
2020

‎packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12+
#include <React/Utils.h>
1213
#include <react/renderer/imagemanager/ImageResponse.h>
1314
#include <react/renderer/imagemanager/ImageResponseObserver.h>
14-
#include <react/utils/SharedFunction.h>
1515

1616
#include <memory>
1717
#include <mutex>

‎packages/react-native/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12-
#include <react/renderer/core/ReactPrimitives.h>
13-
#include <react/utils/Telemetry.h>
12+
#include <React/RendererCore.h>
13+
#include <React/Utils.h>
1414

1515
namespace facebook::react {
1616

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
#include <react/cxxstableapi/PrivateGuard.h>
1111

12+
#include <React/Utils.h>
1213
#include <react/renderer/imagemanager/ImageRequest.h>
1314
#include <react/renderer/imagemanager/ImageRequestParams.h>
14-
#include <react/utils/ContextContainer.h>
1515
#include <memory>
1616
#include <mutex>
1717
#include <unordered_map>

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111

1212
#include <utility>
1313

14-
#include <react/renderer/graphics/Color.h>
15-
#include <react/renderer/graphics/Float.h>
14+
#include <React/Graphics.h>
1615
#include <react/renderer/imagemanager/primitives.h>
1716

1817
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99

1010
#include <react/cxxstableapi/PrivateGuard.h>
1111

12-
#include <react/featureflags/ReactNativeFeatureFlags.h>
13-
#include <react/renderer/core/graphicsConversions.h>
12+
#include <React/FeatureFlags.h>
13+
#include <React/MapBuffer.h>
14+
#include <React/RendererCore.h>
15+
#include <React/Utils.h>
1416
#include <react/renderer/imagemanager/ImageRequestParams.h>
1517
#include <react/renderer/imagemanager/primitives.h>
16-
#include <react/renderer/mapbuffer/MapBuffer.h>
17-
#include <react/renderer/mapbuffer/MapBufferBuilder.h>
18-
#include <react/utils/to_underlying.h>
1918
#include <vector>
2019

2120
namespace facebook::react {

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequestParams.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12-
#include <react/renderer/graphics/Float.h>
12+
#include <React/Graphics.h>
1313

1414
namespace facebook::react {
1515

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequestParams.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include <react/cxxstableapi/UmbrellaGuard.h>
1111

12-
#include <react/renderer/graphics/Float.h>
12+
#include <React/Graphics.h>
1313

1414
namespace facebook::react {
1515

‎packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/RCTImageManagerProtocol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88
#import <Foundation/Foundation.h>
9-
#import <react/renderer/core/ReactPrimitives.h>
9+
#import <React/RendererCore.h>
1010
#import <react/renderer/imagemanager/ImageRequest.h>
1111

1212
@protocol RCTImageManagerProtocol <NSObject>

0 commit comments

Comments
 (0)