From 792585fd48cf6a92b32e61bd8b1c09c0da39c826 Mon Sep 17 00:00:00 2001 From: Valentin Shergin Date: Fri, 12 Apr 2019 15:10:40 -0700 Subject: [PATCH] Fabric: ContextContainer was moved to `utils` module Summary: That allows avoiding circular deps and unnecessary deps on uimanager module. Reviewed By: PeteTheHeat Differential Revision: D14917227 fbshipit-source-id: fe7962ee528aa659d8bd23e3e46627722551d995 --- RNTester/ComponentRegistry.cpp | 2 +- React/Fabric/RCTScheduler.mm | 2 +- React/Fabric/RCTSurfacePresenter.h | 2 +- React/Fabric/RCTSurfacePresenter.mm | 2 +- .../com/facebook/react/fabric/jsi/jni/Binding.cpp | 2 +- .../react/fabric/jsi/jni/ComponentFactoryDelegate.h | 2 +- .../components/image/ImageComponentDescriptor.h | 2 +- .../platform/android/SliderMeasurementsManager.h | 2 +- .../slider/platform/ios/SliderMeasurementsManager.h | 2 +- .../text/paragraph/ParagraphComponentDescriptor.h | 4 ++-- .../fabric/sample/SampleComponentDescriptorFactor.cpp | 2 +- .../platform/android/TextLayoutManager.h | 2 +- .../platform/ios/TextLayoutManager.h | 2 +- .../fabric/uimanager/ComponentDescriptorFactory.h | 2 +- ReactCommon/fabric/uimanager/Scheduler.h | 2 +- .../uimanager/tests/UITemplateProcessorTest.cpp | 2 +- .../{fabric/uimanager => utils}/ContextContainer.h | 11 +++++------ 17 files changed, 22 insertions(+), 23 deletions(-) rename ReactCommon/{fabric/uimanager => utils}/ContextContainer.h (86%) diff --git a/RNTester/ComponentRegistry.cpp b/RNTester/ComponentRegistry.cpp index 2b516312d0f..44ec5759f84 100644 --- a/RNTester/ComponentRegistry.cpp +++ b/RNTester/ComponentRegistry.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/React/Fabric/RCTScheduler.mm b/React/Fabric/RCTScheduler.mm index edb9eff1436..3594c3c03fe 100644 --- a/React/Fabric/RCTScheduler.mm +++ b/React/Fabric/RCTScheduler.mm @@ -9,9 +9,9 @@ #import #import -#import #import #import +#import #import diff --git a/React/Fabric/RCTSurfacePresenter.h b/React/Fabric/RCTSurfacePresenter.h index e4724250ed6..07c312bddfc 100644 --- a/React/Fabric/RCTSurfacePresenter.h +++ b/React/Fabric/RCTSurfacePresenter.h @@ -12,7 +12,7 @@ #import #import #import -#import +#import NS_ASSUME_NONNULL_BEGIN diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index a441331087f..bfb00efa675 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -29,7 +29,7 @@ #import #import #import -#import +#import #import "MainRunLoopEventBeat.h" #import "RuntimeEventBeat.h" diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp index 6dfc081c875..bb59ca66a6b 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/Binding.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h index dc6e16b43d5..a215eac89dd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h +++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jsi/jni/ComponentFactoryDelegate.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h index 2a9babcf8bd..2aa36b0a173 100644 --- a/ReactCommon/fabric/components/image/ImageComponentDescriptor.h +++ b/ReactCommon/fabric/components/image/ImageComponentDescriptor.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h index d0515264ac5..219f9a26f5c 100644 --- a/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h +++ b/ReactCommon/fabric/components/slider/platform/android/SliderMeasurementsManager.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h index 2571886edf2..814adc9c1c7 100644 --- a/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h +++ b/ReactCommon/fabric/components/slider/platform/ios/SliderMeasurementsManager.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h index 5cd2dc01398..54234790355 100644 --- a/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h +++ b/ReactCommon/fabric/components/text/paragraph/ParagraphComponentDescriptor.h @@ -11,10 +11,10 @@ #include "ParagraphShadowNode.h" #include +#include #include #include -#include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp index 26e65789eb5..e41e919f0d8 100644 --- a/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp +++ b/ReactCommon/fabric/sample/SampleComponentDescriptorFactor.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h index 811dd55c565..ebd83c20e6e 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h +++ b/ReactCommon/fabric/textlayoutmanager/platform/android/TextLayoutManager.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h index d703f6c50dc..864917830ad 100644 --- a/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h +++ b/ReactCommon/fabric/textlayoutmanager/platform/ios/TextLayoutManager.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h index 380300ecaad..2188b9f413e 100644 --- a/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h +++ b/ReactCommon/fabric/uimanager/ComponentDescriptorFactory.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include "ComponentDescriptorRegistry.h" diff --git a/ReactCommon/fabric/uimanager/Scheduler.h b/ReactCommon/fabric/uimanager/Scheduler.h index 4426eda9a66..297c963b1fa 100644 --- a/ReactCommon/fabric/uimanager/Scheduler.h +++ b/ReactCommon/fabric/uimanager/Scheduler.h @@ -17,11 +17,11 @@ #include #include #include -#include #include #include #include #include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp index f7c2efde78b..49c1e70568d 100644 --- a/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp +++ b/ReactCommon/fabric/uimanager/tests/UITemplateProcessorTest.cpp @@ -23,7 +23,7 @@ using namespace facebook::react; #include #include #include -#include +#include namespace facebook { namespace react { diff --git a/ReactCommon/fabric/uimanager/ContextContainer.h b/ReactCommon/utils/ContextContainer.h similarity index 86% rename from ReactCommon/fabric/uimanager/ContextContainer.h rename to ReactCommon/utils/ContextContainer.h index 3c0170342ea..fc1c6b17d37 100644 --- a/ReactCommon/fabric/uimanager/ContextContainer.h +++ b/ReactCommon/utils/ContextContainer.h @@ -8,10 +8,7 @@ #include #include #include -#include -#include #include -#include #include @@ -28,6 +25,8 @@ using SharedContextContainer = std::shared_ptr; */ class ContextContainer final { public: + using Shared = std::shared_ptr; + /* * Registers an instance of the particular type `T` in the container * using the provided `key`. Only one instance can be registered per key. @@ -39,10 +38,10 @@ class ContextContainer final { *`EmptyReactNativeConfig`. */ template - void registerInstance(const T &instance, const std::string &key) { + void registerInstance(T const &instance, std::string const &key) { std::lock_guard lock(mutex_); - const auto res = instances_.insert({key, std::make_shared(instance)}); + auto res = instances_.insert({key, std::make_shared(instance)}); if (res.second == false) { LOG(FATAL) << "ContextContainer already had instance for key '" << key << "'"; @@ -54,7 +53,7 @@ class ContextContainer final { * for `key`. */ template - T getInstance(const std::string &key) const { + T getInstance(std::string const &key) const { std::lock_guard lock(mutex_); return *std::static_pointer_cast(instances_.at(key));