diff --git a/.clang-format b/.clang-format index bc20b078f0e..a52018f3914 100644 --- a/.clang-format +++ b/.clang-format @@ -68,7 +68,7 @@ PenaltyBreakFirstLessLess: 120 PenaltyBreakString: 1000 PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 200 -PointerAlignment: Right +PointerAlignment: Left ReflowComments: true SortIncludes: true SpaceAfterCStyleCast: false @@ -88,4 +88,5 @@ UseTab: Never Language: ObjC ColumnLimit: 120 BreakBeforeBraces: WebKit +PointerAlignment: Right ... diff --git a/packages/react-native/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h b/packages/react-native/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h index 796b9aa472e..2d4ae909f3b 100644 --- a/packages/react-native/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h +++ b/packages/react-native/Libraries/FBLazyVector/FBLazyVector/FBLazyIterator.h @@ -29,11 +29,11 @@ class LazyIterator { LazyIterator(U vector, convert_type convert, size_type i) : _v(vector), _i(i), _convert(std::move(convert)) {} - bool operator==(const LazyIterator &other) const { + bool operator==(const LazyIterator& other) const { return _i == other._i && _v == other._v; } - bool operator<(const LazyIterator &b) const { + bool operator<(const LazyIterator& b) const { return _i < b._i; } @@ -49,12 +49,12 @@ class LazyIterator { return LazyIterator(_v, _convert, _i + n); } - LazyIterator &operator+=(difference_type n) { + LazyIterator& operator+=(difference_type n) { _i += n; return *this; } - LazyIterator &operator-=(difference_type n) { + LazyIterator& operator-=(difference_type n) { _i -= n; return *this; } @@ -63,11 +63,11 @@ class LazyIterator { return LazyIterator(_v, _i - n); } - difference_type operator-(const LazyIterator &a) const { + difference_type operator-(const LazyIterator& a) const { return _i - a._i; } - LazyIterator &operator++() { + LazyIterator& operator++() { return *this += 1; } @@ -77,7 +77,7 @@ class LazyIterator { return tmp; } - LazyIterator &operator--() { + LazyIterator& operator--() { return *this -= 1; } @@ -100,27 +100,27 @@ class LazyIterator { template LazyIterator operator+( typename LazyIterator::difference_type n, - const LazyIterator &i) { + const LazyIterator& i) { return i + n; } template -bool operator!=(const LazyIterator &a, const LazyIterator &b) { +bool operator!=(const LazyIterator& a, const LazyIterator& b) { return !(a == b); } template -bool operator<=(const LazyIterator &a, const LazyIterator &b) { +bool operator<=(const LazyIterator& a, const LazyIterator& b) { return a < b || a == b; } template -bool operator>(const LazyIterator &a, const LazyIterator &b) { +bool operator>(const LazyIterator& a, const LazyIterator& b) { return b < a; } template -bool operator>=(const LazyIterator &a, const LazyIterator &b) { +bool operator>=(const LazyIterator& a, const LazyIterator& b) { return a > b || a == b; } diff --git a/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.cpp b/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.cpp index 78b74e63163..51cd0fcdf92 100644 --- a/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.cpp +++ b/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.cpp @@ -26,20 +26,20 @@ NativeIntersectionObserver::NativeIntersectionObserver( : NativeIntersectionObserverCxxSpec(std::move(jsInvoker)) {} void NativeIntersectionObserver::observe( - jsi::Runtime &runtime, + jsi::Runtime& runtime, NativeIntersectionObserverObserveOptions options) { auto intersectionObserverId = options.intersectionObserverId; auto shadowNode = shadowNodeFromValue(runtime, std::move(options.targetShadowNode)); auto thresholds = options.thresholds; - auto &uiManager = getUIManagerFromRuntime(runtime); + auto& uiManager = getUIManagerFromRuntime(runtime); intersectionObserverManager_.observe( intersectionObserverId, shadowNode, thresholds, uiManager); } void NativeIntersectionObserver::unobserve( - jsi::Runtime &runtime, + jsi::Runtime& runtime, IntersectionObserverObserverId intersectionObserverId, jsi::Object targetShadowNode) { auto shadowNode = shadowNodeFromValue(runtime, std::move(targetShadowNode)); @@ -47,26 +47,26 @@ void NativeIntersectionObserver::unobserve( } void NativeIntersectionObserver::connect( - jsi::Runtime &runtime, + jsi::Runtime& runtime, AsyncCallback<> notifyIntersectionObserversCallback) { - auto &uiManager = getUIManagerFromRuntime(runtime); + auto& uiManager = getUIManagerFromRuntime(runtime); intersectionObserverManager_.connect( uiManager, notifyIntersectionObserversCallback); } -void NativeIntersectionObserver::disconnect(jsi::Runtime &runtime) { - auto &uiManager = getUIManagerFromRuntime(runtime); +void NativeIntersectionObserver::disconnect(jsi::Runtime& runtime) { + auto& uiManager = getUIManagerFromRuntime(runtime); intersectionObserverManager_.disconnect(uiManager); } std::vector -NativeIntersectionObserver::takeRecords(jsi::Runtime &runtime) { +NativeIntersectionObserver::takeRecords(jsi::Runtime& runtime) { auto entries = intersectionObserverManager_.takeRecords(); std::vector nativeModuleEntries; nativeModuleEntries.reserve(entries.size()); - for (const auto &entry : entries) { + for (const auto& entry : entries) { nativeModuleEntries.emplace_back( convertToNativeModuleEntry(entry, runtime)); } @@ -77,7 +77,7 @@ NativeIntersectionObserver::takeRecords(jsi::Runtime &runtime) { NativeIntersectionObserverEntry NativeIntersectionObserver::convertToNativeModuleEntry( IntersectionObserverEntry entry, - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { RectAsTuple targetRect = { entry.targetRect.origin.x, entry.targetRect.origin.y, @@ -110,8 +110,8 @@ NativeIntersectionObserver::convertToNativeModuleEntry( return nativeModuleEntry; } -UIManager &NativeIntersectionObserver::getUIManagerFromRuntime( - jsi::Runtime &runtime) { +UIManager& NativeIntersectionObserver::getUIManagerFromRuntime( + jsi::Runtime& runtime) { return UIManagerBinding::getBinding(runtime)->getUIManager(); } diff --git a/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.h b/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.h index 123e4cf20e6..20cd6e63db3 100644 --- a/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.h +++ b/packages/react-native/Libraries/IntersectionObserver/NativeIntersectionObserver.h @@ -80,30 +80,30 @@ class NativeIntersectionObserver NativeIntersectionObserver(std::shared_ptr jsInvoker); void observe( - jsi::Runtime &runtime, + jsi::Runtime& runtime, NativeIntersectionObserverObserveOptions options); void unobserve( - jsi::Runtime &runtime, + jsi::Runtime& runtime, IntersectionObserverObserverId intersectionObserverId, jsi::Object targetShadowNode); void connect( - jsi::Runtime &runtime, + jsi::Runtime& runtime, AsyncCallback<> notifyIntersectionObserversCallback); - void disconnect(jsi::Runtime &runtime); + void disconnect(jsi::Runtime& runtime); std::vector takeRecords( - jsi::Runtime &runtime); + jsi::Runtime& runtime); private: IntersectionObserverManager intersectionObserverManager_{}; - static UIManager &getUIManagerFromRuntime(jsi::Runtime &runtime); + static UIManager& getUIManagerFromRuntime(jsi::Runtime& runtime); static NativeIntersectionObserverEntry convertToNativeModuleEntry( IntersectionObserverEntry entry, - jsi::Runtime &runtime); + jsi::Runtime& runtime); }; } // namespace facebook::react diff --git a/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.cpp b/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.cpp index c13592fcf5a..a491e3e47e6 100644 --- a/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.cpp +++ b/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.cpp @@ -22,7 +22,7 @@ NativeMutationObserverModuleProvider( namespace facebook::react { -static UIManager &getUIManagerFromRuntime(jsi::Runtime &runtime) { +static UIManager& getUIManagerFromRuntime(jsi::Runtime& runtime) { return UIManagerBinding::getBinding(runtime)->getUIManager(); } @@ -31,20 +31,20 @@ NativeMutationObserver::NativeMutationObserver( : NativeMutationObserverCxxSpec(std::move(jsInvoker)) {} void NativeMutationObserver::observe( - jsi::Runtime &runtime, + jsi::Runtime& runtime, NativeMutationObserverObserveOptions options) { auto mutationObserverId = options.mutationObserverId; auto subtree = options.subtree; auto shadowNode = shadowNodeFromValue(runtime, std::move(options).targetShadowNode); - auto &uiManager = getUIManagerFromRuntime(runtime); + auto& uiManager = getUIManagerFromRuntime(runtime); mutationObserverManager_.observe( mutationObserverId, shadowNode, subtree, uiManager); } void NativeMutationObserver::unobserve( - jsi::Runtime &runtime, + jsi::Runtime& runtime, MutationObserverId mutationObserverId, jsi::Object targetShadowNode) { auto shadowNode = shadowNodeFromValue(runtime, std::move(targetShadowNode)); @@ -52,10 +52,10 @@ void NativeMutationObserver::unobserve( } void NativeMutationObserver::connect( - jsi::Runtime &runtime, + jsi::Runtime& runtime, AsyncCallback<> notifyMutationObservers, jsi::Function getPublicInstanceFromInstanceHandle) { - auto &uiManager = getUIManagerFromRuntime(runtime); + auto& uiManager = getUIManagerFromRuntime(runtime); // MutationObserver is not compatible with background executor. // When using background executor, we commit trees outside the JS thread. @@ -73,7 +73,7 @@ void NativeMutationObserver::connect( // This should always be called from the JS thread, as it's unsafe to call // into JS otherwise (via `getPublicInstanceFromInstanceHandle`). - getPublicInstanceFromShadowNode_ = [&](const ShadowNode &shadowNode) { + getPublicInstanceFromShadowNode_ = [&](const ShadowNode& shadowNode) { auto instanceHandle = shadowNode.getInstanceHandle(runtime); if (!instanceHandle.isObject() || !getPublicInstanceFromInstanceHandle_.isObject() || @@ -88,15 +88,15 @@ void NativeMutationObserver::connect( notifyMutationObservers_ = std::move(notifyMutationObservers); - auto onMutationsCallback = [&](std::vector &records) { + auto onMutationsCallback = [&](std::vector& records) { return onMutations(records); }; mutationObserverManager_.connect(uiManager, std::move(onMutationsCallback)); } -void NativeMutationObserver::disconnect(jsi::Runtime &runtime) { - auto &uiManager = getUIManagerFromRuntime(runtime); +void NativeMutationObserver::disconnect(jsi::Runtime& runtime) { + auto& uiManager = getUIManagerFromRuntime(runtime); mutationObserverManager_.disconnect(uiManager); getPublicInstanceFromInstanceHandle_ = jsi::Value::undefined(); getPublicInstanceFromShadowNode_ = nullptr; @@ -104,7 +104,7 @@ void NativeMutationObserver::disconnect(jsi::Runtime &runtime) { } std::vector NativeMutationObserver::takeRecords( - jsi::Runtime & /*runtime*/) { + jsi::Runtime& /*runtime*/) { notifiedMutationObservers_ = false; std::vector records; @@ -114,11 +114,11 @@ std::vector NativeMutationObserver::takeRecords( std::vector NativeMutationObserver::getPublicInstancesFromShadowNodes( - const std::vector &shadowNodes) const { + const std::vector& shadowNodes) const { std::vector publicInstances; publicInstances.reserve(shadowNodes.size()); - for (const auto &shadowNode : shadowNodes) { + for (const auto& shadowNode : shadowNodes) { publicInstances.push_back(getPublicInstanceFromShadowNode_(*shadowNode)); } @@ -126,10 +126,10 @@ NativeMutationObserver::getPublicInstancesFromShadowNodes( } void NativeMutationObserver::onMutations( - std::vector &records) { + std::vector& records) { SystraceSection s("NativeMutationObserver::onMutations"); - for (const auto &record : records) { + for (const auto& record : records) { pendingRecords_.emplace_back(NativeMutationRecord{ record.mutationObserverId, // FIXME(T157129303) Instead of assuming we can call into JS from here, diff --git a/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.h b/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.h index 7166659ef41..218ad1714a8 100644 --- a/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.h +++ b/packages/react-native/Libraries/MutationObserver/NativeMutationObserver.h @@ -64,22 +64,22 @@ class NativeMutationObserver NativeMutationObserver(std::shared_ptr jsInvoker); void observe( - jsi::Runtime &runtime, + jsi::Runtime& runtime, NativeMutationObserverObserveOptions options); void unobserve( - jsi::Runtime &runtime, + jsi::Runtime& runtime, MutationObserverId mutationObserverId, jsi::Object targetShadowNode); void connect( - jsi::Runtime &runtime, + jsi::Runtime& runtime, AsyncCallback<> notifyMutationObservers, jsi::Function getPublicInstanceFromInstanceHandle); - void disconnect(jsi::Runtime &runtime); + void disconnect(jsi::Runtime& runtime); - std::vector takeRecords(jsi::Runtime &runtime); + std::vector takeRecords(jsi::Runtime& runtime); private: MutationObserverManager mutationObserverManager_{}; @@ -89,17 +89,16 @@ class NativeMutationObserver // This is passed to `connect` so we can retain references to public instances // when mutation occur, before React cleans up unmounted instances. jsi::Value getPublicInstanceFromInstanceHandle_ = jsi::Value::undefined(); - std::function - getPublicInstanceFromShadowNode_; + std::function getPublicInstanceFromShadowNode_; bool notifiedMutationObservers_{}; std::function notifyMutationObservers_; - void onMutations(std::vector &records); + void onMutations(std::vector& records); void notifyMutationObserversIfNecessary(); std::vector getPublicInstancesFromShadowNodes( - const std::vector &shadowNodes) const; + const std::vector& shadowNodes) const; }; } // namespace facebook::react diff --git a/packages/react-native/Libraries/RCTRequired/RCTRequired/RCTRequired.h b/packages/react-native/Libraries/RCTRequired/RCTRequired/RCTRequired.h index 1da5375d66a..abcff0e47ee 100644 --- a/packages/react-native/Libraries/RCTRequired/RCTRequired/RCTRequired.h +++ b/packages/react-native/Libraries/RCTRequired/RCTRequired/RCTRequired.h @@ -44,7 +44,7 @@ struct RCTRequired { /// Pass-through constructor (allows for implicit conversion) for wrapped type /// T template - RCTREQUIRED_INLINE RCTRequired(Args &&...args) + RCTREQUIRED_INLINE RCTRequired(Args&&... args) : _t(std::forward(args)...) { static_assert( sizeof...(Args) > 0, @@ -52,14 +52,14 @@ struct RCTRequired { } RCTREQUIRED_INLINE - RCTRequired(const RCTRequired &) = default; + RCTRequired(const RCTRequired&) = default; RCTREQUIRED_INLINE - RCTRequired(RCTRequired &&) = default; + RCTRequired(RCTRequired&&) = default; RCTREQUIRED_INLINE - RCTRequired &operator=(const RCTRequired &) = default; + RCTRequired& operator=(const RCTRequired&) = default; RCTREQUIRED_INLINE - RCTRequired &operator=(RCTRequired &&) = default; + RCTRequired& operator=(RCTRequired&&) = default; RCTREQUIRED_INLINE ~RCTRequired() = default; @@ -67,11 +67,11 @@ struct RCTRequired { /// Public accessor for private storage (Use when implicit conversion is /// impracticable) RCTREQUIRED_INLINE - const T &get() const { + const T& get() const { return _t; } RCTREQUIRED_INLINE - T &get() { + T& get() { return _t; } @@ -81,7 +81,7 @@ struct RCTRequired { return _t; } RCTREQUIRED_INLINE - operator T &() { + operator T&() { return _t; } diff --git a/packages/react-native/Libraries/WebPerformance/BoundedConsumableBuffer.h b/packages/react-native/Libraries/WebPerformance/BoundedConsumableBuffer.h index 79a3c055faf..c5a095fb6fa 100644 --- a/packages/react-native/Libraries/WebPerformance/BoundedConsumableBuffer.h +++ b/packages/react-native/Libraries/WebPerformance/BoundedConsumableBuffer.h @@ -51,7 +51,7 @@ class BoundedConsumableBuffer { * operation, which will depend on whether the buffer reached the max allowed * size and how many are there unconsumed elements. */ - PushStatus add(const T &&el) { + PushStatus add(const T&& el) { if (entries_.size() < maxSize_) { // Haven't reached max buffer size yet, just add and grow the buffer entries_.emplace_back(el); @@ -79,7 +79,7 @@ class BoundedConsumableBuffer { * Returns pointer to next entry which would be overwritten or dropped if * added a new element. Null if no entry will be dropped. */ - const T *getNextOverwriteCandidate() const { + const T* getNextOverwriteCandidate() const { if (entries_.size() < maxSize_) { return nullptr; } else { @@ -87,14 +87,14 @@ class BoundedConsumableBuffer { } } - T &operator[](size_t idx) { + T& operator[](size_t idx) { return entries_[(position_ + idx) % entries_.size()]; } /** * Returns reference to the last unconsumed element */ - T &back() { + T& back() { return entries_[(cursorEnd_ - 1 + entries_.size()) % entries_.size()]; } @@ -117,7 +117,7 @@ class BoundedConsumableBuffer { /** * Clears buffer entries by predicate */ - void clear(std::function predicate) { + void clear(std::function predicate) { int pos = cursorStart_; std::vector entries; int numToConsume = 0; @@ -157,13 +157,13 @@ class BoundedConsumableBuffer { /** * Retrieves buffer entries, whether consumed or not, with predicate */ - std::vector getEntries(std::function predicate) const { + std::vector getEntries(std::function predicate) const { std::vector res; getEntries(res, predicate); return res; } - void getEntries(std::vector &res) const { + void getEntries(std::vector& res) const { const size_t oldSize = res.size(); res.resize(oldSize + entries_.size()); std::copy( @@ -174,10 +174,10 @@ class BoundedConsumableBuffer { res.begin() + oldSize + entries_.size() - position_); } - void getEntries(std::vector &res, std::function predicate) + void getEntries(std::vector& res, std::function predicate) const { for (int i = 0; i < entries_.size(); i++) { - const T &el = entries_[(i + position_) % entries_.size()]; + const T& el = entries_[(i + position_) % entries_.size()]; if (predicate(el)) { res.push_back(el); } @@ -196,7 +196,7 @@ class BoundedConsumableBuffer { return res; } - void consume(std::vector &res) { + void consume(std::vector& res) { if (numToConsume_ == 0) { return; } diff --git a/packages/react-native/Libraries/WebPerformance/NativePerformance.cpp b/packages/react-native/Libraries/WebPerformance/NativePerformance.cpp index 5dd301c3109..ce57c6041ac 100644 --- a/packages/react-native/Libraries/WebPerformance/NativePerformance.cpp +++ b/packages/react-native/Libraries/WebPerformance/NativePerformance.cpp @@ -26,14 +26,14 @@ NativePerformance::NativePerformance(std::shared_ptr jsInvoker) : NativePerformanceCxxSpec(std::move(jsInvoker)) {} void NativePerformance::mark( - jsi::Runtime &rt, + jsi::Runtime& rt, std::string name, double startTime) { PerformanceEntryReporter::getInstance().mark(name, startTime); } void NativePerformance::measure( - jsi::Runtime &rt, + jsi::Runtime& rt, std::string name, double startTime, double endTime, @@ -45,20 +45,20 @@ void NativePerformance::measure( } std::unordered_map NativePerformance::getSimpleMemoryInfo( - jsi::Runtime &rt) { + jsi::Runtime& rt) { auto heapInfo = rt.instrumentation().getHeapInfo(false); std::unordered_map heapInfoToJs; - for (auto &entry : heapInfo) { + for (auto& entry : heapInfo) { heapInfoToJs[entry.first] = static_cast(entry.second); } return heapInfoToJs; } std::unordered_map -NativePerformance::getReactNativeStartupTiming(jsi::Runtime &rt) { +NativePerformance::getReactNativeStartupTiming(jsi::Runtime& rt) { std::unordered_map result; - ReactMarker::StartupLogger &startupLogger = + ReactMarker::StartupLogger& startupLogger = ReactMarker::StartupLogger::getInstance(); if (!std::isnan(startupLogger.getAppStartupStartTime())) { result["startTime"] = startupLogger.getAppStartupStartTime(); diff --git a/packages/react-native/Libraries/WebPerformance/NativePerformance.h b/packages/react-native/Libraries/WebPerformance/NativePerformance.h index 9b603788669..7dfa5d36f54 100644 --- a/packages/react-native/Libraries/WebPerformance/NativePerformance.h +++ b/packages/react-native/Libraries/WebPerformance/NativePerformance.h @@ -25,10 +25,10 @@ class NativePerformance : public NativePerformanceCxxSpec, public: NativePerformance(std::shared_ptr jsInvoker); - void mark(jsi::Runtime &rt, std::string name, double startTime); + void mark(jsi::Runtime& rt, std::string name, double startTime); void measure( - jsi::Runtime &rt, + jsi::Runtime& rt, std::string name, double startTime, double endTime, @@ -47,12 +47,12 @@ class NativePerformance : public NativePerformanceCxxSpec, // // Note that we use int64_t here and it's ok to lose precision in JS doubles // for heap size information, as double's 2^53 sig bytes is large enough. - std::unordered_map getSimpleMemoryInfo(jsi::Runtime &rt); + std::unordered_map getSimpleMemoryInfo(jsi::Runtime& rt); // Collect and return the RN app startup timing information for performance // tracking. std::unordered_map getReactNativeStartupTiming( - jsi::Runtime &rt); + jsi::Runtime& rt); private: }; diff --git a/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.cpp b/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.cpp index 1e4b91204bf..93d09bc97ee 100644 --- a/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.cpp +++ b/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.cpp @@ -32,21 +32,21 @@ NativePerformanceObserver::~NativePerformanceObserver() { } void NativePerformanceObserver::startReporting( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType) { PerformanceEntryReporter::getInstance().startReporting( static_cast(entryType)); } void NativePerformanceObserver::stopReporting( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType) { PerformanceEntryReporter::getInstance().stopReporting( static_cast(entryType)); } void NativePerformanceObserver::setIsBuffered( - jsi::Runtime &rt, + jsi::Runtime& rt, std::vector entryTypes, bool isBuffered) { for (const int32_t entryType : entryTypes) { @@ -56,32 +56,32 @@ void NativePerformanceObserver::setIsBuffered( } GetPendingEntriesResult NativePerformanceObserver::popPendingEntries( - jsi::Runtime &rt) { + jsi::Runtime& rt) { return PerformanceEntryReporter::getInstance().popPendingEntries(); } void NativePerformanceObserver::setOnPerformanceEntryCallback( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional> callback) { PerformanceEntryReporter::getInstance().setReportingCallback(callback); } void NativePerformanceObserver::logRawEntry( - jsi::Runtime &rt, + jsi::Runtime& rt, RawPerformanceEntry entry) { PerformanceEntryReporter::getInstance().logEntry(entry); } std::vector> -NativePerformanceObserver::getEventCounts(jsi::Runtime &rt) { - const auto &eventCounts = +NativePerformanceObserver::getEventCounts(jsi::Runtime& rt) { + const auto& eventCounts = PerformanceEntryReporter::getInstance().getEventCounts(); return std::vector>( eventCounts.begin(), eventCounts.end()); } void NativePerformanceObserver::setDurationThreshold( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType, double durationThreshold) { PerformanceEntryReporter::getInstance().setDurationThreshold( @@ -89,7 +89,7 @@ void NativePerformanceObserver::setDurationThreshold( } void NativePerformanceObserver::clearEntries( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType, std::optional entryName) { PerformanceEntryReporter::getInstance().clearEntries( @@ -98,7 +98,7 @@ void NativePerformanceObserver::clearEntries( } std::vector NativePerformanceObserver::getEntries( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional entryType, std::optional entryName) { return PerformanceEntryReporter::getInstance().getEntries( diff --git a/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.h b/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.h index ab2b0e68047..257b0513e1c 100644 --- a/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.h +++ b/packages/react-native/Libraries/WebPerformance/NativePerformanceObserver.h @@ -59,38 +59,38 @@ class NativePerformanceObserver NativePerformanceObserver(std::shared_ptr jsInvoker); ~NativePerformanceObserver(); - void startReporting(jsi::Runtime &rt, int32_t entryType); + void startReporting(jsi::Runtime& rt, int32_t entryType); - void stopReporting(jsi::Runtime &rt, int32_t entryType); + void stopReporting(jsi::Runtime& rt, int32_t entryType); void setIsBuffered( - jsi::Runtime &rt, + jsi::Runtime& rt, std::vector entryTypes, bool isBuffered); - GetPendingEntriesResult popPendingEntries(jsi::Runtime &rt); + GetPendingEntriesResult popPendingEntries(jsi::Runtime& rt); void setOnPerformanceEntryCallback( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional> callback); - void logRawEntry(jsi::Runtime &rt, RawPerformanceEntry entry); + void logRawEntry(jsi::Runtime& rt, RawPerformanceEntry entry); std::vector> getEventCounts( - jsi::Runtime &rt); + jsi::Runtime& rt); void setDurationThreshold( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType, double durationThreshold); void clearEntries( - jsi::Runtime &rt, + jsi::Runtime& rt, int32_t entryType, std::optional entryName); std::vector getEntries( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional entryType, std::optional entryName); diff --git a/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.cpp b/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.cpp index a0608baa978..66255e9d97d 100644 --- a/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.cpp +++ b/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.cpp @@ -15,7 +15,7 @@ namespace facebook::react { EventTag PerformanceEntryReporter::sCurrentEventTag_{0}; -PerformanceEntryReporter &PerformanceEntryReporter::getInstance() { +PerformanceEntryReporter& PerformanceEntryReporter::getInstance() { static PerformanceEntryReporter instance; return instance; } @@ -37,7 +37,7 @@ double PerformanceEntryReporter::getCurrentTimeStamp() const { } void PerformanceEntryReporter::startReporting(PerformanceEntryType entryType) { - auto &buffer = getBuffer(entryType); + auto& buffer = getBuffer(entryType); buffer.isReporting = true; buffer.durationThreshold = DEFAULT_DURATION_THRESHOLD; } @@ -45,7 +45,7 @@ void PerformanceEntryReporter::startReporting(PerformanceEntryType entryType) { void PerformanceEntryReporter::setAlwaysLogged( PerformanceEntryType entryType, bool isAlwaysLogged) { - auto &buffer = getBuffer(entryType); + auto& buffer = getBuffer(entryType); buffer.isAlwaysLogged = isAlwaysLogged; } @@ -60,7 +60,7 @@ void PerformanceEntryReporter::stopReporting(PerformanceEntryType entryType) { } void PerformanceEntryReporter::stopReporting() { - for (auto &buffer : buffers_) { + for (auto& buffer : buffers_) { buffer.isReporting = false; } } @@ -69,7 +69,7 @@ GetPendingEntriesResult PerformanceEntryReporter::popPendingEntries() { std::scoped_lock lock(entriesMutex_); GetPendingEntriesResult res = { std::vector(), droppedEntryCount_}; - for (auto &buffer : buffers_) { + for (auto& buffer : buffers_) { buffer.entries.consume(res.entries); } @@ -77,7 +77,7 @@ GetPendingEntriesResult PerformanceEntryReporter::popPendingEntries() { std::stable_sort( res.entries.begin(), res.entries.end(), - [](const RawPerformanceEntry &lhs, const RawPerformanceEntry &rhs) { + [](const RawPerformanceEntry& lhs, const RawPerformanceEntry& rhs) { if (lhs.startTime != rhs.startTime) { return lhs.startTime < rhs.startTime; } else { @@ -89,7 +89,7 @@ GetPendingEntriesResult PerformanceEntryReporter::popPendingEntries() { return res; } -void PerformanceEntryReporter::logEntry(const RawPerformanceEntry &entry) { +void PerformanceEntryReporter::logEntry(const RawPerformanceEntry& entry) { const auto entryType = static_cast(entry.entryType); if (entryType == PerformanceEntryType::EVENT) { eventCounts_[entry.name]++; @@ -101,7 +101,7 @@ void PerformanceEntryReporter::logEntry(const RawPerformanceEntry &entry) { std::scoped_lock lock(entriesMutex_); - auto &buffer = buffers_[entry.entryType]; + auto& buffer = buffers_[entry.entryType]; if (entry.duration < buffer.durationThreshold) { // The entries duration is lower than the desired reporting threshold, skip @@ -139,8 +139,8 @@ void PerformanceEntryReporter::logEntry(const RawPerformanceEntry &entry) { } void PerformanceEntryReporter::mark( - const std::string &name, - const std::optional &startTime) { + const std::string& name, + const std::optional& startTime) { logEntry(RawPerformanceEntry{ name, static_cast(PerformanceEntryType::MARK), @@ -153,14 +153,14 @@ void PerformanceEntryReporter::mark( void PerformanceEntryReporter::clearEntries( PerformanceEntryType entryType, - const char *entryName) { + const char* entryName) { if (entryType == PerformanceEntryType::UNDEFINED) { // Clear all entry types for (int i = 1; i < NUM_PERFORMANCE_ENTRY_TYPES; i++) { clearEntries(static_cast(i), entryName); } } else { - auto &buffer = getBuffer(entryType); + auto& buffer = getBuffer(entryType); if (entryName != nullptr) { if (buffer.hasNameLookup) { RawPerformanceEntry entry{ @@ -173,7 +173,7 @@ void PerformanceEntryReporter::clearEntries( std::nullopt}; buffer.nameLookup.erase(&entry); } - buffer.entries.clear([entryName](const RawPerformanceEntry &entry) { + buffer.entries.clear([entryName](const RawPerformanceEntry& entry) { return std::strcmp(entry.name.c_str(), entryName) == 0; }); } else { @@ -185,19 +185,19 @@ void PerformanceEntryReporter::clearEntries( void PerformanceEntryReporter::getEntries( PerformanceEntryType entryType, - const char *entryName, - std::vector &res) const { + const char* entryName, + std::vector& res) const { if (entryType == PerformanceEntryType::UNDEFINED) { // Collect all entry types for (int i = 1; i < NUM_PERFORMANCE_ENTRY_TYPES; i++) { getEntries(static_cast(i), entryName, res); } } else { - const auto &entries = getBuffer(entryType).entries; + const auto& entries = getBuffer(entryType).entries; if (entryName == nullptr) { entries.getEntries(res); } else { - entries.getEntries(res, [entryName](const RawPerformanceEntry &entry) { + entries.getEntries(res, [entryName](const RawPerformanceEntry& entry) { return std::strcmp(entry.name.c_str(), entryName) == 0; }); } @@ -206,19 +206,19 @@ void PerformanceEntryReporter::getEntries( std::vector PerformanceEntryReporter::getEntries( PerformanceEntryType entryType, - const char *entryName) const { + const char* entryName) const { std::vector res; getEntries(entryType, entryName, res); return res; } void PerformanceEntryReporter::measure( - const std::string &name, + const std::string& name, double startTime, double endTime, - const std::optional &duration, - const std::optional &startMark, - const std::optional &endMark) { + const std::optional& duration, + const std::optional& startMark, + const std::optional& endMark) { double startTimeVal = startMark ? getMarkTime(*startMark) : startTime; double endTimeVal = endMark ? getMarkTime(*endMark) : endTime; @@ -241,7 +241,7 @@ void PerformanceEntryReporter::measure( } double PerformanceEntryReporter::getMarkTime( - const std::string &markName) const { + const std::string& markName) const { RawPerformanceEntry mark{ markName, static_cast(PerformanceEntryType::MARK), @@ -251,7 +251,7 @@ double PerformanceEntryReporter::getMarkTime( std::nullopt, std::nullopt}; - const auto &marksBuffer = getBuffer(PerformanceEntryType::MARK); + const auto& marksBuffer = getBuffer(PerformanceEntryType::MARK); auto it = marksBuffer.nameLookup.find(&mark); if (it != marksBuffer.nameLookup.end()) { return (*it)->startTime; @@ -285,15 +285,15 @@ void PerformanceEntryReporter::scheduleFlushBuffer() { struct StrKey { uint32_t key; - StrKey(const char *s) : key(folly::hash::fnv32_buf(s, std::strlen(s))) {} + StrKey(const char* s) : key(folly::hash::fnv32_buf(s, std::strlen(s))) {} - bool operator==(const StrKey &rhs) const { + bool operator==(const StrKey& rhs) const { return key == rhs.key; } }; struct StrKeyHash { - constexpr size_t operator()(const StrKey &strKey) const { + constexpr size_t operator()(const StrKey& strKey) const { return static_cast(strKey.key); } }; @@ -303,9 +303,9 @@ struct StrKeyHash { // Not all of these are currently supported by RN, but we map them anyway for // future-proofing. using SupportedEventTypeRegistry = - std::unordered_map; + std::unordered_map; -static const SupportedEventTypeRegistry &getSupportedEvents() { +static const SupportedEventTypeRegistry& getSupportedEvents() { static SupportedEventTypeRegistry SUPPORTED_EVENTS = { {"topAuxClick", "auxclick"}, {"topClick", "click"}, @@ -347,17 +347,17 @@ static const SupportedEventTypeRegistry &getSupportedEvents() { return SUPPORTED_EVENTS; } -EventTag PerformanceEntryReporter::onEventStart(const char *name) { +EventTag PerformanceEntryReporter::onEventStart(const char* name) { if (!isReporting(PerformanceEntryType::EVENT)) { return 0; } - const auto &supportedEvents = getSupportedEvents(); + const auto& supportedEvents = getSupportedEvents(); auto it = supportedEvents.find(name); if (it == supportedEvents.end()) { return 0; } - const char *reportedName = it->second; + const char* reportedName = it->second; sCurrentEventTag_++; if (sCurrentEventTag_ == 0) { @@ -399,8 +399,8 @@ void PerformanceEntryReporter::onEventEnd(EventTag tag) { if (it == eventsInFlight_.end()) { return; } - auto &entry = it->second; - auto &name = entry.name; + auto& entry = it->second; + auto& name = entry.name; // TODO: Define the way to assign interaction IDs to the event chains // (T141358175) diff --git a/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.h b/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.h index e10f7876c64..7d8d206c446 100644 --- a/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.h +++ b/packages/react-native/Libraries/WebPerformance/PerformanceEntryReporter.h @@ -21,21 +21,21 @@ namespace facebook::react { struct PerformanceEntryHash { - size_t operator()(const RawPerformanceEntry *entry) const { + size_t operator()(const RawPerformanceEntry* entry) const { return std::hash()(entry->name); } }; struct PerformanceEntryEqual { bool operator()( - const RawPerformanceEntry *lhs, - const RawPerformanceEntry *rhs) const { + const RawPerformanceEntry* lhs, + const RawPerformanceEntry* rhs) const { return lhs->name == rhs->name; } }; using PerformanceEntryRegistryType = std::unordered_set< - const RawPerformanceEntry *, + const RawPerformanceEntry*, PerformanceEntryHash, PerformanceEntryEqual>; @@ -68,14 +68,14 @@ constexpr size_t NUM_PERFORMANCE_ENTRY_TYPES = class PerformanceEntryReporter : public EventLogger { public: - PerformanceEntryReporter(const PerformanceEntryReporter &) = delete; - void operator=(const PerformanceEntryReporter &) = delete; + PerformanceEntryReporter(const PerformanceEntryReporter&) = delete; + void operator=(const PerformanceEntryReporter&) = delete; // NOTE: This class is not thread safe, make sure that the calls are made from // the same thread. // TODO: Consider passing it as a parameter to the corresponding modules at // creation time instead of having the singleton. - static PerformanceEntryReporter &getInstance(); + static PerformanceEntryReporter& getInstance(); void setReportingCallback(std::optional> callback); void startReporting(PerformanceEntryType entryType); @@ -88,13 +88,13 @@ class PerformanceEntryReporter : public EventLogger { GetPendingEntriesResult popPendingEntries(); - void logEntry(const RawPerformanceEntry &entry); + void logEntry(const RawPerformanceEntry& entry); - PerformanceEntryBuffer &getBuffer(PerformanceEntryType entryType) { + PerformanceEntryBuffer& getBuffer(PerformanceEntryType entryType) { return buffers_[static_cast(entryType)]; } - const PerformanceEntryBuffer &getBuffer( + const PerformanceEntryBuffer& getBuffer( PerformanceEntryType entryType) const { return buffers_[static_cast(entryType)]; } @@ -112,24 +112,24 @@ class PerformanceEntryReporter : public EventLogger { } void mark( - const std::string &name, - const std::optional &startTime = std::nullopt); + const std::string& name, + const std::optional& startTime = std::nullopt); void measure( - const std::string &name, + const std::string& name, double startTime, double endTime, - const std::optional &duration = std::nullopt, - const std::optional &startMark = std::nullopt, - const std::optional &endMark = std::nullopt); + const std::optional& duration = std::nullopt, + const std::optional& startMark = std::nullopt, + const std::optional& endMark = std::nullopt); void clearEntries( PerformanceEntryType entryType = PerformanceEntryType::UNDEFINED, - const char *entryName = nullptr); + const char* entryName = nullptr); std::vector getEntries( PerformanceEntryType entryType = PerformanceEntryType::UNDEFINED, - const char *entryName = nullptr) const; + const char* entryName = nullptr) const; void event( std::string name, @@ -139,11 +139,11 @@ class PerformanceEntryReporter : public EventLogger { double processingEnd, uint32_t interactionId); - EventTag onEventStart(const char *name) override; + EventTag onEventStart(const char* name) override; void onEventDispatch(EventTag tag) override; void onEventEnd(EventTag tag) override; - const std::unordered_map &getEventCounts() const { + const std::unordered_map& getEventCounts() const { return eventCounts_; } @@ -163,7 +163,7 @@ class PerformanceEntryReporter : public EventLogger { uint32_t droppedEntryCount_{0}; struct EventEntry { - const char *name; + const char* name; double startTime{0.0}; double dispatchTime{0.0}; }; @@ -181,13 +181,13 @@ class PerformanceEntryReporter : public EventLogger { PerformanceEntryReporter(); - double getMarkTime(const std::string &markName) const; + double getMarkTime(const std::string& markName) const; void scheduleFlushBuffer(); void getEntries( PerformanceEntryType entryType, - const char *entryName, - std::vector &res) const; + const char* entryName, + std::vector& res) const; double getCurrentTimeStamp() const; }; diff --git a/packages/react-native/Libraries/WebPerformance/__tests__/BoundedConsumableBufferTest.cpp b/packages/react-native/Libraries/WebPerformance/__tests__/BoundedConsumableBufferTest.cpp index 07738ff3e0c..95381721e41 100644 --- a/packages/react-native/Libraries/WebPerformance/__tests__/BoundedConsumableBufferTest.cpp +++ b/packages/react-native/Libraries/WebPerformance/__tests__/BoundedConsumableBufferTest.cpp @@ -163,7 +163,7 @@ TEST(BoundedConsumableBuffer, CanClearByPredicate) { buffer.add(0); buffer.add(4); - buffer.clear([](const int &el) { return el == 0; }); + buffer.clear([](const int& el) { return el == 0; }); ASSERT_EQ(std::vector({2, 3, 4}), buffer.getEntries()); auto elems = buffer.consume(); @@ -182,18 +182,18 @@ TEST(BoundedConsumableBuffer, CanGetByPredicate) { buffer.consume(); buffer.add(3); - ASSERT_EQ(std::vector({1, 2, 3}), buffer.getEntries([](const int &el) { + ASSERT_EQ(std::vector({1, 2, 3}), buffer.getEntries([](const int& el) { return el != 0; })); buffer.add(0); buffer.add(4); - ASSERT_EQ(std::vector({2, 3, 4}), buffer.getEntries([](const int &el) { + ASSERT_EQ(std::vector({2, 3, 4}), buffer.getEntries([](const int& el) { return el != 0; })); auto elems = buffer.consume(); - ASSERT_EQ(std::vector({2, 3, 4}), buffer.getEntries([](const int &el) { + ASSERT_EQ(std::vector({2, 3, 4}), buffer.getEntries([](const int& el) { return el != 0; })); } diff --git a/packages/react-native/Libraries/WebPerformance/__tests__/PerformanceEntryReporterTest.cpp b/packages/react-native/Libraries/WebPerformance/__tests__/PerformanceEntryReporterTest.cpp index e7e8952a89d..c04e97995f3 100644 --- a/packages/react-native/Libraries/WebPerformance/__tests__/PerformanceEntryReporterTest.cpp +++ b/packages/react-native/Libraries/WebPerformance/__tests__/PerformanceEntryReporterTest.cpp @@ -13,10 +13,10 @@ namespace facebook::react { -static std::ostream &operator<<( - std::ostream &os, - const RawPerformanceEntry &entry) { - static constexpr const char *entryTypeNames[] = { +static std::ostream& operator<<( + std::ostream& os, + const RawPerformanceEntry& entry) { + static constexpr const char* entryTypeNames[] = { "UNDEFINED", "MARK", "MEASURE", @@ -32,7 +32,7 @@ static std::ostream &operator<<( using namespace facebook::react; TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStartReporting) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); @@ -47,7 +47,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStartReporting) { } TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStopReporting) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); @@ -60,7 +60,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStopReporting) { reporter.measure("measure0", 0.0, 0.0); auto res = reporter.popPendingEntries(); - const auto &entries = res.entries; + const auto& entries = res.entries; ASSERT_EQ(0, res.droppedEntriesCount); ASSERT_EQ(3, entries.size()); @@ -84,7 +84,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestStopReporting) { } TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMarks) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); @@ -96,7 +96,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMarks) { reporter.mark("mark2", 2.0); auto res = reporter.popPendingEntries(); - const auto &entries = res.entries; + const auto& entries = res.entries; ASSERT_EQ(0, res.droppedEntriesCount); ASSERT_EQ(3, entries.size()); @@ -128,7 +128,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMarks) { } TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); @@ -154,7 +154,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) { reporter.mark("mark4", 2.0); auto res = reporter.popPendingEntries(); - const auto &entries = res.entries; + const auto& entries = res.entries; ASSERT_EQ(0, res.droppedEntriesCount); @@ -249,35 +249,35 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestReportMeasures) { } static std::vector getNames( - const std::vector &entries) { + const std::vector& entries) { std::vector res; std::transform( entries.begin(), entries.end(), std::back_inserter(res), - [](const RawPerformanceEntry &e) { return e.name; }); + [](const RawPerformanceEntry& e) { return e.name; }); return res; } static std::vector getTypes( - const std::vector &entries) { + const std::vector& entries) { std::vector res; std::transform( entries.begin(), entries.end(), std::back_inserter(res), - [](const RawPerformanceEntry &e) { return e.entryType; }); + [](const RawPerformanceEntry& e) { return e.entryType; }); return res; } TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); auto res = reporter.popPendingEntries(); - const auto &entries = res.entries; + const auto& entries = res.entries; ASSERT_EQ(0, res.droppedEntriesCount); ASSERT_EQ(0, entries.size()); @@ -324,7 +324,7 @@ TEST(PerformanceEntryReporter, PerformanceEntryReporterTestGetEntries) { } TEST(PerformanceEntryReporter, PerformanceEntryReporterTestClearEntries) { - auto &reporter = PerformanceEntryReporter::getInstance(); + auto& reporter = PerformanceEntryReporter::getInstance(); reporter.stopReporting(); reporter.clearEntries(); diff --git a/packages/react-native/React/Base/RCTMockDef.h b/packages/react-native/React/Base/RCTMockDef.h index 677613605fa..38ee254ef7d 100644 --- a/packages/react-native/React/Base/RCTMockDef.h +++ b/packages/react-native/React/Base/RCTMockDef.h @@ -45,9 +45,9 @@ #ifdef RCT_DEV #define RCT_MOCK_DEF(context, api) \ - __typeof(__typeof(api) *) mockptr_##context##_##api = &api; + __typeof(__typeof(api)*) mockptr_##context##_##api = &api; #define RCT_MOCK_REF(context, api) \ - extern __typeof(__typeof(api) *) mockptr_##context##_##api; + extern __typeof(__typeof(api)*) mockptr_##context##_##api; #define RCT_MOCK_SET(context, api, mockapi) \ (mockptr_##context##_##api = &mockapi) #define RCT_MOCK_RESET(context, api) (mockptr_##context##_##api = &api) diff --git a/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h b/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h index 6e180007fdc..e1b8a597f6d 100644 --- a/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h +++ b/packages/react-native/React/CoreModules/RCTAccessibilityManager+Internal.h @@ -16,7 +16,7 @@ RCT_EXTERN_C_BEGIN // Only to be used for testing and internal tooling. Do not use this in // production. void RCTAccessibilityManagerSetIsVoiceOverEnabled( - RCTAccessibilityManager *accessibilityManager, + RCTAccessibilityManager* accessibilityManager, BOOL isVoiceOverEnabled); RCT_EXTERN_C_END diff --git a/packages/react-native/React/CxxBridge/RCTMessageThread.h b/packages/react-native/React/CxxBridge/RCTMessageThread.h index 1232a9e6bc2..2e9125d2c4d 100644 --- a/packages/react-native/React/CxxBridge/RCTMessageThread.h +++ b/packages/react-native/React/CxxBridge/RCTMessageThread.h @@ -19,15 +19,15 @@ namespace facebook::react { class RCTMessageThread : public MessageQueueThread, public std::enable_shared_from_this { public: - RCTMessageThread(NSRunLoop *runLoop, RCTJavaScriptCompleteBlock errorBlock); + RCTMessageThread(NSRunLoop* runLoop, RCTJavaScriptCompleteBlock errorBlock); ~RCTMessageThread() override; - void runOnQueue(std::function &&) override; - void runOnQueueSync(std::function &&) override; + void runOnQueue(std::function&&) override; + void runOnQueueSync(std::function&&) override; void quitSynchronous() override; - void setRunLoop(NSRunLoop *runLoop); + void setRunLoop(NSRunLoop* runLoop); private: - void tryFunc(const std::function &func); + void tryFunc(const std::function& func); void runAsync(std::function func); void runSync(std::function func); diff --git a/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h b/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h index 36a2abad242..53a22949b53 100644 --- a/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h +++ b/packages/react-native/React/CxxLogUtils/RCTDefaultCxxLogFunction.h @@ -11,6 +11,6 @@ namespace facebook::react { -void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char *message); +void RCTDefaultCxxLogFunction(ReactNativeLogLevel level, const char* message); } // namespace facebook::react diff --git a/packages/react-native/React/CxxModule/RCTNativeModule.h b/packages/react-native/React/CxxModule/RCTNativeModule.h index 730839a9b52..9b870cfd2fe 100644 --- a/packages/react-native/React/CxxModule/RCTNativeModule.h +++ b/packages/react-native/React/CxxModule/RCTNativeModule.h @@ -12,21 +12,21 @@ namespace facebook::react { class RCTNativeModule : public NativeModule { public: - RCTNativeModule(RCTBridge *bridge, RCTModuleData *moduleData); + RCTNativeModule(RCTBridge* bridge, RCTModuleData* moduleData); std::string getName() override; std::string getSyncMethodName(unsigned int methodId) override; std::vector getMethods() override; folly::dynamic getConstants() override; - void invoke(unsigned int methodId, folly::dynamic &¶ms, int callId) + void invoke(unsigned int methodId, folly::dynamic&& params, int callId) override; MethodCallResult callSerializableNativeHook( unsigned int reactMethodId, - folly::dynamic &¶ms) override; + folly::dynamic&& params) override; private: - __weak RCTBridge *m_bridge; - RCTModuleData *m_moduleData; + __weak RCTBridge* m_bridge; + RCTModuleData* m_moduleData; }; } // namespace facebook::react diff --git a/packages/react-native/React/CxxUtils/RCTFollyConvert.h b/packages/react-native/React/CxxUtils/RCTFollyConvert.h index 7da61aa9bd5..3ec64dccad1 100644 --- a/packages/react-native/React/CxxUtils/RCTFollyConvert.h +++ b/packages/react-native/React/CxxUtils/RCTFollyConvert.h @@ -12,6 +12,6 @@ namespace facebook::react { folly::dynamic convertIdToFollyDynamic(id json); -id convertFollyDynamicToId(const folly::dynamic &dyn); +id convertFollyDynamicToId(const folly::dynamic& dyn); } // namespace facebook::react diff --git a/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h b/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h index 8091d0dd2c3..b1a6346bb39 100644 --- a/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h +++ b/packages/react-native/React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h @@ -21,21 +21,21 @@ class RCTMountingTransactionObserverCoordinator final { * `componentViewDescriptor` does not listen the events. */ void registerViewComponentDescriptor( - const RCTComponentViewDescriptor &componentViewDescriptor, + const RCTComponentViewDescriptor& componentViewDescriptor, facebook::react::SurfaceId surfaceId); void unregisterViewComponentDescriptor( - const RCTComponentViewDescriptor &componentViewDescriptor, + const RCTComponentViewDescriptor& componentViewDescriptor, facebook::react::SurfaceId surfaceId); /* * To be called from `RCTMountingManager`. */ void notifyObserversMountingTransactionWillMount( - const facebook::react::MountingTransaction &transaction, - const facebook::react::SurfaceTelemetry &surfaceTelemetry) const; + const facebook::react::MountingTransaction& transaction, + const facebook::react::SurfaceTelemetry& surfaceTelemetry) const; void notifyObserversMountingTransactionDidMount( - const facebook::react::MountingTransaction &transaction, - const facebook::react::SurfaceTelemetry &surfaceTelemetry) const; + const facebook::react::MountingTransaction& transaction, + const facebook::react::SurfaceTelemetry& surfaceTelemetry) const; private: facebook::butter::map< diff --git a/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h b/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h index 9184adc59c3..a7d4cce45a2 100644 --- a/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h +++ b/packages/react-native/React/Fabric/RCTImageResponseObserverProxy.h @@ -19,7 +19,7 @@ class RCTImageResponseObserverProxy final : public ImageResponseObserver { public: RCTImageResponseObserverProxy(id delegate = nil); - void didReceiveImage(const ImageResponse &imageResponse) const override; + void didReceiveImage(const ImageResponse& imageResponse) const override; void didReceiveProgress(float progress) const override; void didReceiveFailure() const override; diff --git a/packages/react-native/React/Fabric/Utils/PlatformRunLoopObserver.h b/packages/react-native/React/Fabric/Utils/PlatformRunLoopObserver.h index f67e257ccab..d8e456619a2 100644 --- a/packages/react-native/React/Fabric/Utils/PlatformRunLoopObserver.h +++ b/packages/react-native/React/Fabric/Utils/PlatformRunLoopObserver.h @@ -22,7 +22,7 @@ class PlatformRunLoopObserver : public RunLoopObserver { public: PlatformRunLoopObserver( RunLoopObserver::Activity activities, - const RunLoopObserver::WeakOwner &owner, + const RunLoopObserver::WeakOwner& owner, CFRunLoopRef runLoop); ~PlatformRunLoopObserver(); @@ -45,7 +45,7 @@ class MainRunLoopObserver final : public PlatformRunLoopObserver { public: MainRunLoopObserver( RunLoopObserver::Activity activities, - const RunLoopObserver::WeakOwner &owner) + const RunLoopObserver::WeakOwner& owner) : PlatformRunLoopObserver(activities, owner, CFRunLoopGetMain()) {} }; diff --git a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp index dbae39def80..eff504b9c21 100644 --- a/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp @@ -48,15 +48,15 @@ void registerComponents( } std::shared_ptr cxxModuleProvider( - const std::string &name, - const std::shared_ptr &jsInvoker) { + const std::string& name, + const std::shared_ptr& jsInvoker) { // Not implemented yet: provide pure-C++ NativeModules here. return nullptr; } std::shared_ptr javaModuleProvider( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) { + const std::string& name, + const JavaTurboModule::InitParams& params) { // Here you can provide your own module provider for TurboModules coming from // either your application or from external libraries. The approach to follow // is similar to the following (for a library called `samplelibrary`): @@ -73,7 +73,7 @@ std::shared_ptr javaModuleProvider( } // namespace facebook::react -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider = &facebook::react::cxxModuleProvider; diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/assert.cpp b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/assert.cpp index d560e33a80e..3ffd43a19fb 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/assert.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/assert.cpp @@ -17,7 +17,7 @@ namespace facebook { static char sAssertBuf[ASSERT_BUF_SIZE]; static AssertHandler gAssertHandler; -void assertInternal(const char *formatstr...) { +void assertInternal(const char* formatstr...) { va_list va_args; va_start(va_args, formatstr); vsnprintf(sAssertBuf, sizeof(sAssertBuf), formatstr, va_args); @@ -27,7 +27,7 @@ void assertInternal(const char *formatstr...) { } FBLOG(LOG_FATAL, "fbassert", "%s", sAssertBuf); // crash at this specific address so that we can find our crashes easier - *(int *)0xdeadb00c = 0; + *(int*)0xdeadb00c = 0; // let the compiler know we won't reach the end of the function __builtin_unreachable(); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h index 7962ebbf9e0..8d87f05327e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ALog.h @@ -21,42 +21,42 @@ namespace alog { template inline void -log(int level, const char *tag, const char *msg, ARGS... args) noexcept { +log(int level, const char* tag, const char* msg, ARGS... args) noexcept { __android_log_print(level, tag, msg, args...); } template -inline void log(int level, const char *tag, const char *msg) noexcept { +inline void log(int level, const char* tag, const char* msg) noexcept { __android_log_write(level, tag, msg); } template -inline void logv(const char *tag, const char *msg, ARGS... args) noexcept { +inline void logv(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_VERBOSE, tag, msg, args...); } template -inline void logd(const char *tag, const char *msg, ARGS... args) noexcept { +inline void logd(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_DEBUG, tag, msg, args...); } template -inline void logi(const char *tag, const char *msg, ARGS... args) noexcept { +inline void logi(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_INFO, tag, msg, args...); } template -inline void logw(const char *tag, const char *msg, ARGS... args) noexcept { +inline void logw(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_WARN, tag, msg, args...); } template -inline void loge(const char *tag, const char *msg, ARGS... args) noexcept { +inline void loge(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_ERROR, tag, msg, args...); } template -inline void logf(const char *tag, const char *msg, ARGS... args) noexcept { +inline void logf(const char* tag, const char* msg, ARGS... args) noexcept { log(ANDROID_LOG_FATAL, tag, msg, args...); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h index b79f6911707..f6f53181b11 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/Environment.h @@ -22,13 +22,13 @@ struct CacheEnvTag {}; // Keeps a thread-local reference to the current thread's JNIEnv. struct Environment { // May be null if this thread isn't attached to the JVM - FBEXPORT static JNIEnv *current(); - static void initialize(JavaVM *vm); + FBEXPORT static JNIEnv* current(); + static void initialize(JavaVM* vm); // There are subtle issues with calling the next functions directly. It is // much better to always use a ThreadScope to manage attaching/detaching for // you. - FBEXPORT static JNIEnv *ensureCurrentThreadIsAttached(); + FBEXPORT static JNIEnv* ensureCurrentThreadIsAttached(); FBEXPORT static void detachCurrentThread(); }; @@ -61,10 +61,10 @@ struct Environment { class FBEXPORT ThreadScope { public: ThreadScope(); - ThreadScope(ThreadScope &) = delete; - ThreadScope(ThreadScope &&) = default; - ThreadScope &operator=(ThreadScope &) = delete; - ThreadScope &operator=(ThreadScope &&) = delete; + ThreadScope(ThreadScope&) = delete; + ThreadScope(ThreadScope&&) = default; + ThreadScope& operator=(ThreadScope&) = delete; + ThreadScope& operator=(ThreadScope&&) = delete; ~ThreadScope(); /** @@ -73,20 +73,20 @@ class FBEXPORT ThreadScope { * running in the closure will have access to the same classes as in a normal * java-create thread. */ - static void WithClassLoader(std::function &&runnable); + static void WithClassLoader(std::function&& runnable); static void OnLoad(); // This constructor is only used internally by fbjni. - ThreadScope(JNIEnv *, internal::CacheEnvTag); + ThreadScope(JNIEnv*, internal::CacheEnvTag); private: friend struct Environment; - ThreadScope *previous_; + ThreadScope* previous_; // If the JNIEnv* is set, it is guaranteed to be valid at least through the // lifetime of this ThreadScope. The only case where that guarantee can be // made is when there is a java frame in the stack below this. - JNIEnv *env_; + JNIEnv* env_; bool attachedWithThisScope_; }; } // namespace jni diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h index ebfe450c0ec..45c4ca59950 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ProgramLocation.h @@ -21,15 +21,15 @@ class ProgramLocation { m_fileName("Unspecified"), m_lineNumber(0) {} - ProgramLocation(const char *functionName, const char *fileName, int line) + ProgramLocation(const char* functionName, const char* fileName, int line) : m_functionName(functionName), m_fileName(fileName), m_lineNumber(line) {} - const char *functionName() const { + const char* functionName() const { return m_functionName; } - const char *fileName() const { + const char* fileName() const { return m_fileName; } int lineNumber() const { @@ -43,15 +43,15 @@ class ProgramLocation { return str.str(); } - bool operator==(const ProgramLocation &other) const { + bool operator==(const ProgramLocation& other) const { // Assumes that the strings are static return (m_functionName == other.m_functionName) && (m_fileName == other.m_fileName) && m_lineNumber == other.m_lineNumber; } private: - const char *m_functionName; - const char *m_fileName; + const char* m_functionName; + const char* m_fileName; int m_lineNumber; }; diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h index 7cf38b454e5..c7acd785f52 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/RefPtr.h @@ -47,7 +47,7 @@ class RefPtr { // Allow implicit construction from a pointer only from nullptr constexpr RefPtr(std::nullptr_t ptr) : m_ptr(nullptr) {} - RefPtr(const RefPtr &ref) : m_ptr(ref.m_ptr) { + RefPtr(const RefPtr& ref) : m_ptr(ref.m_ptr) { refIfNecessary(m_ptr); } @@ -56,14 +56,13 @@ class RefPtr { // operator below). template RefPtr( - const RefPtr &ref, - typename std::enable_if::value, U>::type * = - nullptr) + const RefPtr& ref, + typename std::enable_if::value, U>::type* = nullptr) : m_ptr(ref.get()) { refIfNecessary(m_ptr); } - RefPtr(RefPtr &&ref) : m_ptr(nullptr) { + RefPtr(RefPtr&& ref) : m_ptr(nullptr) { *this = std::move(ref); } @@ -72,9 +71,8 @@ class RefPtr { // operator below). template RefPtr( - RefPtr &&ref, - typename std::enable_if::value, U>::type * = - nullptr) + RefPtr&& ref, + typename std::enable_if::value, U>::type* = nullptr) : m_ptr(nullptr) { *this = std::move(ref); } @@ -84,7 +82,7 @@ class RefPtr { m_ptr = nullptr; } - RefPtr &operator=(const RefPtr &ref) { + RefPtr& operator=(const RefPtr& ref) { if (m_ptr != ref.m_ptr) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; @@ -95,7 +93,7 @@ class RefPtr { // The STL assumes rvalue references are unique and for simplicity's sake, we // make the same assumption here, that &ref != this. - RefPtr &operator=(RefPtr &&ref) { + RefPtr& operator=(RefPtr&& ref) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; ref.m_ptr = nullptr; @@ -103,7 +101,7 @@ class RefPtr { } template - RefPtr &operator=(RefPtr &&ref) { + RefPtr& operator=(RefPtr&& ref) { unrefIfNecessary(m_ptr); m_ptr = ref.m_ptr; ref.m_ptr = nullptr; @@ -115,15 +113,15 @@ class RefPtr { m_ptr = nullptr; } - T *get() const { + T* get() const { return m_ptr; } - T *operator->() const { + T* operator->() const { return m_ptr; } - T &operator*() const { + T& operator*() const { return *m_ptr; } @@ -141,20 +139,20 @@ class RefPtr { // Creates a strong reference from a raw pointer, assuming that is already // referenced from some other RefPtr. This should be used sparingly. - static inline RefPtr assumeAlreadyReffed(T *ptr) { + static inline RefPtr assumeAlreadyReffed(T* ptr) { return RefPtr(ptr, ConstructionMode::External); } // Creates a strong reference from a raw pointer, assuming that it points to a // freshly-created object. See the documentation for RefPtr for usage. - static inline RefPtr adoptRef(T *ptr) { + static inline RefPtr adoptRef(T* ptr) { return RefPtr(ptr, ConstructionMode::Adopted); } private: enum class ConstructionMode { Adopted, External }; - RefPtr(T *ptr, ConstructionMode mode) : m_ptr(ptr) { + RefPtr(T* ptr, ConstructionMode mode) : m_ptr(ptr) { FBASSERTMSGF( ptr, "Got null pointer in %s construction mode", @@ -165,12 +163,12 @@ class RefPtr { } } - static inline void refIfNecessary(T *ptr) { + static inline void refIfNecessary(T* ptr) { if (ptr) { ptr->ref(); } } - static inline void unrefIfNecessary(T *ptr) { + static inline void unrefIfNecessary(T* ptr) { if (ptr) { ptr->unref(); } @@ -179,32 +177,32 @@ class RefPtr { template friend class RefPtr; - T *m_ptr; + T* m_ptr; }; // Creates a strong reference from a raw pointer, assuming that is already // referenced from some other RefPtr and that it is non-null. This should be // used sparingly. template -static inline RefPtr assumeAlreadyReffed(T *ptr) { +static inline RefPtr assumeAlreadyReffed(T* ptr) { return RefPtr::assumeAlreadyReffed(ptr); } // As above, but tolerant of nullptr. template -static inline RefPtr assumeAlreadyReffedOrNull(T *ptr) { +static inline RefPtr assumeAlreadyReffedOrNull(T* ptr) { return ptr ? RefPtr::assumeAlreadyReffed(ptr) : nullptr; } // Creates a strong reference from a raw pointer, assuming that it points to a // freshly-created object. See the documentation for RefPtr for usage. template -static inline RefPtr adoptRef(T *ptr) { +static inline RefPtr adoptRef(T* ptr) { return RefPtr::adoptRef(ptr); } template -static inline RefPtr createNew(Args &&...arguments) { +static inline RefPtr createNew(Args&&... arguments) { return RefPtr::adoptRef(new T(std::forward(arguments)...)); } @@ -212,56 +210,56 @@ template template RefPtr::operator RefPtr() const { static_assert(std::is_base_of::value, "Invalid static cast"); - return assumeAlreadyReffedOrNull(static_cast(m_ptr)); + return assumeAlreadyReffedOrNull(static_cast(m_ptr)); } template -inline bool operator==(const RefPtr &a, const RefPtr &b) { +inline bool operator==(const RefPtr& a, const RefPtr& b) { return a.get() == b.get(); } template -inline bool operator!=(const RefPtr &a, const RefPtr &b) { +inline bool operator!=(const RefPtr& a, const RefPtr& b) { return a.get() != b.get(); } template -inline bool operator==(const RefPtr &ref, U *ptr) { +inline bool operator==(const RefPtr& ref, U* ptr) { return ref.get() == ptr; } template -inline bool operator!=(const RefPtr &ref, U *ptr) { +inline bool operator!=(const RefPtr& ref, U* ptr) { return ref.get() != ptr; } template -inline bool operator==(U *ptr, const RefPtr &ref) { +inline bool operator==(U* ptr, const RefPtr& ref) { return ref.get() == ptr; } template -inline bool operator!=(U *ptr, const RefPtr &ref) { +inline bool operator!=(U* ptr, const RefPtr& ref) { return ref.get() != ptr; } template -inline bool operator==(const RefPtr &ref, std::nullptr_t ptr) { +inline bool operator==(const RefPtr& ref, std::nullptr_t ptr) { return ref.get() == ptr; } template -inline bool operator!=(const RefPtr &ref, std::nullptr_t ptr) { +inline bool operator!=(const RefPtr& ref, std::nullptr_t ptr) { return ref.get() != ptr; } template -inline bool operator==(std::nullptr_t ptr, const RefPtr &ref) { +inline bool operator==(std::nullptr_t ptr, const RefPtr& ref) { return ref.get() == ptr; } template -inline bool operator!=(std::nullptr_t ptr, const RefPtr &ref) { +inline bool operator!=(std::nullptr_t ptr, const RefPtr& ref) { return ref.get() != ptr; } diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h index 787c343e7a4..4139b420f67 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/StaticInitialized.h @@ -21,17 +21,17 @@ class StaticInitialized { constexpr StaticInitialized() : m_instance(nullptr) {} template - void initialize(Args &&...arguments) { + void initialize(Args&&... arguments) { FBASSERT(!m_instance); m_instance = new T(std::forward(arguments)...); } - T *operator->() const { + T* operator->() const { return m_instance; } private: - T *m_instance; + T* m_instance; }; } // namespace facebook diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h index 7d7b8c274d8..acd5d248c95 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/ThreadLocal.h @@ -45,7 +45,7 @@ class ThreadLocal { /** * As above but with a custom cleanup function */ - typedef void (*CleanupFunction)(void *obj); + typedef void (*CleanupFunction)(void* obj); explicit ThreadLocal(CleanupFunction cleanup) : m_key(0), m_cleanup(cleanup) { FBASSERT(cleanup); initialize(); @@ -54,26 +54,26 @@ class ThreadLocal { /** * Access object's member or method through this operator overload. */ - T *operator->() const { + T* operator->() const { return get(); } - T &operator*() const { + T& operator*() const { return *get(); } - T *get() const { - return (T *)pthread_getspecific(m_key); + T* get() const { + return (T*)pthread_getspecific(m_key); } - T *release() { - T *obj = get(); + T* release() { + T* obj = get(); pthread_setspecific(m_key, NULL); return obj; } - void reset(T *other = NULL) { - T *old = (T *)pthread_getspecific(m_key); + void reset(T* other = NULL) { + T* old = (T*)pthread_getspecific(m_key); if (old != other) { FBASSERT(m_cleanup); m_cleanup(old); @@ -85,7 +85,7 @@ class ThreadLocal { void initialize() { int ret = pthread_key_create(&m_key, m_cleanup); if (ret != 0) { - const char *msg = "(unknown error)"; + const char* msg = "(unknown error)"; switch (ret) { case EAGAIN: msg = "PTHREAD_KEYS_MAX (1024) is exceeded"; @@ -99,9 +99,9 @@ class ThreadLocal { } } - static void OnThreadExit(void *obj) { + static void OnThreadExit(void* obj) { if (NULL != obj) { - delete (T *)obj; + delete (T*)obj; } } diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h index 5866145a934..25914cb1815 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/assert.h @@ -31,12 +31,12 @@ namespace facebook { facebook::assertInternal( \ "This code should be unreachable (%s:%d)", __FILE__, __LINE__) -FBEXPORT void assertInternal(const char *formatstr, ...) +FBEXPORT void assertInternal(const char* formatstr, ...) __attribute__((noreturn)); // This allows storing the assert message before the current process terminates // due to a crash -typedef void (*AssertHandler)(const char *message); +typedef void (*AssertHandler)(const char* message); void setAssertHandler(AssertHandler assertHandler); } // namespace facebook diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h index ecc2a1f5a17..06e043615ba 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/log.h @@ -72,12 +72,12 @@ typedef enum android_LogPriority { /* * Send a simple string to the log. */ -int __android_log_write(int prio, const char *tag, const char *text); +int __android_log_write(int prio, const char* tag, const char* text); /* * Send a formatted string to the log, used like printf(fmt,...) */ -int __android_log_print(int prio, const char *tag, const char *fmt, ...) +int __android_log_print(int prio, const char* tag, const char* fmt, ...) #if defined(__GNUC__) __attribute__((format(printf, 3, 4))) #endif @@ -308,7 +308,7 @@ int __android_log_print(int prio, const char *tag, const char *fmt, ...) #define IF_FBLOG(priority, tag) if (fb_testLog(ANDROID_##priority, tag)) #endif -typedef void (*LogHandler)(int priority, const char *tag, const char *message); +typedef void (*LogHandler)(int priority, const char* tag, const char* message); FBEXPORT void setLogHandler(LogHandler logHandler); /* @@ -316,7 +316,7 @@ FBEXPORT void setLogHandler(LogHandler logHandler); * * The stuff in the rest of this file should not be used directly. */ -FBEXPORT int fb_printLog(int prio, const char *tag, const char *fmt, ...) +FBEXPORT int fb_printLog(int prio, const char* tag, const char* fmt, ...) #if defined(__GNUC__) __attribute__((format(printf, 3, 4))) #endif @@ -340,9 +340,9 @@ FBEXPORT int fb_printLog(int prio, const char *tag, const char *fmt, ...) */ void logPrintByDelims( int priority, - const char *tag, - const char *delims, - const char *msg, + const char* tag, + const char* delims, + const char* msg, ...); #ifdef __cplusplus diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h index 411550444ad..329ff5d4b25 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/noncopyable.h @@ -10,8 +10,8 @@ namespace facebook { struct noncopyable { - noncopyable(const noncopyable &) = delete; - noncopyable &operator=(const noncopyable &) = delete; + noncopyable(const noncopyable&) = delete; + noncopyable& operator=(const noncopyable&) = delete; protected: noncopyable() = default; diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h index 936fe195c42..856b2f49f40 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/include/fb/nonmovable.h @@ -10,8 +10,8 @@ namespace facebook { struct nonmovable { - nonmovable(nonmovable &&) = delete; - nonmovable &operator=(nonmovable &&) = delete; + nonmovable(nonmovable&&) = delete; + nonmovable& operator=(nonmovable&&) = delete; protected: nonmovable() = default; diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/log.cpp b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/log.cpp index 510787e93b4..8e9aa148ccd 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/log.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fb/log.cpp @@ -17,7 +17,7 @@ void setLogHandler(LogHandler logHandler) { gLogHandler = logHandler; } -int fb_printLog(int prio, const char *tag, const char *fmt, ...) { +int fb_printLog(int prio, const char* tag, const char* fmt, ...) { char logBuffer[LOG_BUFFER_SIZE]; va_list va_args; @@ -33,14 +33,14 @@ int fb_printLog(int prio, const char *tag, const char *fmt, ...) { void logPrintByDelims( int priority, - const char *tag, - const char *delims, - const char *msg, + const char* tag, + const char* delims, + const char* msg, ...) { va_list ap; char buf[32768]; - char *context; - char *tok; + char* context; + char* tok; va_start(ap, msg); vsnprintf(buf, sizeof(buf), msg, ap); @@ -84,11 +84,11 @@ static char logTagChar(int prio) { } } -int __android_log_write(int prio, const char *tag, const char *text) { +int __android_log_write(int prio, const char* tag, const char* text) { return fprintf(stderr, "[%c/%.16s] %s\n", logTagChar(prio), tag, text); } -int __android_log_print(int prio, const char *tag, const char *fmt, ...) { +int __android_log_print(int prio, const char* tag, const char* fmt, ...) { va_list ap; va_start(ap, fmt); diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h index 4118360c505..9b4857383d6 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/fb/glog_init.h @@ -12,7 +12,7 @@ namespace facebook { namespace gloginit { -void initialize(const char *tag = "ReactNativeJNI"); +void initialize(const char* tag = "ReactNativeJNI"); } } // namespace facebook diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp b/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp index ebbd18c979c..f12d22618b4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/fbgloginit/glog_init.cpp @@ -39,11 +39,11 @@ class LogcatSink : public google::LogSink { public: void send( google::LogSeverity severity, - const char *full_filename, - const char *base_filename, + const char* full_filename, + const char* base_filename, int line, - const struct ::tm *tm_time, - const char *message, + const struct ::tm* tm_time, + const char* message, size_t message_len) override { auto level = toAndroidLevel(severity); __android_log_print( @@ -58,22 +58,22 @@ class TaggedLogcatSink : public google::LogSink { const std::string tag_; public: - TaggedLogcatSink(const std::string &tag) : tag_{tag} {} + TaggedLogcatSink(const std::string& tag) : tag_{tag} {} void send( google::LogSeverity severity, - const char *full_filename, - const char *base_filename, + const char* full_filename, + const char* base_filename, int line, - const struct ::tm *tm_time, - const char *message, + const struct ::tm* tm_time, + const char* message, size_t message_len) override { auto level = toAndroidLevel(severity); __android_log_print(level, tag_.c_str(), "%.*s", (int)message_len, message); } }; -static google::LogSink *make_sink(const std::string &tag) { +static google::LogSink* make_sink(const std::string& tag) { if (tag.empty()) { return new LogcatSink{}; } else { @@ -81,7 +81,7 @@ static google::LogSink *make_sink(const std::string &tag) { } } -static void sendGlogOutputToLogcat(const char *tag) { +static void sendGlogOutputToLogcat(const char* tag) { google::AddLogSink(make_sink(tag)); // Disable logging to files @@ -93,7 +93,7 @@ static void sendGlogOutputToLogcat(const char *tag) { #endif // __ANDROID__ static void -lastResort(const char *tag, const char *msg, const char *arg = nullptr) { +lastResort(const char* tag, const char* msg, const char* arg = nullptr) { #ifdef __ANDROID__ if (!arg) { __android_log_write(ANDROID_LOG_ERROR, tag, msg); @@ -112,7 +112,7 @@ lastResort(const char *tag, const char *msg, const char *arg = nullptr) { namespace facebook { namespace gloginit { -void initialize(const char *tag) { +void initialize(const char* tag) { static std::once_flag flag{}; static auto failed = false; @@ -123,7 +123,7 @@ void initialize(const char *tag) { #ifdef __ANDROID__ sendGlogOutputToLogcat(tag); #endif - } catch (std::exception &ex) { + } catch (std::exception& ex) { lastResort(tag, "Failed to initialize glog", ex.what()); failed = true; } catch (...) { diff --git a/packages/react-native/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h b/packages/react-native/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h index e8ca17b36f7..1eb30b6fedf 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h +++ b/packages/react-native/ReactAndroid/src/main/jni/first-party/jni-hack/real/jni.h @@ -59,28 +59,28 @@ class _jfloatArray : public _jarray {}; class _jdoubleArray : public _jarray {}; class _jthrowable : public _jobject {}; -typedef _jobject *jobject; -typedef _jclass *jclass; -typedef _jstring *jstring; -typedef _jarray *jarray; -typedef _jobjectArray *jobjectArray; -typedef _jbooleanArray *jbooleanArray; -typedef _jbyteArray *jbyteArray; -typedef _jcharArray *jcharArray; -typedef _jshortArray *jshortArray; -typedef _jintArray *jintArray; -typedef _jlongArray *jlongArray; -typedef _jfloatArray *jfloatArray; -typedef _jdoubleArray *jdoubleArray; -typedef _jthrowable *jthrowable; -typedef _jobject *jweak; +typedef _jobject* jobject; +typedef _jclass* jclass; +typedef _jstring* jstring; +typedef _jarray* jarray; +typedef _jobjectArray* jobjectArray; +typedef _jbooleanArray* jbooleanArray; +typedef _jbyteArray* jbyteArray; +typedef _jcharArray* jcharArray; +typedef _jshortArray* jshortArray; +typedef _jintArray* jintArray; +typedef _jlongArray* jlongArray; +typedef _jfloatArray* jfloatArray; +typedef _jdoubleArray* jdoubleArray; +typedef _jthrowable* jthrowable; +typedef _jobject* jweak; #else /* not __cplusplus */ /* * Reference types, in C. */ -typedef void *jobject; +typedef void* jobject; typedef jobject jclass; typedef jobject jstring; typedef jobject jarray; @@ -99,10 +99,10 @@ typedef jobject jweak; #endif /* not __cplusplus */ struct _jfieldID; /* opaque structure */ -typedef struct _jfieldID *jfieldID; /* field IDs */ +typedef struct _jfieldID* jfieldID; /* field IDs */ struct _jmethodID; /* opaque structure */ -typedef struct _jmethodID *jmethodID; /* method IDs */ +typedef struct _jmethodID* jmethodID; /* method IDs */ struct JNIInvokeInterface; @@ -126,427 +126,376 @@ typedef enum jobjectRefType { } jobjectRefType; typedef struct { - const char *name; - const char *signature; - void *fnPtr; + const char* name; + const char* signature; + void* fnPtr; } JNINativeMethod; struct _JNIEnv; struct _JavaVM; -typedef const struct JNINativeInterface *C_JNIEnv; +typedef const struct JNINativeInterface* C_JNIEnv; #if defined(__cplusplus) typedef _JNIEnv JNIEnv; typedef _JavaVM JavaVM; #else -typedef const struct JNINativeInterface *JNIEnv; -typedef const struct JNIInvokeInterface *JavaVM; +typedef const struct JNINativeInterface* JNIEnv; +typedef const struct JNIInvokeInterface* JavaVM; #endif /* * Table of interface function pointers. */ struct JNINativeInterface { - void *reserved0; - void *reserved1; - void *reserved2; - void *reserved3; + void* reserved0; + void* reserved1; + void* reserved2; + void* reserved3; - jint (*GetVersion)(JNIEnv *); + jint (*GetVersion)(JNIEnv*); - jclass (*DefineClass)(JNIEnv *, const char *, jobject, const jbyte *, jsize); - jclass (*FindClass)(JNIEnv *, const char *); + jclass (*DefineClass)(JNIEnv*, const char*, jobject, const jbyte*, jsize); + jclass (*FindClass)(JNIEnv*, const char*); - jmethodID (*FromReflectedMethod)(JNIEnv *, jobject); - jfieldID (*FromReflectedField)(JNIEnv *, jobject); + jmethodID (*FromReflectedMethod)(JNIEnv*, jobject); + jfieldID (*FromReflectedField)(JNIEnv*, jobject); /* spec doesn't show jboolean parameter */ - jobject (*ToReflectedMethod)(JNIEnv *, jclass, jmethodID, jboolean); + jobject (*ToReflectedMethod)(JNIEnv*, jclass, jmethodID, jboolean); - jclass (*GetSuperclass)(JNIEnv *, jclass); - jboolean (*IsAssignableFrom)(JNIEnv *, jclass, jclass); + jclass (*GetSuperclass)(JNIEnv*, jclass); + jboolean (*IsAssignableFrom)(JNIEnv*, jclass, jclass); /* spec doesn't show jboolean parameter */ - jobject (*ToReflectedField)(JNIEnv *, jclass, jfieldID, jboolean); + jobject (*ToReflectedField)(JNIEnv*, jclass, jfieldID, jboolean); - jint (*Throw)(JNIEnv *, jthrowable); - jint (*ThrowNew)(JNIEnv *, jclass, const char *); - jthrowable (*ExceptionOccurred)(JNIEnv *); - void (*ExceptionDescribe)(JNIEnv *); - void (*ExceptionClear)(JNIEnv *); - void (*FatalError)(JNIEnv *, const char *); + jint (*Throw)(JNIEnv*, jthrowable); + jint (*ThrowNew)(JNIEnv*, jclass, const char*); + jthrowable (*ExceptionOccurred)(JNIEnv*); + void (*ExceptionDescribe)(JNIEnv*); + void (*ExceptionClear)(JNIEnv*); + void (*FatalError)(JNIEnv*, const char*); - jint (*PushLocalFrame)(JNIEnv *, jint); - jobject (*PopLocalFrame)(JNIEnv *, jobject); + jint (*PushLocalFrame)(JNIEnv*, jint); + jobject (*PopLocalFrame)(JNIEnv*, jobject); - jobject (*NewGlobalRef)(JNIEnv *, jobject); - void (*DeleteGlobalRef)(JNIEnv *, jobject); - void (*DeleteLocalRef)(JNIEnv *, jobject); - jboolean (*IsSameObject)(JNIEnv *, jobject, jobject); + jobject (*NewGlobalRef)(JNIEnv*, jobject); + void (*DeleteGlobalRef)(JNIEnv*, jobject); + void (*DeleteLocalRef)(JNIEnv*, jobject); + jboolean (*IsSameObject)(JNIEnv*, jobject, jobject); - jobject (*NewLocalRef)(JNIEnv *, jobject); - jint (*EnsureLocalCapacity)(JNIEnv *, jint); + jobject (*NewLocalRef)(JNIEnv*, jobject); + jint (*EnsureLocalCapacity)(JNIEnv*, jint); - jobject (*AllocObject)(JNIEnv *, jclass); - jobject (*NewObject)(JNIEnv *, jclass, jmethodID, ...); - jobject (*NewObjectV)(JNIEnv *, jclass, jmethodID, va_list); - jobject (*NewObjectA)(JNIEnv *, jclass, jmethodID, jvalue *); + jobject (*AllocObject)(JNIEnv*, jclass); + jobject (*NewObject)(JNIEnv*, jclass, jmethodID, ...); + jobject (*NewObjectV)(JNIEnv*, jclass, jmethodID, va_list); + jobject (*NewObjectA)(JNIEnv*, jclass, jmethodID, jvalue*); - jclass (*GetObjectClass)(JNIEnv *, jobject); - jboolean (*IsInstanceOf)(JNIEnv *, jobject, jclass); - jmethodID (*GetMethodID)(JNIEnv *, jclass, const char *, const char *); + jclass (*GetObjectClass)(JNIEnv*, jobject); + jboolean (*IsInstanceOf)(JNIEnv*, jobject, jclass); + jmethodID (*GetMethodID)(JNIEnv*, jclass, const char*, const char*); - jobject (*CallObjectMethod)(JNIEnv *, jobject, jmethodID, ...); - jobject (*CallObjectMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jobject (*CallObjectMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jboolean (*CallBooleanMethod)(JNIEnv *, jobject, jmethodID, ...); - jboolean (*CallBooleanMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jboolean (*CallBooleanMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jbyte (*CallByteMethod)(JNIEnv *, jobject, jmethodID, ...); - jbyte (*CallByteMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jbyte (*CallByteMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jchar (*CallCharMethod)(JNIEnv *, jobject, jmethodID, ...); - jchar (*CallCharMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jchar (*CallCharMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jshort (*CallShortMethod)(JNIEnv *, jobject, jmethodID, ...); - jshort (*CallShortMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jshort (*CallShortMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jint (*CallIntMethod)(JNIEnv *, jobject, jmethodID, ...); - jint (*CallIntMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jint (*CallIntMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jlong (*CallLongMethod)(JNIEnv *, jobject, jmethodID, ...); - jlong (*CallLongMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jlong (*CallLongMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jfloat (*CallFloatMethod)(JNIEnv *, jobject, jmethodID, ...); - jfloat (*CallFloatMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jfloat (*CallFloatMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - jdouble (*CallDoubleMethod)(JNIEnv *, jobject, jmethodID, ...); - jdouble (*CallDoubleMethodV)(JNIEnv *, jobject, jmethodID, va_list); - jdouble (*CallDoubleMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); - void (*CallVoidMethod)(JNIEnv *, jobject, jmethodID, ...); - void (*CallVoidMethodV)(JNIEnv *, jobject, jmethodID, va_list); - void (*CallVoidMethodA)(JNIEnv *, jobject, jmethodID, jvalue *); + jobject (*CallObjectMethod)(JNIEnv*, jobject, jmethodID, ...); + jobject (*CallObjectMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jobject (*CallObjectMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jboolean (*CallBooleanMethod)(JNIEnv*, jobject, jmethodID, ...); + jboolean (*CallBooleanMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jboolean (*CallBooleanMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jbyte (*CallByteMethod)(JNIEnv*, jobject, jmethodID, ...); + jbyte (*CallByteMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jbyte (*CallByteMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jchar (*CallCharMethod)(JNIEnv*, jobject, jmethodID, ...); + jchar (*CallCharMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jchar (*CallCharMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jshort (*CallShortMethod)(JNIEnv*, jobject, jmethodID, ...); + jshort (*CallShortMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jshort (*CallShortMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jint (*CallIntMethod)(JNIEnv*, jobject, jmethodID, ...); + jint (*CallIntMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jint (*CallIntMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jlong (*CallLongMethod)(JNIEnv*, jobject, jmethodID, ...); + jlong (*CallLongMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jlong (*CallLongMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jfloat (*CallFloatMethod)(JNIEnv*, jobject, jmethodID, ...); + jfloat (*CallFloatMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jfloat (*CallFloatMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + jdouble (*CallDoubleMethod)(JNIEnv*, jobject, jmethodID, ...); + jdouble (*CallDoubleMethodV)(JNIEnv*, jobject, jmethodID, va_list); + jdouble (*CallDoubleMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); + void (*CallVoidMethod)(JNIEnv*, jobject, jmethodID, ...); + void (*CallVoidMethodV)(JNIEnv*, jobject, jmethodID, va_list); + void (*CallVoidMethodA)(JNIEnv*, jobject, jmethodID, jvalue*); jobject ( - *CallNonvirtualObjectMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + *CallNonvirtualObjectMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jobject (*CallNonvirtualObjectMethodV)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, va_list); jobject (*CallNonvirtualObjectMethodA)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, - jvalue *); + jvalue*); jboolean ( - *CallNonvirtualBooleanMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + *CallNonvirtualBooleanMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jboolean (*CallNonvirtualBooleanMethodV)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, va_list); jboolean (*CallNonvirtualBooleanMethodA)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, - jvalue *); - jbyte (*CallNonvirtualByteMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); - jbyte (*CallNonvirtualByteMethodV)( - JNIEnv *, - jobject, - jclass, - jmethodID, - va_list); - jbyte (*CallNonvirtualByteMethodA)( - JNIEnv *, - jobject, - jclass, - jmethodID, - jvalue *); - jchar (*CallNonvirtualCharMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); - jchar (*CallNonvirtualCharMethodV)( - JNIEnv *, - jobject, - jclass, - jmethodID, - va_list); - jchar (*CallNonvirtualCharMethodA)( - JNIEnv *, - jobject, - jclass, - jmethodID, - jvalue *); - jshort ( - *CallNonvirtualShortMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jvalue*); + jbyte (*CallNonvirtualByteMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); + jbyte ( + *CallNonvirtualByteMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list); + jbyte ( + *CallNonvirtualByteMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*); + jchar (*CallNonvirtualCharMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); + jchar ( + *CallNonvirtualCharMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list); + jchar ( + *CallNonvirtualCharMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*); + jshort (*CallNonvirtualShortMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jshort (*CallNonvirtualShortMethodV)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, va_list); jshort (*CallNonvirtualShortMethodA)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, - jvalue *); - jint (*CallNonvirtualIntMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + jvalue*); + jint (*CallNonvirtualIntMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jint ( - *CallNonvirtualIntMethodV)(JNIEnv *, jobject, jclass, jmethodID, va_list); - jint (*CallNonvirtualIntMethodA)( - JNIEnv *, - jobject, - jclass, - jmethodID, - jvalue *); - jlong (*CallNonvirtualLongMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); - jlong (*CallNonvirtualLongMethodV)( - JNIEnv *, - jobject, - jclass, - jmethodID, - va_list); - jlong (*CallNonvirtualLongMethodA)( - JNIEnv *, - jobject, - jclass, - jmethodID, - jvalue *); - jfloat ( - *CallNonvirtualFloatMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + *CallNonvirtualIntMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list); + jint ( + *CallNonvirtualIntMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*); + jlong (*CallNonvirtualLongMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); + jlong ( + *CallNonvirtualLongMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list); + jlong ( + *CallNonvirtualLongMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*); + jfloat (*CallNonvirtualFloatMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jfloat (*CallNonvirtualFloatMethodV)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, va_list); jfloat (*CallNonvirtualFloatMethodA)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, - jvalue *); + jvalue*); jdouble ( - *CallNonvirtualDoubleMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); + *CallNonvirtualDoubleMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); jdouble (*CallNonvirtualDoubleMethodV)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, va_list); jdouble (*CallNonvirtualDoubleMethodA)( - JNIEnv *, + JNIEnv*, jobject, jclass, jmethodID, - jvalue *); - void (*CallNonvirtualVoidMethod)(JNIEnv *, jobject, jclass, jmethodID, ...); - void (*CallNonvirtualVoidMethodV)( - JNIEnv *, - jobject, - jclass, - jmethodID, - va_list); - void (*CallNonvirtualVoidMethodA)( - JNIEnv *, - jobject, - jclass, - jmethodID, - jvalue *); + jvalue*); + void (*CallNonvirtualVoidMethod)(JNIEnv*, jobject, jclass, jmethodID, ...); + void ( + *CallNonvirtualVoidMethodV)(JNIEnv*, jobject, jclass, jmethodID, va_list); + void ( + *CallNonvirtualVoidMethodA)(JNIEnv*, jobject, jclass, jmethodID, jvalue*); - jfieldID (*GetFieldID)(JNIEnv *, jclass, const char *, const char *); + jfieldID (*GetFieldID)(JNIEnv*, jclass, const char*, const char*); - jobject (*GetObjectField)(JNIEnv *, jobject, jfieldID); - jboolean (*GetBooleanField)(JNIEnv *, jobject, jfieldID); - jbyte (*GetByteField)(JNIEnv *, jobject, jfieldID); - jchar (*GetCharField)(JNIEnv *, jobject, jfieldID); - jshort (*GetShortField)(JNIEnv *, jobject, jfieldID); - jint (*GetIntField)(JNIEnv *, jobject, jfieldID); - jlong (*GetLongField)(JNIEnv *, jobject, jfieldID); - jfloat (*GetFloatField)(JNIEnv *, jobject, jfieldID); - jdouble (*GetDoubleField)(JNIEnv *, jobject, jfieldID); + jobject (*GetObjectField)(JNIEnv*, jobject, jfieldID); + jboolean (*GetBooleanField)(JNIEnv*, jobject, jfieldID); + jbyte (*GetByteField)(JNIEnv*, jobject, jfieldID); + jchar (*GetCharField)(JNIEnv*, jobject, jfieldID); + jshort (*GetShortField)(JNIEnv*, jobject, jfieldID); + jint (*GetIntField)(JNIEnv*, jobject, jfieldID); + jlong (*GetLongField)(JNIEnv*, jobject, jfieldID); + jfloat (*GetFloatField)(JNIEnv*, jobject, jfieldID); + jdouble (*GetDoubleField)(JNIEnv*, jobject, jfieldID); - void (*SetObjectField)(JNIEnv *, jobject, jfieldID, jobject); - void (*SetBooleanField)(JNIEnv *, jobject, jfieldID, jboolean); - void (*SetByteField)(JNIEnv *, jobject, jfieldID, jbyte); - void (*SetCharField)(JNIEnv *, jobject, jfieldID, jchar); - void (*SetShortField)(JNIEnv *, jobject, jfieldID, jshort); - void (*SetIntField)(JNIEnv *, jobject, jfieldID, jint); - void (*SetLongField)(JNIEnv *, jobject, jfieldID, jlong); - void (*SetFloatField)(JNIEnv *, jobject, jfieldID, jfloat); - void (*SetDoubleField)(JNIEnv *, jobject, jfieldID, jdouble); + void (*SetObjectField)(JNIEnv*, jobject, jfieldID, jobject); + void (*SetBooleanField)(JNIEnv*, jobject, jfieldID, jboolean); + void (*SetByteField)(JNIEnv*, jobject, jfieldID, jbyte); + void (*SetCharField)(JNIEnv*, jobject, jfieldID, jchar); + void (*SetShortField)(JNIEnv*, jobject, jfieldID, jshort); + void (*SetIntField)(JNIEnv*, jobject, jfieldID, jint); + void (*SetLongField)(JNIEnv*, jobject, jfieldID, jlong); + void (*SetFloatField)(JNIEnv*, jobject, jfieldID, jfloat); + void (*SetDoubleField)(JNIEnv*, jobject, jfieldID, jdouble); - jmethodID (*GetStaticMethodID)(JNIEnv *, jclass, const char *, const char *); + jmethodID (*GetStaticMethodID)(JNIEnv*, jclass, const char*, const char*); - jobject (*CallStaticObjectMethod)(JNIEnv *, jclass, jmethodID, ...); - jobject (*CallStaticObjectMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jobject (*CallStaticObjectMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jboolean (*CallStaticBooleanMethod)(JNIEnv *, jclass, jmethodID, ...); - jboolean (*CallStaticBooleanMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jboolean (*CallStaticBooleanMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jbyte (*CallStaticByteMethod)(JNIEnv *, jclass, jmethodID, ...); - jbyte (*CallStaticByteMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jbyte (*CallStaticByteMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jchar (*CallStaticCharMethod)(JNIEnv *, jclass, jmethodID, ...); - jchar (*CallStaticCharMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jchar (*CallStaticCharMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jshort (*CallStaticShortMethod)(JNIEnv *, jclass, jmethodID, ...); - jshort (*CallStaticShortMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jshort (*CallStaticShortMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jint (*CallStaticIntMethod)(JNIEnv *, jclass, jmethodID, ...); - jint (*CallStaticIntMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jint (*CallStaticIntMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jlong (*CallStaticLongMethod)(JNIEnv *, jclass, jmethodID, ...); - jlong (*CallStaticLongMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jlong (*CallStaticLongMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jfloat (*CallStaticFloatMethod)(JNIEnv *, jclass, jmethodID, ...); - jfloat (*CallStaticFloatMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jfloat (*CallStaticFloatMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - jdouble (*CallStaticDoubleMethod)(JNIEnv *, jclass, jmethodID, ...); - jdouble (*CallStaticDoubleMethodV)(JNIEnv *, jclass, jmethodID, va_list); - jdouble (*CallStaticDoubleMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); - void (*CallStaticVoidMethod)(JNIEnv *, jclass, jmethodID, ...); - void (*CallStaticVoidMethodV)(JNIEnv *, jclass, jmethodID, va_list); - void (*CallStaticVoidMethodA)(JNIEnv *, jclass, jmethodID, jvalue *); + jobject (*CallStaticObjectMethod)(JNIEnv*, jclass, jmethodID, ...); + jobject (*CallStaticObjectMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jobject (*CallStaticObjectMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jboolean (*CallStaticBooleanMethod)(JNIEnv*, jclass, jmethodID, ...); + jboolean (*CallStaticBooleanMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jboolean (*CallStaticBooleanMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jbyte (*CallStaticByteMethod)(JNIEnv*, jclass, jmethodID, ...); + jbyte (*CallStaticByteMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jbyte (*CallStaticByteMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jchar (*CallStaticCharMethod)(JNIEnv*, jclass, jmethodID, ...); + jchar (*CallStaticCharMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jchar (*CallStaticCharMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jshort (*CallStaticShortMethod)(JNIEnv*, jclass, jmethodID, ...); + jshort (*CallStaticShortMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jshort (*CallStaticShortMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jint (*CallStaticIntMethod)(JNIEnv*, jclass, jmethodID, ...); + jint (*CallStaticIntMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jint (*CallStaticIntMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jlong (*CallStaticLongMethod)(JNIEnv*, jclass, jmethodID, ...); + jlong (*CallStaticLongMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jlong (*CallStaticLongMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jfloat (*CallStaticFloatMethod)(JNIEnv*, jclass, jmethodID, ...); + jfloat (*CallStaticFloatMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jfloat (*CallStaticFloatMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + jdouble (*CallStaticDoubleMethod)(JNIEnv*, jclass, jmethodID, ...); + jdouble (*CallStaticDoubleMethodV)(JNIEnv*, jclass, jmethodID, va_list); + jdouble (*CallStaticDoubleMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); + void (*CallStaticVoidMethod)(JNIEnv*, jclass, jmethodID, ...); + void (*CallStaticVoidMethodV)(JNIEnv*, jclass, jmethodID, va_list); + void (*CallStaticVoidMethodA)(JNIEnv*, jclass, jmethodID, jvalue*); - jfieldID (*GetStaticFieldID)(JNIEnv *, jclass, const char *, const char *); + jfieldID (*GetStaticFieldID)(JNIEnv*, jclass, const char*, const char*); - jobject (*GetStaticObjectField)(JNIEnv *, jclass, jfieldID); - jboolean (*GetStaticBooleanField)(JNIEnv *, jclass, jfieldID); - jbyte (*GetStaticByteField)(JNIEnv *, jclass, jfieldID); - jchar (*GetStaticCharField)(JNIEnv *, jclass, jfieldID); - jshort (*GetStaticShortField)(JNIEnv *, jclass, jfieldID); - jint (*GetStaticIntField)(JNIEnv *, jclass, jfieldID); - jlong (*GetStaticLongField)(JNIEnv *, jclass, jfieldID); - jfloat (*GetStaticFloatField)(JNIEnv *, jclass, jfieldID); - jdouble (*GetStaticDoubleField)(JNIEnv *, jclass, jfieldID); + jobject (*GetStaticObjectField)(JNIEnv*, jclass, jfieldID); + jboolean (*GetStaticBooleanField)(JNIEnv*, jclass, jfieldID); + jbyte (*GetStaticByteField)(JNIEnv*, jclass, jfieldID); + jchar (*GetStaticCharField)(JNIEnv*, jclass, jfieldID); + jshort (*GetStaticShortField)(JNIEnv*, jclass, jfieldID); + jint (*GetStaticIntField)(JNIEnv*, jclass, jfieldID); + jlong (*GetStaticLongField)(JNIEnv*, jclass, jfieldID); + jfloat (*GetStaticFloatField)(JNIEnv*, jclass, jfieldID); + jdouble (*GetStaticDoubleField)(JNIEnv*, jclass, jfieldID); - void (*SetStaticObjectField)(JNIEnv *, jclass, jfieldID, jobject); - void (*SetStaticBooleanField)(JNIEnv *, jclass, jfieldID, jboolean); - void (*SetStaticByteField)(JNIEnv *, jclass, jfieldID, jbyte); - void (*SetStaticCharField)(JNIEnv *, jclass, jfieldID, jchar); - void (*SetStaticShortField)(JNIEnv *, jclass, jfieldID, jshort); - void (*SetStaticIntField)(JNIEnv *, jclass, jfieldID, jint); - void (*SetStaticLongField)(JNIEnv *, jclass, jfieldID, jlong); - void (*SetStaticFloatField)(JNIEnv *, jclass, jfieldID, jfloat); - void (*SetStaticDoubleField)(JNIEnv *, jclass, jfieldID, jdouble); + void (*SetStaticObjectField)(JNIEnv*, jclass, jfieldID, jobject); + void (*SetStaticBooleanField)(JNIEnv*, jclass, jfieldID, jboolean); + void (*SetStaticByteField)(JNIEnv*, jclass, jfieldID, jbyte); + void (*SetStaticCharField)(JNIEnv*, jclass, jfieldID, jchar); + void (*SetStaticShortField)(JNIEnv*, jclass, jfieldID, jshort); + void (*SetStaticIntField)(JNIEnv*, jclass, jfieldID, jint); + void (*SetStaticLongField)(JNIEnv*, jclass, jfieldID, jlong); + void (*SetStaticFloatField)(JNIEnv*, jclass, jfieldID, jfloat); + void (*SetStaticDoubleField)(JNIEnv*, jclass, jfieldID, jdouble); - jstring (*NewString)(JNIEnv *, const jchar *, jsize); - jsize (*GetStringLength)(JNIEnv *, jstring); - const jchar *(*GetStringChars)(JNIEnv *, jstring, jboolean *); - void (*ReleaseStringChars)(JNIEnv *, jstring, const jchar *); - jstring (*NewStringUTF)(JNIEnv *, const char *); - jsize (*GetStringUTFLength)(JNIEnv *, jstring); + jstring (*NewString)(JNIEnv*, const jchar*, jsize); + jsize (*GetStringLength)(JNIEnv*, jstring); + const jchar* (*GetStringChars)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringChars)(JNIEnv*, jstring, const jchar*); + jstring (*NewStringUTF)(JNIEnv*, const char*); + jsize (*GetStringUTFLength)(JNIEnv*, jstring); /* JNI spec says this returns const jbyte*, but that's inconsistent */ - const char *(*GetStringUTFChars)(JNIEnv *, jstring, jboolean *); - void (*ReleaseStringUTFChars)(JNIEnv *, jstring, const char *); - jsize (*GetArrayLength)(JNIEnv *, jarray); - jobjectArray (*NewObjectArray)(JNIEnv *, jsize, jclass, jobject); - jobject (*GetObjectArrayElement)(JNIEnv *, jobjectArray, jsize); - void (*SetObjectArrayElement)(JNIEnv *, jobjectArray, jsize, jobject); + const char* (*GetStringUTFChars)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringUTFChars)(JNIEnv*, jstring, const char*); + jsize (*GetArrayLength)(JNIEnv*, jarray); + jobjectArray (*NewObjectArray)(JNIEnv*, jsize, jclass, jobject); + jobject (*GetObjectArrayElement)(JNIEnv*, jobjectArray, jsize); + void (*SetObjectArrayElement)(JNIEnv*, jobjectArray, jsize, jobject); - jbooleanArray (*NewBooleanArray)(JNIEnv *, jsize); - jbyteArray (*NewByteArray)(JNIEnv *, jsize); - jcharArray (*NewCharArray)(JNIEnv *, jsize); - jshortArray (*NewShortArray)(JNIEnv *, jsize); - jintArray (*NewIntArray)(JNIEnv *, jsize); - jlongArray (*NewLongArray)(JNIEnv *, jsize); - jfloatArray (*NewFloatArray)(JNIEnv *, jsize); - jdoubleArray (*NewDoubleArray)(JNIEnv *, jsize); + jbooleanArray (*NewBooleanArray)(JNIEnv*, jsize); + jbyteArray (*NewByteArray)(JNIEnv*, jsize); + jcharArray (*NewCharArray)(JNIEnv*, jsize); + jshortArray (*NewShortArray)(JNIEnv*, jsize); + jintArray (*NewIntArray)(JNIEnv*, jsize); + jlongArray (*NewLongArray)(JNIEnv*, jsize); + jfloatArray (*NewFloatArray)(JNIEnv*, jsize); + jdoubleArray (*NewDoubleArray)(JNIEnv*, jsize); - jboolean *(*GetBooleanArrayElements)(JNIEnv *, jbooleanArray, jboolean *); - jbyte *(*GetByteArrayElements)(JNIEnv *, jbyteArray, jboolean *); - jchar *(*GetCharArrayElements)(JNIEnv *, jcharArray, jboolean *); - jshort *(*GetShortArrayElements)(JNIEnv *, jshortArray, jboolean *); - jint *(*GetIntArrayElements)(JNIEnv *, jintArray, jboolean *); - jlong *(*GetLongArrayElements)(JNIEnv *, jlongArray, jboolean *); - jfloat *(*GetFloatArrayElements)(JNIEnv *, jfloatArray, jboolean *); - jdouble *(*GetDoubleArrayElements)(JNIEnv *, jdoubleArray, jboolean *); + jboolean* (*GetBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*); + jbyte* (*GetByteArrayElements)(JNIEnv*, jbyteArray, jboolean*); + jchar* (*GetCharArrayElements)(JNIEnv*, jcharArray, jboolean*); + jshort* (*GetShortArrayElements)(JNIEnv*, jshortArray, jboolean*); + jint* (*GetIntArrayElements)(JNIEnv*, jintArray, jboolean*); + jlong* (*GetLongArrayElements)(JNIEnv*, jlongArray, jboolean*); + jfloat* (*GetFloatArrayElements)(JNIEnv*, jfloatArray, jboolean*); + jdouble* (*GetDoubleArrayElements)(JNIEnv*, jdoubleArray, jboolean*); + + void (*ReleaseBooleanArrayElements)(JNIEnv*, jbooleanArray, jboolean*, jint); + void (*ReleaseByteArrayElements)(JNIEnv*, jbyteArray, jbyte*, jint); + void (*ReleaseCharArrayElements)(JNIEnv*, jcharArray, jchar*, jint); + void (*ReleaseShortArrayElements)(JNIEnv*, jshortArray, jshort*, jint); + void (*ReleaseIntArrayElements)(JNIEnv*, jintArray, jint*, jint); + void (*ReleaseLongArrayElements)(JNIEnv*, jlongArray, jlong*, jint); + void (*ReleaseFloatArrayElements)(JNIEnv*, jfloatArray, jfloat*, jint); + void (*ReleaseDoubleArrayElements)(JNIEnv*, jdoubleArray, jdouble*, jint); void ( - *ReleaseBooleanArrayElements)(JNIEnv *, jbooleanArray, jboolean *, jint); - void (*ReleaseByteArrayElements)(JNIEnv *, jbyteArray, jbyte *, jint); - void (*ReleaseCharArrayElements)(JNIEnv *, jcharArray, jchar *, jint); - void (*ReleaseShortArrayElements)(JNIEnv *, jshortArray, jshort *, jint); - void (*ReleaseIntArrayElements)(JNIEnv *, jintArray, jint *, jint); - void (*ReleaseLongArrayElements)(JNIEnv *, jlongArray, jlong *, jint); - void (*ReleaseFloatArrayElements)(JNIEnv *, jfloatArray, jfloat *, jint); - void (*ReleaseDoubleArrayElements)(JNIEnv *, jdoubleArray, jdouble *, jint); - - void (*GetBooleanArrayRegion)( - JNIEnv *, - jbooleanArray, - jsize, - jsize, - jboolean *); - void (*GetByteArrayRegion)(JNIEnv *, jbyteArray, jsize, jsize, jbyte *); - void (*GetCharArrayRegion)(JNIEnv *, jcharArray, jsize, jsize, jchar *); - void (*GetShortArrayRegion)(JNIEnv *, jshortArray, jsize, jsize, jshort *); - void (*GetIntArrayRegion)(JNIEnv *, jintArray, jsize, jsize, jint *); - void (*GetLongArrayRegion)(JNIEnv *, jlongArray, jsize, jsize, jlong *); - void (*GetFloatArrayRegion)(JNIEnv *, jfloatArray, jsize, jsize, jfloat *); - void (*GetDoubleArrayRegion)(JNIEnv *, jdoubleArray, jsize, jsize, jdouble *); + *GetBooleanArrayRegion)(JNIEnv*, jbooleanArray, jsize, jsize, jboolean*); + void (*GetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, jbyte*); + void (*GetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, jchar*); + void (*GetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, jshort*); + void (*GetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, jint*); + void (*GetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, jlong*); + void (*GetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, jfloat*); + void (*GetDoubleArrayRegion)(JNIEnv*, jdoubleArray, jsize, jsize, jdouble*); /* spec shows these without const; some jni.h do, some don't */ void (*SetBooleanArrayRegion)( - JNIEnv *, + JNIEnv*, jbooleanArray, jsize, jsize, - const jboolean *); - void (*SetByteArrayRegion)(JNIEnv *, jbyteArray, jsize, jsize, const jbyte *); - void (*SetCharArrayRegion)(JNIEnv *, jcharArray, jsize, jsize, const jchar *); - void (*SetShortArrayRegion)( - JNIEnv *, - jshortArray, - jsize, - jsize, - const jshort *); - void (*SetIntArrayRegion)(JNIEnv *, jintArray, jsize, jsize, const jint *); - void (*SetLongArrayRegion)(JNIEnv *, jlongArray, jsize, jsize, const jlong *); - void (*SetFloatArrayRegion)( - JNIEnv *, - jfloatArray, - jsize, - jsize, - const jfloat *); + const jboolean*); + void (*SetByteArrayRegion)(JNIEnv*, jbyteArray, jsize, jsize, const jbyte*); + void (*SetCharArrayRegion)(JNIEnv*, jcharArray, jsize, jsize, const jchar*); + void ( + *SetShortArrayRegion)(JNIEnv*, jshortArray, jsize, jsize, const jshort*); + void (*SetIntArrayRegion)(JNIEnv*, jintArray, jsize, jsize, const jint*); + void (*SetLongArrayRegion)(JNIEnv*, jlongArray, jsize, jsize, const jlong*); + void ( + *SetFloatArrayRegion)(JNIEnv*, jfloatArray, jsize, jsize, const jfloat*); void (*SetDoubleArrayRegion)( - JNIEnv *, + JNIEnv*, jdoubleArray, jsize, jsize, - const jdouble *); + const jdouble*); - jint (*RegisterNatives)(JNIEnv *, jclass, const JNINativeMethod *, jint); - jint (*UnregisterNatives)(JNIEnv *, jclass); - jint (*MonitorEnter)(JNIEnv *, jobject); - jint (*MonitorExit)(JNIEnv *, jobject); - jint (*GetJavaVM)(JNIEnv *, JavaVM **); + jint (*RegisterNatives)(JNIEnv*, jclass, const JNINativeMethod*, jint); + jint (*UnregisterNatives)(JNIEnv*, jclass); + jint (*MonitorEnter)(JNIEnv*, jobject); + jint (*MonitorExit)(JNIEnv*, jobject); + jint (*GetJavaVM)(JNIEnv*, JavaVM**); - void (*GetStringRegion)(JNIEnv *, jstring, jsize, jsize, jchar *); - void (*GetStringUTFRegion)(JNIEnv *, jstring, jsize, jsize, char *); + void (*GetStringRegion)(JNIEnv*, jstring, jsize, jsize, jchar*); + void (*GetStringUTFRegion)(JNIEnv*, jstring, jsize, jsize, char*); - void *(*GetPrimitiveArrayCritical)(JNIEnv *, jarray, jboolean *); - void (*ReleasePrimitiveArrayCritical)(JNIEnv *, jarray, void *, jint); + void* (*GetPrimitiveArrayCritical)(JNIEnv*, jarray, jboolean*); + void (*ReleasePrimitiveArrayCritical)(JNIEnv*, jarray, void*, jint); - const jchar *(*GetStringCritical)(JNIEnv *, jstring, jboolean *); - void (*ReleaseStringCritical)(JNIEnv *, jstring, const jchar *); + const jchar* (*GetStringCritical)(JNIEnv*, jstring, jboolean*); + void (*ReleaseStringCritical)(JNIEnv*, jstring, const jchar*); - jweak (*NewWeakGlobalRef)(JNIEnv *, jobject); - void (*DeleteWeakGlobalRef)(JNIEnv *, jweak); + jweak (*NewWeakGlobalRef)(JNIEnv*, jobject); + void (*DeleteWeakGlobalRef)(JNIEnv*, jweak); - jboolean (*ExceptionCheck)(JNIEnv *); + jboolean (*ExceptionCheck)(JNIEnv*); - jobject (*NewDirectByteBuffer)(JNIEnv *, void *, jlong); - void *(*GetDirectBufferAddress)(JNIEnv *, jobject); - jlong (*GetDirectBufferCapacity)(JNIEnv *, jobject); + jobject (*NewDirectByteBuffer)(JNIEnv*, void*, jlong); + void* (*GetDirectBufferAddress)(JNIEnv*, jobject); + jlong (*GetDirectBufferCapacity)(JNIEnv*, jobject); /* added in JNI 1.6 */ - jobjectRefType (*GetObjectRefType)(JNIEnv *, jobject); + jobjectRefType (*GetObjectRefType)(JNIEnv*, jobject); }; /* @@ -557,7 +506,7 @@ struct JNINativeInterface { */ struct _JNIEnv { /* do not rename this; it does not seem to be entirely opaque */ - const struct JNINativeInterface *functions; + const struct JNINativeInterface* functions; #if defined(__cplusplus) @@ -566,14 +515,14 @@ struct _JNIEnv { } jclass DefineClass( - const char *name, + const char* name, jobject loader, - const jbyte *buf, + const jbyte* buf, jsize bufLen) { return functions->DefineClass(this, name, loader, buf, bufLen); } - jclass FindClass(const char *name) { + jclass FindClass(const char* name) { return functions->FindClass(this, name); } @@ -605,7 +554,7 @@ struct _JNIEnv { return functions->Throw(this, obj); } - jint ThrowNew(jclass clazz, const char *message) { + jint ThrowNew(jclass clazz, const char* message) { return functions->ThrowNew(this, clazz, message); } @@ -621,7 +570,7 @@ struct _JNIEnv { functions->ExceptionClear(this); } - void FatalError(const char *msg) { + void FatalError(const char* msg) { functions->FatalError(this, msg); } @@ -673,7 +622,7 @@ struct _JNIEnv { return functions->NewObjectV(this, clazz, methodID, args); } - jobject NewObjectA(jclass clazz, jmethodID methodID, jvalue *args) { + jobject NewObjectA(jclass clazz, jmethodID methodID, jvalue* args) { return functions->NewObjectA(this, clazz, methodID, args); } @@ -685,7 +634,7 @@ struct _JNIEnv { return functions->IsInstanceOf(this, obj, clazz); } - jmethodID GetMethodID(jclass clazz, const char *name, const char *sig) { + jmethodID GetMethodID(jclass clazz, const char* name, const char* sig) { return functions->GetMethodID(this, clazz, name, sig); } @@ -705,7 +654,7 @@ struct _JNIEnv { } #define CALL_TYPE_METHODA(_jtype, _jname) \ _jtype Call##_jname##MethodA( \ - jobject obj, jmethodID methodID, jvalue *args) { \ + jobject obj, jmethodID methodID, jvalue* args) { \ return functions->Call##_jname##MethodA(this, obj, methodID, args); \ } @@ -733,7 +682,7 @@ struct _JNIEnv { void CallVoidMethodV(jobject obj, jmethodID methodID, va_list args) { functions->CallVoidMethodV(this, obj, methodID, args); } - void CallVoidMethodA(jobject obj, jmethodID methodID, jvalue *args) { + void CallVoidMethodA(jobject obj, jmethodID methodID, jvalue* args) { functions->CallVoidMethodA(this, obj, methodID, args); } @@ -756,7 +705,7 @@ struct _JNIEnv { } #define CALL_NONVIRT_TYPE_METHODA(_jtype, _jname) \ _jtype CallNonvirtual##_jname##MethodA( \ - jobject obj, jclass clazz, jmethodID methodID, jvalue *args) { \ + jobject obj, jclass clazz, jmethodID methodID, jvalue* args) { \ return functions->CallNonvirtual##_jname##MethodA( \ this, obj, clazz, methodID, args); \ } @@ -794,11 +743,11 @@ struct _JNIEnv { jobject obj, jclass clazz, jmethodID methodID, - jvalue *args) { + jvalue* args) { functions->CallNonvirtualVoidMethodA(this, obj, clazz, methodID, args); } - jfieldID GetFieldID(jclass clazz, const char *name, const char *sig) { + jfieldID GetFieldID(jclass clazz, const char* name, const char* sig) { return functions->GetFieldID(this, clazz, name, sig); } @@ -858,7 +807,7 @@ struct _JNIEnv { functions->SetDoubleField(this, obj, fieldID, value); } - jmethodID GetStaticMethodID(jclass clazz, const char *name, const char *sig) { + jmethodID GetStaticMethodID(jclass clazz, const char* name, const char* sig) { return functions->GetStaticMethodID(this, clazz, name, sig); } @@ -880,7 +829,7 @@ struct _JNIEnv { } #define CALL_STATIC_TYPE_METHODA(_jtype, _jname) \ _jtype CallStatic##_jname##MethodA( \ - jclass clazz, jmethodID methodID, jvalue *args) { \ + jclass clazz, jmethodID methodID, jvalue* args) { \ return functions->CallStatic##_jname##MethodA( \ this, clazz, methodID, args); \ } @@ -909,11 +858,11 @@ struct _JNIEnv { void CallStaticVoidMethodV(jclass clazz, jmethodID methodID, va_list args) { functions->CallStaticVoidMethodV(this, clazz, methodID, args); } - void CallStaticVoidMethodA(jclass clazz, jmethodID methodID, jvalue *args) { + void CallStaticVoidMethodA(jclass clazz, jmethodID methodID, jvalue* args) { functions->CallStaticVoidMethodA(this, clazz, methodID, args); } - jfieldID GetStaticFieldID(jclass clazz, const char *name, const char *sig) { + jfieldID GetStaticFieldID(jclass clazz, const char* name, const char* sig) { return functions->GetStaticFieldID(this, clazz, name, sig); } @@ -973,7 +922,7 @@ struct _JNIEnv { functions->SetStaticDoubleField(this, clazz, fieldID, value); } - jstring NewString(const jchar *unicodeChars, jsize len) { + jstring NewString(const jchar* unicodeChars, jsize len) { return functions->NewString(this, unicodeChars, len); } @@ -981,15 +930,15 @@ struct _JNIEnv { return functions->GetStringLength(this, string); } - const jchar *GetStringChars(jstring string, jboolean *isCopy) { + const jchar* GetStringChars(jstring string, jboolean* isCopy) { return functions->GetStringChars(this, string, isCopy); } - void ReleaseStringChars(jstring string, const jchar *chars) { + void ReleaseStringChars(jstring string, const jchar* chars) { functions->ReleaseStringChars(this, string, chars); } - jstring NewStringUTF(const char *bytes) { + jstring NewStringUTF(const char* bytes) { return functions->NewStringUTF(this, bytes); } @@ -997,11 +946,11 @@ struct _JNIEnv { return functions->GetStringUTFLength(this, string); } - const char *GetStringUTFChars(jstring string, jboolean *isCopy) { + const char* GetStringUTFChars(jstring string, jboolean* isCopy) { return functions->GetStringUTFChars(this, string, isCopy); } - void ReleaseStringUTFChars(jstring string, const char *utf) { + void ReleaseStringUTFChars(jstring string, const char* utf) { functions->ReleaseStringUTFChars(this, string, utf); } @@ -1048,55 +997,55 @@ struct _JNIEnv { return functions->NewDoubleArray(this, length); } - jboolean *GetBooleanArrayElements(jbooleanArray array, jboolean *isCopy) { + jboolean* GetBooleanArrayElements(jbooleanArray array, jboolean* isCopy) { return functions->GetBooleanArrayElements(this, array, isCopy); } - jbyte *GetByteArrayElements(jbyteArray array, jboolean *isCopy) { + jbyte* GetByteArrayElements(jbyteArray array, jboolean* isCopy) { return functions->GetByteArrayElements(this, array, isCopy); } - jchar *GetCharArrayElements(jcharArray array, jboolean *isCopy) { + jchar* GetCharArrayElements(jcharArray array, jboolean* isCopy) { return functions->GetCharArrayElements(this, array, isCopy); } - jshort *GetShortArrayElements(jshortArray array, jboolean *isCopy) { + jshort* GetShortArrayElements(jshortArray array, jboolean* isCopy) { return functions->GetShortArrayElements(this, array, isCopy); } - jint *GetIntArrayElements(jintArray array, jboolean *isCopy) { + jint* GetIntArrayElements(jintArray array, jboolean* isCopy) { return functions->GetIntArrayElements(this, array, isCopy); } - jlong *GetLongArrayElements(jlongArray array, jboolean *isCopy) { + jlong* GetLongArrayElements(jlongArray array, jboolean* isCopy) { return functions->GetLongArrayElements(this, array, isCopy); } - jfloat *GetFloatArrayElements(jfloatArray array, jboolean *isCopy) { + jfloat* GetFloatArrayElements(jfloatArray array, jboolean* isCopy) { return functions->GetFloatArrayElements(this, array, isCopy); } - jdouble *GetDoubleArrayElements(jdoubleArray array, jboolean *isCopy) { + jdouble* GetDoubleArrayElements(jdoubleArray array, jboolean* isCopy) { return functions->GetDoubleArrayElements(this, array, isCopy); } void - ReleaseBooleanArrayElements(jbooleanArray array, jboolean *elems, jint mode) { + ReleaseBooleanArrayElements(jbooleanArray array, jboolean* elems, jint mode) { functions->ReleaseBooleanArrayElements(this, array, elems, mode); } - void ReleaseByteArrayElements(jbyteArray array, jbyte *elems, jint mode) { + void ReleaseByteArrayElements(jbyteArray array, jbyte* elems, jint mode) { functions->ReleaseByteArrayElements(this, array, elems, mode); } - void ReleaseCharArrayElements(jcharArray array, jchar *elems, jint mode) { + void ReleaseCharArrayElements(jcharArray array, jchar* elems, jint mode) { functions->ReleaseCharArrayElements(this, array, elems, mode); } - void ReleaseShortArrayElements(jshortArray array, jshort *elems, jint mode) { + void ReleaseShortArrayElements(jshortArray array, jshort* elems, jint mode) { functions->ReleaseShortArrayElements(this, array, elems, mode); } - void ReleaseIntArrayElements(jintArray array, jint *elems, jint mode) { + void ReleaseIntArrayElements(jintArray array, jint* elems, jint mode) { functions->ReleaseIntArrayElements(this, array, elems, mode); } - void ReleaseLongArrayElements(jlongArray array, jlong *elems, jint mode) { + void ReleaseLongArrayElements(jlongArray array, jlong* elems, jint mode) { functions->ReleaseLongArrayElements(this, array, elems, mode); } - void ReleaseFloatArrayElements(jfloatArray array, jfloat *elems, jint mode) { + void ReleaseFloatArrayElements(jfloatArray array, jfloat* elems, jint mode) { functions->ReleaseFloatArrayElements(this, array, elems, mode); } void - ReleaseDoubleArrayElements(jdoubleArray array, jdouble *elems, jint mode) { + ReleaseDoubleArrayElements(jdoubleArray array, jdouble* elems, jint mode) { functions->ReleaseDoubleArrayElements(this, array, elems, mode); } @@ -1104,37 +1053,37 @@ struct _JNIEnv { jbooleanArray array, jsize start, jsize len, - jboolean *buf) { + jboolean* buf) { functions->GetBooleanArrayRegion(this, array, start, len, buf); } void - GetByteArrayRegion(jbyteArray array, jsize start, jsize len, jbyte *buf) { + GetByteArrayRegion(jbyteArray array, jsize start, jsize len, jbyte* buf) { functions->GetByteArrayRegion(this, array, start, len, buf); } void - GetCharArrayRegion(jcharArray array, jsize start, jsize len, jchar *buf) { + GetCharArrayRegion(jcharArray array, jsize start, jsize len, jchar* buf) { functions->GetCharArrayRegion(this, array, start, len, buf); } void - GetShortArrayRegion(jshortArray array, jsize start, jsize len, jshort *buf) { + GetShortArrayRegion(jshortArray array, jsize start, jsize len, jshort* buf) { functions->GetShortArrayRegion(this, array, start, len, buf); } - void GetIntArrayRegion(jintArray array, jsize start, jsize len, jint *buf) { + void GetIntArrayRegion(jintArray array, jsize start, jsize len, jint* buf) { functions->GetIntArrayRegion(this, array, start, len, buf); } void - GetLongArrayRegion(jlongArray array, jsize start, jsize len, jlong *buf) { + GetLongArrayRegion(jlongArray array, jsize start, jsize len, jlong* buf) { functions->GetLongArrayRegion(this, array, start, len, buf); } void - GetFloatArrayRegion(jfloatArray array, jsize start, jsize len, jfloat *buf) { + GetFloatArrayRegion(jfloatArray array, jsize start, jsize len, jfloat* buf) { functions->GetFloatArrayRegion(this, array, start, len, buf); } void GetDoubleArrayRegion( jdoubleArray array, jsize start, jsize len, - jdouble *buf) { + jdouble* buf) { functions->GetDoubleArrayRegion(this, array, start, len, buf); } @@ -1142,58 +1091,58 @@ struct _JNIEnv { jbooleanArray array, jsize start, jsize len, - const jboolean *buf) { + const jboolean* buf) { functions->SetBooleanArrayRegion(this, array, start, len, buf); } void SetByteArrayRegion( jbyteArray array, jsize start, jsize len, - const jbyte *buf) { + const jbyte* buf) { functions->SetByteArrayRegion(this, array, start, len, buf); } void SetCharArrayRegion( jcharArray array, jsize start, jsize len, - const jchar *buf) { + const jchar* buf) { functions->SetCharArrayRegion(this, array, start, len, buf); } void SetShortArrayRegion( jshortArray array, jsize start, jsize len, - const jshort *buf) { + const jshort* buf) { functions->SetShortArrayRegion(this, array, start, len, buf); } void - SetIntArrayRegion(jintArray array, jsize start, jsize len, const jint *buf) { + SetIntArrayRegion(jintArray array, jsize start, jsize len, const jint* buf) { functions->SetIntArrayRegion(this, array, start, len, buf); } void SetLongArrayRegion( jlongArray array, jsize start, jsize len, - const jlong *buf) { + const jlong* buf) { functions->SetLongArrayRegion(this, array, start, len, buf); } void SetFloatArrayRegion( jfloatArray array, jsize start, jsize len, - const jfloat *buf) { + const jfloat* buf) { functions->SetFloatArrayRegion(this, array, start, len, buf); } void SetDoubleArrayRegion( jdoubleArray array, jsize start, jsize len, - const jdouble *buf) { + const jdouble* buf) { functions->SetDoubleArrayRegion(this, array, start, len, buf); } jint - RegisterNatives(jclass clazz, const JNINativeMethod *methods, jint nMethods) { + RegisterNatives(jclass clazz, const JNINativeMethod* methods, jint nMethods) { return functions->RegisterNatives(this, clazz, methods, nMethods); } @@ -1209,31 +1158,31 @@ struct _JNIEnv { return functions->MonitorExit(this, obj); } - jint GetJavaVM(JavaVM **vm) { + jint GetJavaVM(JavaVM** vm) { return functions->GetJavaVM(this, vm); } - void GetStringRegion(jstring str, jsize start, jsize len, jchar *buf) { + void GetStringRegion(jstring str, jsize start, jsize len, jchar* buf) { functions->GetStringRegion(this, str, start, len, buf); } - void GetStringUTFRegion(jstring str, jsize start, jsize len, char *buf) { + void GetStringUTFRegion(jstring str, jsize start, jsize len, char* buf) { return functions->GetStringUTFRegion(this, str, start, len, buf); } - void *GetPrimitiveArrayCritical(jarray array, jboolean *isCopy) { + void* GetPrimitiveArrayCritical(jarray array, jboolean* isCopy) { return functions->GetPrimitiveArrayCritical(this, array, isCopy); } - void ReleasePrimitiveArrayCritical(jarray array, void *carray, jint mode) { + void ReleasePrimitiveArrayCritical(jarray array, void* carray, jint mode) { functions->ReleasePrimitiveArrayCritical(this, array, carray, mode); } - const jchar *GetStringCritical(jstring string, jboolean *isCopy) { + const jchar* GetStringCritical(jstring string, jboolean* isCopy) { return functions->GetStringCritical(this, string, isCopy); } - void ReleaseStringCritical(jstring string, const jchar *carray) { + void ReleaseStringCritical(jstring string, const jchar* carray) { functions->ReleaseStringCritical(this, string, carray); } @@ -1249,11 +1198,11 @@ struct _JNIEnv { return functions->ExceptionCheck(this); } - jobject NewDirectByteBuffer(void *address, jlong capacity) { + jobject NewDirectByteBuffer(void* address, jlong capacity) { return functions->NewDirectByteBuffer(this, address, capacity); } - void *GetDirectBufferAddress(jobject buf) { + void* GetDirectBufferAddress(jobject buf) { return functions->GetDirectBufferAddress(this, buf); } @@ -1272,37 +1221,37 @@ struct _JNIEnv { * JNI invocation interface. */ struct JNIInvokeInterface { - void *reserved0; - void *reserved1; - void *reserved2; + void* reserved0; + void* reserved1; + void* reserved2; - jint (*DestroyJavaVM)(JavaVM *); - jint (*AttachCurrentThread)(JavaVM *, JNIEnv **, void *); - jint (*DetachCurrentThread)(JavaVM *); - jint (*GetEnv)(JavaVM *, void **, jint); - jint (*AttachCurrentThreadAsDaemon)(JavaVM *, JNIEnv **, void *); + jint (*DestroyJavaVM)(JavaVM*); + jint (*AttachCurrentThread)(JavaVM*, JNIEnv**, void*); + jint (*DetachCurrentThread)(JavaVM*); + jint (*GetEnv)(JavaVM*, void**, jint); + jint (*AttachCurrentThreadAsDaemon)(JavaVM*, JNIEnv**, void*); }; /* * C++ version. */ struct _JavaVM { - const struct JNIInvokeInterface *functions; + const struct JNIInvokeInterface* functions; #if defined(__cplusplus) jint DestroyJavaVM() { return functions->DestroyJavaVM(this); } - jint AttachCurrentThread(JNIEnv **p_env, void *thr_args) { + jint AttachCurrentThread(JNIEnv** p_env, void* thr_args) { return functions->AttachCurrentThread(this, p_env, thr_args); } jint DetachCurrentThread() { return functions->DetachCurrentThread(this); } - jint GetEnv(void **env, jint version) { + jint GetEnv(void** env, jint version) { return functions->GetEnv(this, env, version); } - jint AttachCurrentThreadAsDaemon(JNIEnv **p_env, void *thr_args) { + jint AttachCurrentThreadAsDaemon(JNIEnv** p_env, void* thr_args) { return functions->AttachCurrentThreadAsDaemon(this, p_env, thr_args); } #endif /*__cplusplus*/ @@ -1310,7 +1259,7 @@ struct _JavaVM { struct JavaVMAttachArgs { jint version; /* must be >= JNI_VERSION_1_2 */ - const char *name; /* NULL or name of thread as modified UTF-8 str */ + const char* name; /* NULL or name of thread as modified UTF-8 str */ jobject group; /* global ref of a ThreadGroup object, or NULL */ }; typedef struct JavaVMAttachArgs JavaVMAttachArgs; @@ -1320,15 +1269,15 @@ typedef struct JavaVMAttachArgs JavaVMAttachArgs; * longer supported.) */ typedef struct JavaVMOption { - const char *optionString; - void *extraInfo; + const char* optionString; + void* extraInfo; } JavaVMOption; typedef struct JavaVMInitArgs { jint version; /* use JNI_VERSION_1_2 or later */ jint nOptions; - JavaVMOption *options; + JavaVMOption* options; jboolean ignoreUnrecognized; } JavaVMInitArgs; @@ -1340,9 +1289,9 @@ extern "C" { * * Note these are the only symbols exported for JNI by the VM. */ -jint JNI_GetDefaultJavaVMInitArgs(void *); -jint JNI_CreateJavaVM(JavaVM **, JNIEnv **, void *); -jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); +jint JNI_GetDefaultJavaVMInitArgs(void*); +jint JNI_CreateJavaVM(JavaVM**, JNIEnv**, void*); +jint JNI_GetCreatedJavaVMs(JavaVM**, jsize, jsize*); #define JNIIMPORT #define JNIEXPORT __attribute__((visibility("default"))) @@ -1352,8 +1301,8 @@ jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); * Prototypes for functions exported by loadable shared libs. These are * called by JNI, not provided by JNI. */ -JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved); -JNIEXPORT void JNI_OnUnload(JavaVM *vm, void *reserved); +JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved); +JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved); #ifdef __cplusplus } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp index 34a4b040cf5..62eab4858fb 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.cpp @@ -14,8 +14,8 @@ namespace facebook::react { AsyncEventBeat::AsyncEventBeat( - const EventBeat::SharedOwnerBox &ownerBox, - EventBeatManager *eventBeatManager, + const EventBeat::SharedOwnerBox& ownerBox, + EventBeatManager* eventBeatManager, RuntimeExecutor runtimeExecutor, jni::global_ref javaUIManager) : EventBeat(ownerBox), @@ -37,7 +37,7 @@ void AsyncEventBeat::tick() const { isRequested_ = false; isBeatCallbackScheduled_ = true; - runtimeExecutor_([this, ownerBox = ownerBox_](jsi::Runtime &runtime) { + runtimeExecutor_([this, ownerBox = ownerBox_](jsi::Runtime& runtime) { isBeatCallbackScheduled_ = false; auto owner = ownerBox->owner.lock(); if (!owner) { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h index ecad295e99d..a45567a3948 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/AsyncEventBeat.h @@ -16,8 +16,8 @@ namespace facebook::react { class AsyncEventBeat final : public EventBeat, public EventBeatManagerObserver { public: AsyncEventBeat( - const EventBeat::SharedOwnerBox &ownerBox, - EventBeatManager *eventBeatManager, + const EventBeat::SharedOwnerBox& ownerBox, + EventBeatManager* eventBeatManager, RuntimeExecutor runtimeExecutor, jni::global_ref javaUIManager); @@ -30,7 +30,7 @@ class AsyncEventBeat final : public EventBeat, public EventBeatManagerObserver { void request() const override; private: - EventBeatManager *eventBeatManager_; + EventBeatManager* eventBeatManager_; RuntimeExecutor runtimeExecutor_; jni::global_ref javaUIManager_; mutable std::atomic isBeatCallbackScheduled_{false}; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp index 532c850fa2e..e3c954552fb 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.cpp @@ -61,7 +61,7 @@ Binding::getInspectorDataForInstance( return ReadableNativeMap::newObjectCxxArgs(folly::dynamic::object()); } - EventEmitterWrapper *cEventEmitter = cthis(eventEmitterWrapper); + EventEmitterWrapper* cEventEmitter = cthis(eventEmitterWrapper); InspectorData data = scheduler->getInspectorDataForInstance(*cEventEmitter->eventEmitter); @@ -72,7 +72,7 @@ Binding::getInspectorDataForInstance( result["selectedIndex"] = data.selectedIndex; result["props"] = data.props; auto hierarchy = folly::dynamic::array(); - for (const auto &hierarchyItem : data.hierarchy) { + for (const auto& hierarchyItem : data.hierarchy) { hierarchy.push_back(hierarchyItem); } result["hierarchy"] = hierarchy; @@ -82,7 +82,7 @@ Binding::getInspectorDataForInstance( constexpr static auto kReactFeatureFlagsJavaDescriptor = "com/facebook/react/config/ReactFeatureFlags"; -static bool getFeatureFlagValue(const char *name) { +static bool getFeatureFlagValue(const char* name) { static const auto reactFeatureFlagsClass = jni::findClassStatic(kReactFeatureFlagsJavaDescriptor); const auto field = reactFeatureFlagsClass->getStaticField(name); @@ -98,7 +98,7 @@ void Binding::driveCxxAnimations() { } void Binding::reportMount(SurfaceId surfaceId) { - const auto &scheduler = getScheduler(); + const auto& scheduler = getScheduler(); if (!scheduler) { LOG(ERROR) << "Binding::reportMount: scheduler disappeared"; return; @@ -111,7 +111,7 @@ void Binding::reportMount(SurfaceId surfaceId) { void Binding::startSurface( jint surfaceId, jni::alias_ref moduleName, - NativeMap *initialProps) { + NativeMap* initialProps) { SystraceSection s("FabricUIManagerBinding::startSurface"); auto scheduler = getScheduler(); @@ -152,7 +152,7 @@ void Binding::startSurface( void Binding::startSurfaceWithConstraints( jint surfaceId, jni::alias_ref moduleName, - NativeMap *initialProps, + NativeMap* initialProps, jfloat minWidth, jfloat maxWidth, jfloat minHeight, @@ -229,7 +229,7 @@ void Binding::renderTemplateToSurface(jint surfaceId, jstring uiTemplate) { } auto env = jni::Environment::current(); - const char *nativeString = env->GetStringUTFChars(uiTemplate, JNI_FALSE); + const char* nativeString = env->GetStringUTFChars(uiTemplate, JNI_FALSE); scheduler->renderTemplateToSurface(surfaceId, nativeString); env->ReleaseStringUTFChars(uiTemplate, nativeString); } @@ -271,8 +271,8 @@ void Binding::stopSurface(jint surfaceId) { mountingManager->onSurfaceStop(surfaceId); } -void Binding::registerSurface(SurfaceHandlerBinding *surfaceHandlerBinding) { - const auto &surfaceHandler = surfaceHandlerBinding->getSurfaceHandler(); +void Binding::registerSurface(SurfaceHandlerBinding* surfaceHandlerBinding) { + const auto& surfaceHandler = surfaceHandlerBinding->getSurfaceHandler(); auto scheduler = getScheduler(); if (!scheduler) { LOG(ERROR) << "Binding::registerSurface: scheduler disappeared"; @@ -287,8 +287,8 @@ void Binding::registerSurface(SurfaceHandlerBinding *surfaceHandlerBinding) { mountingManager->onSurfaceStart(surfaceHandler.getSurfaceId()); } -void Binding::unregisterSurface(SurfaceHandlerBinding *surfaceHandlerBinding) { - const auto &surfaceHandler = surfaceHandlerBinding->getSurfaceHandler(); +void Binding::unregisterSurface(SurfaceHandlerBinding* surfaceHandlerBinding) { + const auto& surfaceHandler = surfaceHandlerBinding->getSurfaceHandler(); auto scheduler = getScheduler(); if (!scheduler) { LOG(ERROR) << "Binding::unregisterSurface: scheduler disappeared"; @@ -348,7 +348,7 @@ void Binding::setConstraints( return; } - auto &surfaceHandler = iterator->second; + auto& surfaceHandler = iterator->second; surfaceHandler.constraintLayout(constraints, context); } } @@ -359,8 +359,8 @@ void Binding::installFabricUIManager( jni::alias_ref runtimeExecutorHolder, jni::alias_ref runtimeSchedulerHolder, jni::alias_ref javaUIManager, - EventBeatManager *eventBeatManager, - ComponentFactory *componentsRegistry, + EventBeatManager* eventBeatManager, + ComponentFactory* componentsRegistry, jni::alias_ref reactNativeConfig) { SystraceSection s("FabricUIManagerBinding::installFabricUIManager"); @@ -391,7 +391,7 @@ void Binding::installFabricUIManager( if (runtimeScheduler) { runtimeExecutor = [runtimeScheduler]( - std::function &&callback) { + std::function&& callback) { runtimeScheduler->scheduleWork(std::move(callback)); }; contextContainer->insert( @@ -403,7 +403,7 @@ void Binding::installFabricUIManager( // TODO: T31905686 Create synchronous Event Beat EventBeat::Factory synchronousBeatFactory = [eventBeatManager, runtimeExecutor, globalJavaUiManager]( - const EventBeat::SharedOwnerBox &ownerBox) + const EventBeat::SharedOwnerBox& ownerBox) -> std::unique_ptr { return std::make_unique( ownerBox, eventBeatManager, runtimeExecutor, globalJavaUiManager); @@ -411,7 +411,7 @@ void Binding::installFabricUIManager( EventBeat::Factory asynchronousBeatFactory = [eventBeatManager, runtimeExecutor, globalJavaUiManager]( - const EventBeat::SharedOwnerBox &ownerBox) + const EventBeat::SharedOwnerBox& ownerBox) -> std::unique_ptr { return std::make_unique( ownerBox, eventBeatManager, runtimeExecutor, globalJavaUiManager); @@ -479,7 +479,7 @@ void Binding::uninstallFabricUIManager() { } std::shared_ptr Binding::getMountingManager( - const char *locationHint) { + const char* locationHint) { std::shared_lock lock(installMutex_); if (!mountingManager_) { LOG(ERROR) << "FabricMountingManager::" << locationHint @@ -491,7 +491,7 @@ std::shared_ptr Binding::getMountingManager( } void Binding::schedulerDidFinishTransaction( - const MountingCoordinator::Shared &mountingCoordinator) { + const MountingCoordinator::Shared& mountingCoordinator) { auto mountingManager = getMountingManager("schedulerDidFinishTransaction"); if (!mountingManager) { return; @@ -506,7 +506,7 @@ void Binding::schedulerDidFinishTransaction( void Binding::schedulerDidRequestPreliminaryViewAllocation( const SurfaceId surfaceId, - const ShadowNode &shadowNode) { + const ShadowNode& shadowNode) { if (!shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView)) { return; } @@ -519,9 +519,9 @@ void Binding::schedulerDidRequestPreliminaryViewAllocation( } void Binding::schedulerDidDispatchCommand( - const ShadowView &shadowView, - const std::string &commandName, - const folly::dynamic &args) { + const ShadowView& shadowView, + const std::string& commandName, + const folly::dynamic& args) { auto mountingManager = getMountingManager("schedulerDidDispatchCommand"); if (!mountingManager) { return; @@ -530,8 +530,8 @@ void Binding::schedulerDidDispatchCommand( } void Binding::schedulerDidSendAccessibilityEvent( - const ShadowView &shadowView, - const std::string &eventType) { + const ShadowView& shadowView, + const std::string& eventType) { auto mountingManager = getMountingManager("schedulerDidSendAccessibilityEvent"); if (!mountingManager) { @@ -541,7 +541,7 @@ void Binding::schedulerDidSendAccessibilityEvent( } void Binding::schedulerDidSetIsJSResponder( - const ShadowView &shadowView, + const ShadowView& shadowView, bool isJSResponder, bool blockNativeResponder) { auto mountingManager = getMountingManager("schedulerDidSetIsJSResponder"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h index d4c974333ca..e735bb0b48d 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/Binding.h @@ -37,7 +37,7 @@ class Binding : public jni::HybridClass, public SchedulerDelegate, public LayoutAnimationStatusDelegate { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/BindingImpl;"; static void registerNatives(); @@ -65,19 +65,19 @@ class Binding : public jni::HybridClass, jni::alias_ref runtimeExecutorHolder, jni::alias_ref runtimeSchedulerHolder, jni::alias_ref javaUIManager, - EventBeatManager *eventBeatManager, - ComponentFactory *componentsRegistry, + EventBeatManager* eventBeatManager, + ComponentFactory* componentsRegistry, jni::alias_ref reactNativeConfig); void startSurface( jint surfaceId, jni::alias_ref moduleName, - NativeMap *initialProps); + NativeMap* initialProps); void startSurfaceWithConstraints( jint surfaceId, jni::alias_ref moduleName, - NativeMap *initialProps, + NativeMap* initialProps, jfloat minWidth, jfloat maxWidth, jfloat minHeight, @@ -91,28 +91,28 @@ class Binding : public jni::HybridClass, void stopSurface(jint surfaceId); - void registerSurface(SurfaceHandlerBinding *surfaceHandler); + void registerSurface(SurfaceHandlerBinding* surfaceHandler); - void unregisterSurface(SurfaceHandlerBinding *surfaceHandler); + void unregisterSurface(SurfaceHandlerBinding* surfaceHandler); void schedulerDidFinishTransaction( - const MountingCoordinator::Shared &mountingCoordinator) override; + const MountingCoordinator::Shared& mountingCoordinator) override; void schedulerDidRequestPreliminaryViewAllocation( const SurfaceId surfaceId, - const ShadowNode &shadowNode) override; + const ShadowNode& shadowNode) override; void schedulerDidDispatchCommand( - const ShadowView &shadowView, - const std::string &commandName, - const folly::dynamic &args) override; + const ShadowView& shadowView, + const std::string& commandName, + const folly::dynamic& args) override; void schedulerDidSendAccessibilityEvent( - const ShadowView &shadowView, - const std::string &eventType) override; + const ShadowView& shadowView, + const std::string& eventType) override; void schedulerDidSetIsJSResponder( - const ShadowView &shadowView, + const ShadowView& shadowView, bool isJSResponder, bool blockNativeResponder) override; @@ -129,7 +129,7 @@ class Binding : public jni::HybridClass, std::shared_ptr scheduler_; std::shared_ptr getMountingManager( - const char *locationHint); + const char* locationHint); // LayoutAnimations void onAnimationStarted() override; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h index b7ae67dd0e1..5aa76a17423 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ComponentFactory.h @@ -17,7 +17,7 @@ class Instance; class ComponentFactory : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/ComponentFactory;"; static void registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp index 27573c1a376..5cc5aae68d5 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.cpp @@ -26,7 +26,7 @@ namespace facebook::react { -CoreComponentsRegistry::CoreComponentsRegistry(ComponentFactory *delegate) +CoreComponentsRegistry::CoreComponentsRegistry(ComponentFactory* delegate) : delegate_(delegate) {} std::shared_ptr @@ -77,19 +77,18 @@ CoreComponentsRegistry::sharedProviderRegistry() { jni::local_ref CoreComponentsRegistry::initHybrid( jni::alias_ref, - ComponentFactory *delegate) { + ComponentFactory* delegate) { auto instance = makeCxxInstance(delegate); // TODO T69453179: Codegen this file auto buildRegistryFunction = - [](const EventDispatcher::Weak &eventDispatcher, - const ContextContainer::Shared &contextContainer) + [](const EventDispatcher::Weak& eventDispatcher, + const ContextContainer::Shared& contextContainer) -> ComponentDescriptorRegistry::Shared { auto registry = CoreComponentsRegistry::sharedProviderRegistry() ->createComponentDescriptorRegistry( {eventDispatcher, contextContainer}); - auto &mutableRegistry = - const_cast(*registry); + auto& mutableRegistry = const_cast(*registry); mutableRegistry.setFallbackComponentDescriptor( std::make_shared( ComponentDescriptorParameters{ diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h index 7a9ea250849..1f6b1475df0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/CoreComponentsRegistry.h @@ -22,7 +22,7 @@ class CoreComponentsRegistry static void registerNatives(); - explicit CoreComponentsRegistry(ComponentFactory *delegate); + explicit CoreComponentsRegistry(ComponentFactory* delegate); static std::shared_ptr sharedProviderRegistry(); @@ -30,11 +30,11 @@ class CoreComponentsRegistry private: friend HybridBase; - const ComponentFactory *delegate_; + const ComponentFactory* delegate_; static jni::local_ref initHybrid( jni::alias_ref, - ComponentFactory *delegate); + ComponentFactory* delegate); }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp index a8a546fbe23..04deb944ddb 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.cpp @@ -21,13 +21,13 @@ jni::local_ref EventBeatManager::initHybrid( } void EventBeatManager::addObserver( - const EventBeatManagerObserver &observer) const { + const EventBeatManagerObserver& observer) const { std::scoped_lock lock(mutex_); observers_.insert(&observer); } void EventBeatManager::removeObserver( - const EventBeatManagerObserver &observer) const { + const EventBeatManagerObserver& observer) const { std::scoped_lock lock(mutex_); observers_.erase(&observer); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h index 539dd4a3a44..6abb69fdeec 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventBeatManager.h @@ -29,7 +29,7 @@ class EventBeatManagerObserver { class EventBeatManager : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/events/EventBeatManager;"; static void registerNatives(); @@ -42,8 +42,8 @@ class EventBeatManager : public jni::HybridClass { * `EventBeatManager` does not own/retain observers; observers must overlive * the manager or be properly removed before deallocation. */ - void addObserver(const EventBeatManagerObserver &observer) const; - void removeObserver(const EventBeatManagerObserver &observer) const; + void addObserver(const EventBeatManagerObserver& observer) const; + void removeObserver(const EventBeatManagerObserver& observer) const; private: /* @@ -53,7 +53,7 @@ class EventBeatManager : public jni::HybridClass { jni::alias_ref jhybridobject_; - mutable std::unordered_set + mutable std::unordered_set observers_{}; // Protected by `mutex_` mutable std::mutex mutex_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp index 88e9f66d4be..5517304057c 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.cpp @@ -14,7 +14,7 @@ namespace facebook::react { void EventEmitterWrapper::dispatchEvent( std::string eventName, - NativeMap *payload, + NativeMap* payload, int category) { // It is marginal, but possible for this to be constructed without a valid // EventEmitter. In those cases, make sure we noop/blackhole events instead of @@ -30,7 +30,7 @@ void EventEmitterWrapper::dispatchEvent( void EventEmitterWrapper::dispatchUniqueEvent( std::string eventName, - NativeMap *payload, + NativeMap* payload, int customCoalesceKey) { // TODO: customCoalesceKey currently unused // It is marginal, but possible for this to be constructed without a valid diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h index 977fd13bca8..87cb2dfb5d0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/EventEmitterWrapper.h @@ -17,7 +17,7 @@ class Instance; class EventEmitterWrapper : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/events/EventEmitterWrapper;"; static void registerNatives(); @@ -27,10 +27,10 @@ class EventEmitterWrapper : public jni::HybridClass { SharedEventEmitter eventEmitter; - void dispatchEvent(std::string eventName, NativeMap *params, int category); + void dispatchEvent(std::string eventName, NativeMap* params, int category); void dispatchUniqueEvent( std::string eventName, - NativeMap *params, + NativeMap* params, int customCoalesceKey); }; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp index 7f20f2a19f9..b97d1e045b2 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.cpp @@ -32,7 +32,7 @@ namespace facebook::react { constexpr static auto kReactFeatureFlagsJavaDescriptor = "com/facebook/react/config/ReactFeatureFlags"; -static bool getFeatureFlagValue(const char *name) { +static bool getFeatureFlagValue(const char* name) { static const auto reactFeatureFlagsClass = jni::findClassStatic(kReactFeatureFlagsJavaDescriptor); const auto field = reactFeatureFlagsClass->getStaticField(name); @@ -40,8 +40,8 @@ static bool getFeatureFlagValue(const char *name) { } FabricMountingManager::FabricMountingManager( - std::shared_ptr &config, - jni::global_ref &javaUIManager) + std::shared_ptr& config, + jni::global_ref& javaUIManager) : javaUIManager_(javaUIManager), reduceDeleteCreateMutation_( getFeatureFlagValue("reduceDeleteCreateMutation")) {} @@ -85,8 +85,8 @@ static inline int getIntBufferSizeForType(CppMountItem::Type mountItemType) { static inline void updateBufferSizes( CppMountItem::Type mountItemType, int numInstructions, - int &batchMountItemIntsSize, - int &batchMountItemObjectsSize) { + int& batchMountItemIntsSize, + int& batchMountItemObjectsSize) { if (numInstructions == 0) { return; } @@ -109,20 +109,20 @@ static inline void updateBufferSizes( } static inline void computeBufferSizes( - int &batchMountItemIntsSize, - int &batchMountItemObjectsSize, - std::vector &cppCommonMountItems, - std::vector &cppDeleteMountItems, - std::vector &cppUpdatePropsMountItems, - std::vector &cppUpdateStateMountItems, - std::vector &cppUpdatePaddingMountItems, - std::vector &cppUpdateLayoutMountItems, - std::vector &cppUpdateOverflowInsetMountItems, - std::vector &cppUpdateEventEmitterMountItems) { + int& batchMountItemIntsSize, + int& batchMountItemObjectsSize, + std::vector& cppCommonMountItems, + std::vector& cppDeleteMountItems, + std::vector& cppUpdatePropsMountItems, + std::vector& cppUpdateStateMountItems, + std::vector& cppUpdatePaddingMountItems, + std::vector& cppUpdateLayoutMountItems, + std::vector& cppUpdateOverflowInsetMountItems, + std::vector& cppUpdateEventEmitterMountItems) { CppMountItem::Type lastType = CppMountItem::Type::Undefined; int numSameType = 0; - for (const auto &mountItem : cppCommonMountItems) { - const auto &mountItemType = mountItem.type; + for (const auto& mountItem : cppCommonMountItems) { + const auto& mountItemType = mountItem.type; if (lastType == mountItemType) { numSameType++; @@ -182,9 +182,9 @@ static inline void computeBufferSizes( static inline void writeIntBufferTypePreamble( int mountItemType, int numItems, - _JNIEnv *env, - jintArray &intBufferArray, - int &intBufferPosition) { + _JNIEnv* env, + jintArray& intBufferArray, + int& intBufferPosition) { jint temp[2]; if (numItems == 1) { temp[0] = mountItemType; @@ -199,11 +199,11 @@ static inline void writeIntBufferTypePreamble( } // TODO: this method will be removed when binding for components are code-gen -jni::local_ref getPlatformComponentName(const ShadowView &shadowView) { +jni::local_ref getPlatformComponentName(const ShadowView& shadowView) { static std::string scrollViewComponentName = std::string("ScrollView"); if (scrollViewComponentName == shadowView.componentName) { - const auto &newViewProps = - static_cast(*shadowView.props); + const auto& newViewProps = + static_cast(*shadowView.props); if (newViewProps.getProbablyMoreHorizontalThanVertical_DEPRECATED()) { return jni::make_jstring("AndroidHorizontalScrollView"); } @@ -228,8 +228,8 @@ static inline float scale(Float value, Float pointScaleFactor) { } jni::local_ref FabricMountingManager::getProps( - const ShadowView &oldShadowView, - const ShadowView &newShadowView) { + const ShadowView& oldShadowView, + const ShadowView& newShadowView) { if (CoreFeatures::enableMapBuffer && newShadowView.traits.check( ShadowNodeTraits::Trait::AndroidMapBufferPropsSupported)) { @@ -247,7 +247,7 @@ jni::local_ref FabricMountingManager::getProps( } void FabricMountingManager::executeMount( - const MountingTransaction &transaction) { + const MountingTransaction& transaction) { SystraceSection section("FabricMountingManager::executeMount"); std::scoped_lock lock(commitMutex_); @@ -257,7 +257,7 @@ void FabricMountingManager::executeMount( auto telemetry = transaction.getTelemetry(); auto surfaceId = transaction.getSurfaceId(); - auto &mutations = transaction.getMutations(); + auto& mutations = transaction.getMutations(); auto revisionNumber = telemetry.getRevisionNumber(); @@ -280,7 +280,7 @@ void FabricMountingManager::executeMount( // if falsy operand is a value type, the compiler will decide the expression // to be a value type, an unnecessary (sometimes expensive) copy will happen // as a result. - const auto &allocatedViewTags = + const auto& allocatedViewTags = allocatedViewsIterator != allocatedViewRegistry_.end() ? allocatedViewsIterator->second : defaultAllocatedViews; @@ -288,12 +288,12 @@ void FabricMountingManager::executeMount( LOG(ERROR) << "Executing commit after surface was stopped!"; } - for (const auto &mutation : mutations) { - const auto &parentShadowView = mutation.parentShadowView; - const auto &oldChildShadowView = mutation.oldChildShadowView; - const auto &newChildShadowView = mutation.newChildShadowView; - auto &mutationType = mutation.type; - auto &index = mutation.index; + for (const auto& mutation : mutations) { + const auto& parentShadowView = mutation.parentShadowView; + const auto& oldChildShadowView = mutation.oldChildShadowView; + const auto& newChildShadowView = mutation.newChildShadowView; + auto& mutationType = mutation.type; + auto& index = mutation.index; bool isVirtual = mutation.mutatedViewIsVirtual(); switch (mutationType) { @@ -311,7 +311,7 @@ void FabricMountingManager::executeMount( auto it = std::remove_if( cppDeleteMountItems.begin(), cppDeleteMountItems.end(), - [&](auto &deletedMountItem) -> bool { + [&](auto& deletedMountItem) -> bool { return deletedMountItem.oldChildShadowView.tag == newChildShadowView.tag; }); @@ -464,8 +464,8 @@ void FabricMountingManager::executeMount( } if (allocatedViewsIterator != allocatedViewRegistry_.end()) { - auto &views = allocatedViewsIterator->second; - for (const auto &mutation : mutations) { + auto& views = allocatedViewsIterator->second; + for (const auto& mutation : mutations) { switch (mutation.type) { case ShadowViewMutation::Create: views.insert(mutation.newChildShadowView.tag); @@ -543,8 +543,8 @@ void FabricMountingManager::executeMount( int prevMountItemType = -1; jint temp[7]; for (int i = 0; i < cppCommonMountItems.size(); i++) { - const auto &mountItem = cppCommonMountItems[i]; - const auto &mountItemType = mountItem.type; + const auto& mountItem = cppCommonMountItems[i]; + const auto& mountItemType = mountItem.type; // Get type here, and count forward how many items of this type are in a // row. Write preamble to any common type here. @@ -582,7 +582,7 @@ void FabricMountingManager::executeMount( jni::local_ref javaStateWrapper = nullptr; if (mountItem.newChildShadowView.state != nullptr) { javaStateWrapper = StateWrapperImpl::newObjectJavaArgs(); - StateWrapperImpl *cStateWrapper = cthis(javaStateWrapper); + StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper); cStateWrapper->state_ = mountItem.newChildShadowView.state; } @@ -629,7 +629,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdatePropsMountItems) { + for (const auto& mountItem : cppUpdatePropsMountItems) { temp[0] = mountItem.newChildShadowView.tag; env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp); intBufferPosition += 1; @@ -645,7 +645,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdateStateMountItems) { + for (const auto& mountItem : cppUpdateStateMountItems) { temp[0] = mountItem.newChildShadowView.tag; env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp); intBufferPosition += 1; @@ -657,7 +657,7 @@ void FabricMountingManager::executeMount( jni::local_ref javaStateWrapper = nullptr; if (state != nullptr) { javaStateWrapper = StateWrapperImpl::newObjectJavaArgs(); - StateWrapperImpl *cStateWrapper = cthis(javaStateWrapper); + StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper); cStateWrapper->state_ = state; } @@ -673,7 +673,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdatePaddingMountItems) { + for (const auto& mountItem : cppUpdatePaddingMountItems) { auto layoutMetrics = mountItem.newChildShadowView.layoutMetrics; auto pointScaleFactor = layoutMetrics.pointScaleFactor; auto contentInsets = layoutMetrics.contentInsets; @@ -700,7 +700,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdateLayoutMountItems) { + for (const auto& mountItem : cppUpdateLayoutMountItems) { auto layoutMetrics = mountItem.newChildShadowView.layoutMetrics; auto pointScaleFactor = layoutMetrics.pointScaleFactor; auto frame = layoutMetrics.frame; @@ -731,7 +731,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdateOverflowInsetMountItems) { + for (const auto& mountItem : cppUpdateOverflowInsetMountItems) { auto layoutMetrics = mountItem.newChildShadowView.layoutMetrics; auto pointScaleFactor = layoutMetrics.pointScaleFactor; auto overflowInset = layoutMetrics.overflowInset; @@ -761,7 +761,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppUpdateEventEmitterMountItems) { + for (const auto& mountItem : cppUpdateEventEmitterMountItems) { temp[0] = mountItem.newChildShadowView.tag; env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp); intBufferPosition += 1; @@ -786,7 +786,7 @@ void FabricMountingManager::executeMount( intBufferArray, intBufferPosition); - for (const auto &mountItem : cppDeleteMountItems) { + for (const auto& mountItem : cppDeleteMountItems) { temp[0] = mountItem.oldChildShadowView.tag; env->SetIntArrayRegion(intBufferArray, intBufferPosition, 1, temp); intBufferPosition += 1; @@ -821,14 +821,14 @@ void FabricMountingManager::executeMount( void FabricMountingManager::preallocateShadowView( SurfaceId surfaceId, - const ShadowView &shadowView) { + const ShadowView& shadowView) { { std::lock_guard lock(allocatedViewsMutex_); auto allocatedViewsIterator = allocatedViewRegistry_.find(surfaceId); if (allocatedViewsIterator == allocatedViewRegistry_.end()) { return; } - auto &allocatedViews = allocatedViewsIterator->second; + auto& allocatedViews = allocatedViewsIterator->second; if (allocatedViews.find(shadowView.tag) != allocatedViews.end()) { return; } @@ -849,7 +849,7 @@ void FabricMountingManager::preallocateShadowView( jni::local_ref javaStateWrapper = nullptr; if (shadowView.state != nullptr) { javaStateWrapper = StateWrapperImpl::newObjectJavaArgs(); - StateWrapperImpl *cStateWrapper = cthis(javaStateWrapper); + StateWrapperImpl* cStateWrapper = cthis(javaStateWrapper); cStateWrapper->state_ = shadowView.state; } @@ -872,9 +872,9 @@ void FabricMountingManager::preallocateShadowView( } void FabricMountingManager::dispatchCommand( - const ShadowView &shadowView, - const std::string &commandName, - const folly::dynamic &args) { + const ShadowView& shadowView, + const std::string& commandName, + const folly::dynamic& args) { static auto dispatchCommand = JFabricUIManager::javaClassStatic() ->getMethod( @@ -891,8 +891,8 @@ void FabricMountingManager::dispatchCommand( } void FabricMountingManager::sendAccessibilityEvent( - const ShadowView &shadowView, - const std::string &eventType) { + const ShadowView& shadowView, + const std::string& eventType) { static auto sendAccessibilityEventFromJS = JFabricUIManager::javaClassStatic()->getMethod( "sendAccessibilityEventFromJS"); @@ -903,7 +903,7 @@ void FabricMountingManager::sendAccessibilityEvent( } void FabricMountingManager::setIsJSResponder( - const ShadowView &shadowView, + const ShadowView& shadowView, bool isJSResponder, bool blockNativeResponder) { static auto setJSResponder = diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h index 716a3d6f2b2..400f6cadf18 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricMountingManager.h @@ -23,29 +23,29 @@ struct ShadowView; class FabricMountingManager final { public: FabricMountingManager( - std::shared_ptr &config, - jni::global_ref &javaUIManager); - FabricMountingManager(const FabricMountingManager &) = delete; + std::shared_ptr& config, + jni::global_ref& javaUIManager); + FabricMountingManager(const FabricMountingManager&) = delete; void onSurfaceStart(SurfaceId surfaceId); void onSurfaceStop(SurfaceId surfaceId); - void preallocateShadowView(SurfaceId surfaceId, const ShadowView &shadowView); + void preallocateShadowView(SurfaceId surfaceId, const ShadowView& shadowView); - void executeMount(const MountingTransaction &transaction); + void executeMount(const MountingTransaction& transaction); void dispatchCommand( - const ShadowView &shadowView, - const std::string &commandName, - const folly::dynamic &args); + const ShadowView& shadowView, + const std::string& commandName, + const folly::dynamic& args); void sendAccessibilityEvent( - const ShadowView &shadowView, - const std::string &eventType); + const ShadowView& shadowView, + const std::string& eventType); void setIsJSResponder( - const ShadowView &shadowView, + const ShadowView& shadowView, bool isJSResponder, bool blockNativeResponder); @@ -64,8 +64,8 @@ class FabricMountingManager final { const bool reduceDeleteCreateMutation_{false}; jni::local_ref getProps( - const ShadowView &oldShadowView, - const ShadowView &newShadowView); + const ShadowView& oldShadowView, + const ShadowView& newShadowView); }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp index 43bb9ce1588..5f48d6172be 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.cpp @@ -14,9 +14,9 @@ namespace facebook::react { using namespace facebook::jni; -BackgroundExecutor JBackgroundExecutor::create(const std::string &name) { +BackgroundExecutor JBackgroundExecutor::create(const std::string& name) { auto instance = make_global(newInstance(name)); - return [instance = std::move(instance)](std::function &&runnable) { + return [instance = std::move(instance)](std::function&& runnable) { static auto method = javaClassStatic()->getMethod( "queueRunnable"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h index 337f9615c6e..1224ec7079c 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JBackgroundExecutor.h @@ -17,7 +17,7 @@ class JBackgroundExecutor : public jni::JavaClass { static auto constexpr kJavaDescriptor = "Lcom/facebook/react/bridge/BackgroundExecutor;"; - static BackgroundExecutor create(const std::string &name); + static BackgroundExecutor create(const std::string& name); }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp index 24c9392ee9f..a2ccdbf5d57 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.cpp @@ -11,7 +11,7 @@ namespace facebook::react { -Binding *JFabricUIManager::getBinding() { +Binding* JFabricUIManager::getBinding() { static const auto bindingField = javaClassStatic()->getField("mBinding"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h index f801b21ebaf..5134ed59e50 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/JFabricUIManager.h @@ -18,7 +18,7 @@ class JFabricUIManager : public jni::JavaClass { static constexpr auto kJavaDescriptor = "Lcom/facebook/react/fabric/FabricUIManager;"; - Binding *getBinding(); + Binding* getBinding(); }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp index 6b1868c63fb..b1f20f87984 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.cpp @@ -9,55 +9,55 @@ namespace facebook::react { -CppMountItem CppMountItem::CreateMountItem(const ShadowView &shadowView) { +CppMountItem CppMountItem::CreateMountItem(const ShadowView& shadowView) { return {CppMountItem::Type::Create, {}, {}, shadowView, -1}; } -CppMountItem CppMountItem::DeleteMountItem(const ShadowView &shadowView) { +CppMountItem CppMountItem::DeleteMountItem(const ShadowView& shadowView) { return {CppMountItem::Type::Delete, {}, shadowView, {}, -1}; } CppMountItem CppMountItem::InsertMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index) { return {CppMountItem::Type::Insert, parentView, {}, shadowView, index}; } CppMountItem CppMountItem::RemoveMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index) { return {CppMountItem::Type::Remove, parentView, shadowView, {}, index}; } CppMountItem CppMountItem::RemoveDeleteTreeMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index) { return { CppMountItem::Type::RemoveDeleteTree, parentView, shadowView, {}, index}; } CppMountItem CppMountItem::UpdatePropsMountItem( - const ShadowView &oldShadowView, - const ShadowView &newShadowView) { + const ShadowView& oldShadowView, + const ShadowView& newShadowView) { return { CppMountItem::Type::UpdateProps, {}, oldShadowView, newShadowView, -1}; } -CppMountItem CppMountItem::UpdateStateMountItem(const ShadowView &shadowView) { +CppMountItem CppMountItem::UpdateStateMountItem(const ShadowView& shadowView) { return {CppMountItem::Type::UpdateState, {}, {}, shadowView, -1}; } CppMountItem CppMountItem::UpdateLayoutMountItem( - const ShadowView &shadowView, - const ShadowView &parentView) { + const ShadowView& shadowView, + const ShadowView& parentView) { return {CppMountItem::Type::UpdateLayout, parentView, {}, shadowView, -1}; } CppMountItem CppMountItem::UpdateEventEmitterMountItem( - const ShadowView &shadowView) { + const ShadowView& shadowView) { return {CppMountItem::Type::UpdateEventEmitter, {}, {}, shadowView, -1}; } CppMountItem CppMountItem::UpdatePaddingMountItem( - const ShadowView &shadowView) { + const ShadowView& shadowView) { return {CppMountItem::Type::UpdatePadding, {}, {}, shadowView, -1}; } CppMountItem CppMountItem::UpdateOverflowInsetMountItem( - const ShadowView &shadowView) { + const ShadowView& shadowView) { return {CppMountItem::Type::UpdateOverflowInset, {}, {}, shadowView, -1}; } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h index d4fe2bfad07..d3b65a7424a 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/MountItem.h @@ -20,41 +20,41 @@ struct JMountItem : public jni::JavaClass { struct CppMountItem final { #pragma mark - Designated Initializers - static CppMountItem CreateMountItem(const ShadowView &shadowView); + static CppMountItem CreateMountItem(const ShadowView& shadowView); - static CppMountItem DeleteMountItem(const ShadowView &shadowView); + static CppMountItem DeleteMountItem(const ShadowView& shadowView); static CppMountItem InsertMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index); static CppMountItem RemoveMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index); static CppMountItem RemoveDeleteTreeMountItem( - const ShadowView &parentView, - const ShadowView &shadowView, + const ShadowView& parentView, + const ShadowView& shadowView, int index); static CppMountItem UpdatePropsMountItem( - const ShadowView &oldShadowView, - const ShadowView &newShadowView); + const ShadowView& oldShadowView, + const ShadowView& newShadowView); - static CppMountItem UpdateStateMountItem(const ShadowView &shadowView); + static CppMountItem UpdateStateMountItem(const ShadowView& shadowView); static CppMountItem UpdateLayoutMountItem( - const ShadowView &shadowView, - const ShadowView &parentView); + const ShadowView& shadowView, + const ShadowView& parentView); - static CppMountItem UpdateEventEmitterMountItem(const ShadowView &shadowView); + static CppMountItem UpdateEventEmitterMountItem(const ShadowView& shadowView); - static CppMountItem UpdatePaddingMountItem(const ShadowView &shadowView); + static CppMountItem UpdatePaddingMountItem(const ShadowView& shadowView); static CppMountItem UpdateOverflowInsetMountItem( - const ShadowView &shadowView); + const ShadowView& shadowView); #pragma mark - Type diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp index 7ebf9b5247e..67176fad7cd 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/OnLoad.cpp @@ -15,7 +15,7 @@ #include "StateWrapperImpl.h" #include "SurfaceHandlerBinding.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { facebook::react::Binding::registerNatives(); facebook::react::EventBeatManager::registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp index 72686b02b40..b04187bbbe4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.cpp @@ -11,14 +11,14 @@ using namespace facebook::react; -bool ReactNativeConfigHolder::getBool(const std::string ¶m) const { +bool ReactNativeConfigHolder::getBool(const std::string& param) const { static const auto method = facebook::jni::findClassStatic( "com/facebook/react/fabric/ReactNativeConfig") ->getMethod("getBool"); return method(reactNativeConfig_, facebook::jni::make_jstring(param).get()); } -std::string ReactNativeConfigHolder::getString(const std::string ¶m) const { +std::string ReactNativeConfigHolder::getString(const std::string& param) const { static const auto method = facebook::jni::findClassStatic( "com/facebook/react/fabric/ReactNativeConfig") ->getMethod("getString"); @@ -26,14 +26,14 @@ std::string ReactNativeConfigHolder::getString(const std::string ¶m) const { ->toString(); } -int64_t ReactNativeConfigHolder::getInt64(const std::string ¶m) const { +int64_t ReactNativeConfigHolder::getInt64(const std::string& param) const { static const auto method = facebook::jni::findClassStatic( "com/facebook/react/fabric/ReactNativeConfig") ->getMethod("getInt64"); return method(reactNativeConfig_, facebook::jni::make_jstring(param).get()); } -double ReactNativeConfigHolder::getDouble(const std::string ¶m) const { +double ReactNativeConfigHolder::getDouble(const std::string& param) const { static const auto method = facebook::jni::findClassStatic( "com/facebook/react/fabric/ReactNativeConfig") ->getMethod("getDouble"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h index d6a7903cc05..8be8770ddbd 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/ReactNativeConfigHolder.h @@ -23,10 +23,10 @@ class ReactNativeConfigHolder : public ReactNativeConfig { explicit ReactNativeConfigHolder(jni::alias_ref reactNativeConfig) : reactNativeConfig_(make_global(reactNativeConfig)){}; - bool getBool(const std::string ¶m) const override; - std::string getString(const std::string ¶m) const override; - int64_t getInt64(const std::string ¶m) const override; - double getDouble(const std::string ¶m) const override; + bool getBool(const std::string& param) const override; + std::string getString(const std::string& param) const override; + int64_t getInt64(const std::string& param) const override; + double getDouble(const std::string& param) const override; private: jni::global_ref reactNativeConfig_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp index f7301907b5b..bf5c18e5dd9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.cpp @@ -43,7 +43,7 @@ StateWrapperImpl::getStateMapBufferDataImpl() { } } -void StateWrapperImpl::updateStateImpl(NativeMap *map) { +void StateWrapperImpl::updateStateImpl(NativeMap* map) { if (auto state = state_.lock()) { // Get folly::dynamic from map auto dynamicMap = map->consume(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h index f7ac87dbfbd..3aac2e0a7e9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/StateWrapperImpl.h @@ -18,7 +18,7 @@ class Instance; class StateWrapperImpl : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/StateWrapperImpl;"; constexpr static auto StateWrapperImplJavaDescriptor = "com/facebook/react/fabric/StateWrapperImpl"; @@ -27,7 +27,7 @@ class StateWrapperImpl : public jni::HybridClass { jni::local_ref getStateMapBufferDataImpl(); jni::local_ref getStateDataImpl(); - void updateStateImpl(NativeMap *map); + void updateStateImpl(NativeMap* map); std::weak_ptr state_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp index a1ad956cb76..dd0efeccefb 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.cpp @@ -12,7 +12,7 @@ namespace facebook::react { SurfaceHandlerBinding::SurfaceHandlerBinding( SurfaceId surfaceId, - const std::string &moduleName) + const std::string& moduleName) : surfaceHandler_(moduleName, surfaceId) {} void SurfaceHandlerBinding::setDisplayMode(jint mode) { @@ -83,11 +83,11 @@ void SurfaceHandlerBinding::setLayoutConstraints( surfaceHandler_.constraintLayout(constraints, context); } -void SurfaceHandlerBinding::setProps(NativeMap *props) { +void SurfaceHandlerBinding::setProps(NativeMap* props) { surfaceHandler_.setProps(props->consume()); } -const SurfaceHandler &SurfaceHandlerBinding::getSurfaceHandler() { +const SurfaceHandler& SurfaceHandlerBinding::getSurfaceHandler() { return surfaceHandler_; } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h index 96002488980..f8693cd762f 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/SurfaceHandlerBinding.h @@ -17,12 +17,12 @@ namespace facebook::react { class SurfaceHandlerBinding : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/fabric/SurfaceHandlerBinding;"; static void registerNatives(); - SurfaceHandlerBinding(SurfaceId surfaceId, const std::string &moduleName); + SurfaceHandlerBinding(SurfaceId surfaceId, const std::string& moduleName); void start(); void stop(); @@ -46,9 +46,9 @@ class SurfaceHandlerBinding : public jni::HybridClass { jboolean isRTL, jfloat pixelDensity); - void setProps(NativeMap *props); + void setProps(NativeMap* props); - const SurfaceHandler &getSurfaceHandler(); + const SurfaceHandler& getSurfaceHandler(); private: mutable std::shared_mutex lifecycleMutex_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h index 06388c7b3d5..38d4f0fc5c0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/fabric/viewPropConversions.h @@ -20,10 +20,10 @@ namespace facebook::react { namespace { static MapBuffer convertAccessibilityActions( - const std::vector &actions) { + const std::vector& actions) { MapBufferBuilder builder(actions.size()); for (auto i = 0; i < actions.size(); i++) { - const auto &action = actions[i]; + const auto& action = actions[i]; MapBufferBuilder actionsBuilder(2); actionsBuilder.putString(ACCESSIBILITY_ACTION_NAME, action.name); if (action.label.has_value()) { @@ -36,7 +36,7 @@ static MapBuffer convertAccessibilityActions( } static MapBuffer convertAccessibilityLabelledBy( - const AccessibilityLabelledBy &labelledBy) { + const AccessibilityLabelledBy& labelledBy) { MapBufferBuilder builder(labelledBy.value.size()); for (auto i = 0; i < labelledBy.value.size(); i++) { builder.putString(i, labelledBy.value[i]); @@ -51,7 +51,7 @@ constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2; constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3; constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4; -MapBuffer convertAccessibilityState(const AccessibilityState &state) { +MapBuffer convertAccessibilityState(const AccessibilityState& state) { MapBufferBuilder builder(5); builder.putBool(ACCESSIBILITY_STATE_BUSY, state.busy); builder.putBool(ACCESSIBILITY_STATE_DISABLED, state.disabled); @@ -77,9 +77,9 @@ MapBuffer convertAccessibilityState(const AccessibilityState &state) { } inline void putOptionalColor( - MapBufferBuilder &builder, + MapBufferBuilder& builder, MapBuffer::Key key, - const std::optional &color) { + const std::optional& color) { builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1); } @@ -91,7 +91,7 @@ constexpr MapBuffer::Key EDGE_START = 4; constexpr MapBuffer::Key EDGE_END = 5; constexpr MapBuffer::Key EDGE_ALL = 6; -MapBuffer convertBorderColors(const CascadedBorderColors &colors) { +MapBuffer convertBorderColors(const CascadedBorderColors& colors) { MapBufferBuilder builder(7); putOptionalColor(builder, EDGE_TOP, colors.top); putOptionalColor(builder, EDGE_RIGHT, colors.right); @@ -118,13 +118,13 @@ constexpr MapBuffer::Key CORNER_START_END = 11; constexpr MapBuffer::Key CORNER_START_START = 12; inline void putOptionalFloat( - MapBufferBuilder &builder, + MapBufferBuilder& builder, MapBuffer::Key key, - const std::optional &value) { + const std::optional& value) { builder.putDouble(key, value.value_or(NAN)); } -MapBuffer convertBorderRadii(const CascadedBorderRadii &radii) { +MapBuffer convertBorderRadii(const CascadedBorderRadii& radii) { MapBufferBuilder builder(13); putOptionalFloat(builder, CORNER_TOP_LEFT, radii.topLeft); putOptionalFloat(builder, CORNER_TOP_RIGHT, radii.topRight); @@ -142,7 +142,7 @@ MapBuffer convertBorderRadii(const CascadedBorderRadii &radii) { return builder.build(); } -MapBuffer convertBorderWidths(const yoga::Style::Edges &border) { +MapBuffer convertBorderWidths(const yoga::Style::Edges& border) { MapBufferBuilder builder(7); putOptionalFloat( builder, EDGE_TOP, optionalFloatFromYogaValue(border[YGEdgeTop])); @@ -161,7 +161,7 @@ MapBuffer convertBorderWidths(const yoga::Style::Edges &border) { return builder.build(); } -MapBuffer convertEdgeInsets(const EdgeInsets &insets) { +MapBuffer convertEdgeInsets(const EdgeInsets& insets) { MapBufferBuilder builder(4); builder.putDouble(EDGE_TOP, insets.top); builder.putDouble(EDGE_RIGHT, insets.right); @@ -178,12 +178,12 @@ constexpr MapBuffer::Key NATIVE_DRAWABLE_COLOR = 2; constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3; constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4; -MapBuffer convertNativeBackground(const std::optional &value) { +MapBuffer convertNativeBackground(const std::optional& value) { if (!value.has_value()) { return MapBufferBuilder::EMPTY(); } - const auto &drawable = value.value(); + const auto& drawable = value.value(); MapBufferBuilder builder(4); switch (drawable.kind) { case NativeDrawable::Kind::ThemeAttr: @@ -209,7 +209,7 @@ MapBuffer convertNativeBackground(const std::optional &value) { #endif -MapBuffer convertTransform(const Transform &transform) { +MapBuffer convertTransform(const Transform& transform) { MapBufferBuilder builder(16); for (int32_t i = 0; i < transform.matrix.size(); i++) { builder.putDouble(i, transform.matrix[i]); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp index 6fbaa240b93..f46e5005e64 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/instrumentation/OnLoad.cpp @@ -7,7 +7,7 @@ #include "HermesSamplingProfiler.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return facebook::jni::initialize(vm, [] { facebook::jsi::jni::HermesSamplingProfiler::registerNatives(); }); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp index 296d196bca0..0df6d96a84d 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/hermes/reactexecutor/OnLoad.cpp @@ -21,7 +21,7 @@ namespace facebook::react { -static void hermesFatalHandler(const std::string &reason) { +static void hermesFatalHandler(const std::string& reason) { LOG(ERROR) << "Hermes Fatal: " << reason << "\n"; __android_log_assert(nullptr, "Hermes", "%s", reason.c_str()); } @@ -41,9 +41,9 @@ static ::hermes::vm::RuntimeConfig makeRuntimeConfig(jlong heapSizeMB) { .build(); } -static void installBindings(jsi::Runtime &runtime) { +static void installBindings(jsi::Runtime& runtime) { react::Logger androidLogger = - static_cast( + static_cast( &reactAndroidLoggingHook); react::bindNativeLogger(runtime, androidLogger); } @@ -90,7 +90,7 @@ class HermesExecutorHolder return makeCxxInstance(std::move(factory)); } - static bool canLoadFile(jni::alias_ref, const std::string &path) { + static bool canLoadFile(jni::alias_ref, const std::string& path) { return true; } @@ -110,7 +110,7 @@ class HermesExecutorHolder } // namespace facebook::react -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return facebook::jni::initialize( vm, [] { facebook::react::HermesExecutorHolder::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp index 67c3fdfacfe..e8761b39ad5 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp @@ -146,7 +146,7 @@ void CatalystInstanceImpl::registerNatives() { }); } -void log(ReactNativeLogLevel level, const char *message) { +void log(ReactNativeLogLevel level, const char* message) { switch (level) { case ReactNativeLogLevelInfo: LOG(INFO) << message; @@ -169,7 +169,7 @@ void log(ReactNativeLogLevel level, const char *message) { void CatalystInstanceImpl::initializeBridge( jni::alias_ref callback, // This executor is actually a factory holder. - JavaScriptExecutorHolder *jseh, + JavaScriptExecutorHolder* jseh, jni::alias_ref jsQueue, jni::alias_ref nativeModulesQueue, jni::alias_ref::javaobject> @@ -226,39 +226,37 @@ void CatalystInstanceImpl::extendNativeModules( moduleMessageQueue_)); } -void CatalystInstanceImpl::jniSetSourceURL(const std::string &sourceURL) { +void CatalystInstanceImpl::jniSetSourceURL(const std::string& sourceURL) { instance_->setSourceURL(sourceURL); } void CatalystInstanceImpl::jniRegisterSegment( int segmentId, - const std::string &path) { + const std::string& path) { instance_->registerBundle((uint32_t)segmentId, path); } -static ScriptTag getScriptTagFromFile(const char *sourcePath) { +static ScriptTag getScriptTagFromFile(const char* sourcePath) { std::ifstream bundle_stream(sourcePath, std::ios_base::in); BundleHeader header; if (bundle_stream && - bundle_stream.read(reinterpret_cast(&header), sizeof(header))) { + bundle_stream.read(reinterpret_cast(&header), sizeof(header))) { return parseTypeFromHeader(header); } else { return ScriptTag::String; } } -static bool isIndexedRAMBundle(std::unique_ptr *script) { +static bool isIndexedRAMBundle(std::unique_ptr* script) { BundleHeader header; strncpy( - reinterpret_cast(&header), - script->get()->c_str(), - sizeof(header)); + reinterpret_cast(&header), script->get()->c_str(), sizeof(header)); return parseTypeFromHeader(header) == ScriptTag::RAMBundle; } void CatalystInstanceImpl::jniLoadScriptFromAssets( jni::alias_ref assetManager, - const std::string &assetURL, + const std::string& assetURL, bool loadSynchronously) { const int kAssetsLength = 9; // strlen("assets://"); auto sourceURL = assetURL.substr(kAssetsLength); @@ -280,8 +278,8 @@ void CatalystInstanceImpl::jniLoadScriptFromAssets( } void CatalystInstanceImpl::jniLoadScriptFromFile( - const std::string &fileName, - const std::string &sourceURL, + const std::string& fileName, + const std::string& sourceURL, bool loadSynchronously) { auto reactInstance = instance_; if (!reactInstance) { @@ -308,7 +306,7 @@ void CatalystInstanceImpl::jniLoadScriptFromFile( void CatalystInstanceImpl::jniCallJSFunction( std::string module, std::string method, - NativeArray *arguments) { + NativeArray* arguments) { // We want to share the C++ code, and on iOS, modules pass module/method // names as strings all the way through to JS, and there's no way to do // string -> id mapping on the objc side. So on Android, we convert the @@ -322,13 +320,13 @@ void CatalystInstanceImpl::jniCallJSFunction( void CatalystInstanceImpl::jniCallJSCallback( jint callbackId, - NativeArray *arguments) { + NativeArray* arguments) { instance_->callJSCallback(callbackId, arguments->consume()); } void CatalystInstanceImpl::setGlobalVariable( std::string propName, - std::string &&jsonValue) { + std::string&& jsonValue) { // This is only ever called from Java with short strings, and only // for testing, so no need to try hard for zero-copy here. @@ -370,13 +368,13 @@ CatalystInstanceImpl::getNativeMethodCallInvokerHolder() { std::shared_ptr messageQueueThread) : messageQueueThread_(messageQueueThread) {} void invokeAsync( - const std::string &methodName, - std::function &&work) override { + const std::string& methodName, + std::function&& work) override { messageQueueThread_->runOnQueue(std::move(work)); } void invokeSync( - const std::string &methodName, - std::function &&work) override { + const std::string& methodName, + std::function&& work) override { messageQueueThread_->runOnQueueSync(std::move(work)); } }; @@ -417,7 +415,7 @@ CatalystInstanceImpl::getRuntimeScheduler() { runtimeScheduler_ = jni::make_global( JRuntimeScheduler::newObjectCxxArgs(runtimeScheduler)); runtimeExecutor([scheduler = - std::move(runtimeScheduler)](jsi::Runtime &runtime) { + std::move(runtimeScheduler)](jsi::Runtime& runtime) { RuntimeSchedulerBinding::createAndInstallIfNeeded(runtime, scheduler); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h index 13d8a7db6ae..a3cac21b2bc 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h @@ -53,7 +53,7 @@ class CatalystInstanceImpl : public jni::HybridClass { void initializeBridge( jni::alias_ref callback, // This executor is actually a factory holder. - JavaScriptExecutorHolder *jseh, + JavaScriptExecutorHolder* jseh, jni::alias_ref jsQueue, jni::alias_ref moduleQueue, jni::alias_ref< @@ -75,33 +75,33 @@ class CatalystInstanceImpl : public jni::HybridClass { /** * Sets the source URL of the underlying bridge without loading any JS code. */ - void jniSetSourceURL(const std::string &sourceURL); + void jniSetSourceURL(const std::string& sourceURL); /** * Registers the file path of an additional JS segment by its ID. * */ - void jniRegisterSegment(int segmentId, const std::string &path); + void jniRegisterSegment(int segmentId, const std::string& path); void jniLoadScriptFromAssets( jni::alias_ref assetManager, - const std::string &assetURL, + const std::string& assetURL, bool loadSynchronously); void jniLoadScriptFromFile( - const std::string &fileName, - const std::string &sourceURL, + const std::string& fileName, + const std::string& sourceURL, bool loadSynchronously); void jniCallJSFunction( std::string module, std::string method, - NativeArray *arguments); - void jniCallJSCallback(jint callbackId, NativeArray *arguments); + NativeArray* arguments); + void jniCallJSCallback(jint callbackId, NativeArray* arguments); jni::alias_ref getJSCallInvokerHolder(); jni::alias_ref getNativeMethodCallInvokerHolder(); jni::alias_ref getRuntimeExecutor(); jni::alias_ref getRuntimeScheduler(); - void setGlobalVariable(std::string propName, std::string &&jsonValue); + void setGlobalVariable(std::string propName, std::string&& jsonValue); jlong getJavaScriptContext(); void handleMemoryPressure(int pressureLevel); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp index aab1371be69..82db6c3d03b 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.cpp @@ -20,14 +20,14 @@ namespace facebook::react { jni::local_ref CxxModuleWrapper::makeDsoNative( jni::alias_ref, - const std::string &soPath, - const std::string &fname) { + const std::string& soPath, + const std::string& fname) { // soPath is the path of a library which has already been loaded by // java SoLoader.loadLibrary(). So this returns the same handle, // and increments the reference counter. We can't just use // dlsym(RTLD_DEFAULT, ...), because that crashes on 4.4.2 and // earlier: https://code.google.com/p/android/issues/detail?id=61799 - void *handle = dlopen(soPath.c_str(), RTLD_NOW); + void* handle = dlopen(soPath.c_str(), RTLD_NOW); if (!handle) { throwNewJavaException( gJavaLangIllegalArgumentException, @@ -40,7 +40,7 @@ jni::local_ref CxxModuleWrapper::makeDsoNative( // here. auto guard = folly::makeGuard([&] { CHECK(dlclose(handle) == 0); }); - void *sym = dlsym(handle, fname.c_str()); + void* sym = dlsym(handle, fname.c_str()); if (!sym) { throwNewJavaException( gJavaLangIllegalArgumentException, @@ -48,7 +48,7 @@ jni::local_ref CxxModuleWrapper::makeDsoNative( fname.c_str(), soPath.c_str()); } - auto factory = reinterpret_cast(sym); + auto factory = reinterpret_cast(sym); return CxxModuleWrapper::newObjectCxxArgs( std::unique_ptr((*factory)())); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h index 1534b51e29e..5cbb95966c2 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapper.h @@ -14,7 +14,7 @@ namespace facebook::react { class CxxModuleWrapper : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/bridge/CxxModuleWrapper;"; static void registerNatives() { @@ -24,8 +24,8 @@ class CxxModuleWrapper static jni::local_ref makeDsoNative( jni::alias_ref, - const std::string &soPath, - const std::string &fname); + const std::string& soPath, + const std::string& fname); std::string getName() override { return module_->getName(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h index edb353ac586..dc1954f1ba3 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/CxxModuleWrapperBase.h @@ -16,7 +16,7 @@ namespace facebook::react { struct JNativeModule : jni::JavaClass { - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/bridge/NativeModule;"; }; @@ -27,7 +27,7 @@ struct JNativeModule : jni::JavaClass { class CxxModuleWrapperBase : public jni::HybridClass { public: - constexpr static const char *const kJavaDescriptor = + constexpr static const char* const kJavaDescriptor = "Lcom/facebook/react/bridge/CxxModuleWrapperBase;"; static void registerNatives() { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JCallback.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JCallback.h index 56f0a4109a8..807f95cd8cf 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JCallback.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JCallback.h @@ -47,7 +47,7 @@ class JCxxCallbackImpl : public jni::HybridClass { using Callback = std::function; JCxxCallbackImpl(Callback callback) : callback_(std::move(callback)) {} - void invoke(NativeArray *arguments) { + void invoke(NativeArray* arguments) { callback_(arguments->consume()); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp index 427b3bb8f7c..cd4400b22c1 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.cpp @@ -35,7 +35,7 @@ class RemoteConnection : public IRemoteConnection { } // namespace jni::local_ref -JPage::create(int id, const std::string &title, const std::string &vm) { +JPage::create(int id, const std::string& title, const std::string& vm) { static auto constructor = javaClassStatic() ->getConstructorgetMethod)>("onMessage"); method(self(), jni::make_jstring(message)); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h index b18d8ef58ee..221e012d603 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JInspector.h @@ -23,7 +23,7 @@ class JPage : public jni::JavaClass { "Lcom/facebook/react/bridge/Inspector$Page;"; static jni::local_ref - create(int id, const std::string &title, const std::string &vm); + create(int id, const std::string& title, const std::string& vm); }; class JRemoteConnection : public jni::JavaClass { @@ -31,7 +31,7 @@ class JRemoteConnection : public jni::JavaClass { static constexpr auto kJavaDescriptor = "Lcom/facebook/react/bridge/Inspector$RemoteConnection;"; - void onMessage(const std::string &message) const; + void onMessage(const std::string& message) const; void onDisconnect() const; }; @@ -69,9 +69,9 @@ class JInspector : public jni::HybridClass { private: friend HybridBase; - JInspector(IInspector *inspector) : inspector_(inspector) {} + JInspector(IInspector* inspector) : inspector_(inspector) {} - IInspector *inspector_; + IInspector* inspector_; }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp index fc5f4406704..95d38baeba1 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.cpp @@ -26,13 +26,13 @@ struct JavaJSException : jni::JavaClass { "Lcom/facebook/react/devsupport/JSException;"; static local_ref - create(const char *message, const char *stack, const std::exception &ex) { + create(const char* message, const char* stack, const std::exception& ex) { local_ref cause = jni::JCppException::create(ex); return newInstance(make_jstring(message), make_jstring(stack), cause.get()); } }; -std::function wrapRunnable(std::function &&runnable) { +std::function wrapRunnable(std::function&& runnable) { return [runnable = std::move(runnable)]() mutable { if (!runnable) { // Runnable is empty, nothing to run. @@ -47,7 +47,7 @@ std::function wrapRunnable(std::function &&runnable) { try { localRunnable(); - } catch (const jsi::JSError &ex) { + } catch (const jsi::JSError& ex) { throwNewJavaException( JavaJSException::create( ex.getMessage().c_str(), ex.getStack().c_str(), ex) @@ -62,7 +62,7 @@ JMessageQueueThread::JMessageQueueThread( alias_ref jobj) : m_jobj(make_global(jobj)) {} -void JMessageQueueThread::runOnQueue(std::function &&runnable) { +void JMessageQueueThread::runOnQueue(std::function&& runnable) { // For C++ modules, this can be called from an arbitrary thread // managed by the module, via callJSCallback or callJSFunction. So, // we ensure that it is registered with the JVM. @@ -75,7 +75,7 @@ void JMessageQueueThread::runOnQueue(std::function &&runnable) { method(m_jobj, jrunnable.get()); } -void JMessageQueueThread::runOnQueueSync(std::function &&runnable) { +void JMessageQueueThread::runOnQueueSync(std::function&& runnable) { static auto jIsOnThread = JavaMessageQueueThread::javaClassStatic()->getMethod( "isOnThread"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h index c0001294504..3926fa906de 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JMessageQueueThread.h @@ -27,14 +27,14 @@ class JMessageQueueThread : public MessageQueueThread { /** * Enqueues the given function to run on this MessageQueueThread. */ - void runOnQueue(std::function &&runnable) override; + void runOnQueue(std::function&& runnable) override; /** * Synchronously executes the given function to run on this * MessageQueueThread, waiting until it completes. Can be called from any * thread, but will block if not called on this MessageQueueThread. */ - void runOnQueueSync(std::function &&runnable) override; + void runOnQueueSync(std::function&& runnable) override; /** * Synchronously quits the current MessageQueueThread. Can be called from any diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h index 0bbf90351db..e54dbde8338 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactCxxErrorHandler.h @@ -14,7 +14,7 @@ namespace facebook::react { class JReactCxxErrorHandler : public jni::JavaClass { public: - static constexpr const char *kJavaDescriptor = + static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/ReactCxxErrorHandler;"; static void handleError(std::string message); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp index 1e6daf9ba55..131237c6d49 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp @@ -22,15 +22,15 @@ void JReactMarker::setLogPerfMarkerIfNeeded() { }); } -void JReactMarker::logMarker(const std::string &marker) { +void JReactMarker::logMarker(const std::string& marker) { static auto cls = javaClassStatic(); static auto meth = cls->getStaticMethod("logMarker"); meth(cls, marker); } void JReactMarker::logMarker( - const std::string &marker, - const std::string &tag) { + const std::string& marker, + const std::string& tag) { static auto cls = javaClassStatic(); static auto meth = cls->getStaticMethod("logMarker"); @@ -38,8 +38,8 @@ void JReactMarker::logMarker( } void JReactMarker::logMarker( - const std::string &marker, - const std::string &tag, + const std::string& marker, + const std::string& tag, const int instanceKey) { static auto cls = javaClassStatic(); static auto meth = @@ -49,21 +49,21 @@ void JReactMarker::logMarker( void JReactMarker::logPerfMarker( const ReactMarker::ReactMarkerId markerId, - const char *tag) { + const char* tag) { const int bridgeInstanceKey = 0; logPerfMarkerWithInstanceKey(markerId, tag, bridgeInstanceKey); } void JReactMarker::logPerfMarkerBridgeless( const ReactMarker::ReactMarkerId markerId, - const char *tag) { + const char* tag) { const int bridgelessInstanceKey = 1; logPerfMarkerWithInstanceKey(markerId, tag, bridgelessInstanceKey); } void JReactMarker::logPerfMarkerWithInstanceKey( const ReactMarker::ReactMarkerId markerId, - const char *tag, + const char* tag, const int instanceKey) { switch (markerId) { case ReactMarker::APP_STARTUP_START: diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.h index 1a48426c4fc..5094b01c252 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactMarker.h @@ -22,21 +22,21 @@ class JReactMarker : public facebook::jni::JavaClass { static void setLogPerfMarkerIfNeeded(); private: - static void logMarker(const std::string &marker); - static void logMarker(const std::string &marker, const std::string &tag); + static void logMarker(const std::string& marker); + static void logMarker(const std::string& marker, const std::string& tag); static void logMarker( - const std::string &marker, - const std::string &tag, + const std::string& marker, + const std::string& tag, const int instanceKey); static void logPerfMarker( const ReactMarker::ReactMarkerId markerId, - const char *tag); + const char* tag); static void logPerfMarkerBridgeless( const ReactMarker::ReactMarkerId markerId, - const char *tag); + const char* tag); static void logPerfMarkerWithInstanceKey( const ReactMarker::ReactMarkerId markerId, - const char *tag, + const char* tag, const int instanceKey); static void nativeLogMarker( jni::alias_ref /* unused */, diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h index e412d668585..c8ea6e1d442 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JReactSoftExceptionLogger.h @@ -15,7 +15,7 @@ namespace facebook::react { class JReactSoftExceptionLogger : public jni::JavaClass { public: - static constexpr const char *kJavaDescriptor = + static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/ReactSoftExceptionLogger;"; static void logNoThrowSoftExceptionWithMessage( diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp index f37f1ce6ca0..03921b543c1 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.cpp @@ -24,7 +24,7 @@ namespace facebook::react { class AssetManagerString : public JSBigString { public: - AssetManagerString(AAsset *asset) : asset_(asset){}; + AssetManagerString(AAsset* asset) : asset_(asset){}; virtual ~AssetManagerString() { AAsset_close(asset_); @@ -34,8 +34,8 @@ class AssetManagerString : public JSBigString { return false; } - const char *c_str() const override { - return (const char *)AAsset_getBuffer(asset_); + const char* c_str() const override { + return (const char*)AAsset_getBuffer(asset_); } // Length of the c_str without the NULL byte. @@ -44,17 +44,17 @@ class AssetManagerString : public JSBigString { } private: - AAsset *asset_; + AAsset* asset_; }; -__attribute__((visibility("default"))) AAssetManager *extractAssetManager( +__attribute__((visibility("default"))) AAssetManager* extractAssetManager( alias_ref assetManager) { auto env = Environment::current(); return AAssetManager_fromJava(env, assetManager.get()); } __attribute__((visibility("default"))) std::unique_ptr -loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) { +loadScriptFromAssets(AAssetManager* manager, const std::string& assetName) { #ifdef WITH_FBSYSTRACE FbSystraceSection s( TRACE_TAG_REACT_CXX_BRIDGE, @@ -74,8 +74,8 @@ loadScriptFromAssets(AAssetManager *manager, const std::string &assetName) { // When using bytecode, it's safe for the underlying buffer to not be \0 // terminated. In all other scenarios, we will force a copy of the // script to ensure we have a terminator. - const BundleHeader *header = - reinterpret_cast(script->c_str()); + const BundleHeader* header = + reinterpret_cast(script->c_str()); if (isHermesBytecodeBundle(*header)) { return script; } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.h index 2c04656d850..1d18db4722f 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLoader.h @@ -22,11 +22,11 @@ struct JAssetManager : jni::JavaClass { /** * Helper method for loading JS script from android asset */ -AAssetManager *extractAssetManager( +AAssetManager* extractAssetManager( jni::alias_ref assetManager); std::unique_ptr loadScriptFromAssets( - AAssetManager *assetManager, - const std::string &assetName); + AAssetManager* assetManager, + const std::string& assetName); } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp index be29b28aa10..243b41f1af5 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.cpp @@ -12,13 +12,13 @@ namespace facebook::react { void reactAndroidLoggingHook( - const std::string &message, + const std::string& message, android_LogPriority logLevel) { FBLOG_PRI(logLevel, "ReactNativeJS", "%s", message.c_str()); } void reactAndroidLoggingHook( - const std::string &message, + const std::string& message, unsigned int logLevel) { reactAndroidLoggingHook( message, static_cast(logLevel + ANDROID_LOG_DEBUG)); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.h index 36a246782fe..d236f244519 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JSLogging.h @@ -13,8 +13,8 @@ namespace facebook::react { void reactAndroidLoggingHook( - const std::string &message, + const std::string& message, android_LogPriority logLevel); -void reactAndroidLoggingHook(const std::string &message, unsigned int logLevel); +void reactAndroidLoggingHook(const std::string& message, unsigned int logLevel); } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp index c4e32b11cd6..1f4b7c1d495 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.cpp @@ -59,7 +59,7 @@ std::string JavaNativeModule::getSyncMethodName(unsigned int reactMethodId) { "]")); } - auto &methodInvoker = syncMethods_[reactMethodId]; + auto& methodInvoker = syncMethods_[reactMethodId]; if (!methodInvoker.has_value()) { throw std::invalid_argument(folly::to( @@ -73,7 +73,7 @@ std::vector JavaNativeModule::getMethods() { std::vector ret; syncMethods_.clear(); auto descs = wrapper_->getMethodDescriptors(); - for (const auto &desc : *descs) { + for (const auto& desc : *descs) { auto methodName = desc->getName(); auto methodType = desc->getType(); @@ -112,7 +112,7 @@ folly::dynamic JavaNativeModule::getConstants() { void JavaNativeModule::invoke( unsigned int reactMethodId, - folly::dynamic &¶ms, + folly::dynamic&& params, int callId) { messageQueueThread_->runOnQueue( [this, reactMethodId, params = std::move(params), callId] { @@ -134,7 +134,7 @@ void JavaNativeModule::invoke( MethodCallResult JavaNativeModule::callSerializableNativeHook( unsigned int reactMethodId, - folly::dynamic &¶ms) { + folly::dynamic&& params) { // TODO: evaluate whether calling through invoke is potentially faster if (reactMethodId >= syncMethods_.size()) { throw std::invalid_argument(folly::to( @@ -145,7 +145,7 @@ MethodCallResult JavaNativeModule::callSerializableNativeHook( "]")); } - auto &method = syncMethods_[reactMethodId]; + auto& method = syncMethods_[reactMethodId]; CHECK(method.has_value() && method->isSyncHook()) << "Trying to invoke a asynchronous method as synchronous hook"; return method->invoke(instance_, wrapper_->getModule(), params); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h index 40031cb0639..1e3929a1acf 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JavaModuleWrapper.h @@ -71,11 +71,11 @@ class JavaNativeModule : public NativeModule { std::string getSyncMethodName(unsigned int reactMethodId) override; folly::dynamic getConstants() override; std::vector getMethods() override; - void invoke(unsigned int reactMethodId, folly::dynamic &¶ms, int callId) + void invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) override; MethodCallResult callSerializableNativeHook( unsigned int reactMethodId, - folly::dynamic &¶ms) override; + folly::dynamic&& params) override; private: std::weak_ptr instance_; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp index b9bb2b56c02..f192010aa8e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.cpp @@ -17,14 +17,14 @@ using magic_number_t = uint32_t; const magic_number_t MAGIC_FILE_HEADER = 0xFB0BD1E5; -const char *MAGIC_FILE_NAME = "UNBUNDLE"; +const char* MAGIC_FILE_NAME = "UNBUNDLE"; namespace facebook::react { using asset_ptr = std::unique_ptr>; -static std::string jsModulesDir(const std::string &entryFile) { +static std::string jsModulesDir(const std::string& entryFile) { std::string dir = dirname(entryFile.c_str()); // android's asset manager does not work with paths that start with a dot @@ -32,28 +32,28 @@ static std::string jsModulesDir(const std::string &entryFile) { } static asset_ptr openAsset( - AAssetManager *manager, - const std::string &fileName, + AAssetManager* manager, + const std::string& fileName, int mode = AASSET_MODE_STREAMING) { return asset_ptr( AAssetManager_open(manager, fileName.c_str(), mode), AAsset_close); } std::unique_ptr JniJSModulesUnbundle::fromEntryFile( - AAssetManager *assetManager, - const std::string &entryFile) { + AAssetManager* assetManager, + const std::string& entryFile) { return std::make_unique( assetManager, jsModulesDir(entryFile)); } JniJSModulesUnbundle::JniJSModulesUnbundle( - AAssetManager *assetManager, - const std::string &moduleDirectory) + AAssetManager* assetManager, + const std::string& moduleDirectory) : m_assetManager(assetManager), m_moduleDirectory(moduleDirectory) {} bool JniJSModulesUnbundle::isUnbundle( - AAssetManager *assetManager, - const std::string &assetName) { + AAssetManager* assetManager, + const std::string& assetName) { if (!assetManager) { return false; } @@ -83,9 +83,9 @@ JSModulesUnbundle::Module JniJSModulesUnbundle::getModule( auto fileName = m_moduleDirectory + sourceUrl; auto asset = openAsset(m_assetManager, fileName, AASSET_MODE_BUFFER); - const char *buffer = nullptr; + const char* buffer = nullptr; if (asset != nullptr) { - buffer = static_cast(AAsset_getBuffer(asset.get())); + buffer = static_cast(AAsset_getBuffer(asset.get())); } if (buffer == nullptr) { throw ModuleNotFound(moduleId); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h index 100cbe4b00f..51578df84b7 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/JniJSModulesUnbundle.h @@ -21,22 +21,22 @@ class JniJSModulesUnbundle : public JSModulesUnbundle { public: JniJSModulesUnbundle() = default; JniJSModulesUnbundle( - AAssetManager *assetManager, - const std::string &moduleDirectory); - JniJSModulesUnbundle(JniJSModulesUnbundle &&other) = delete; - JniJSModulesUnbundle &operator=(JSModulesUnbundle &&other) = delete; + AAssetManager* assetManager, + const std::string& moduleDirectory); + JniJSModulesUnbundle(JniJSModulesUnbundle&& other) = delete; + JniJSModulesUnbundle& operator=(JSModulesUnbundle&& other) = delete; static std::unique_ptr fromEntryFile( - AAssetManager *assetManager, - const std::string &entryFile); + AAssetManager* assetManager, + const std::string& entryFile); static bool isUnbundle( - AAssetManager *assetManager, - const std::string &assetName); + AAssetManager* assetManager, + const std::string& assetName); virtual Module getModule(uint32_t moduleId) const override; private: - AAssetManager *m_assetManager = nullptr; + AAssetManager* m_assetManager = nullptr; std::string m_moduleDirectory; }; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp index 6a944e6b9a3..50f0ba2bb6d 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.cpp @@ -47,7 +47,7 @@ struct ExposedReadableNativeArray : public ReadableNativeArray { : ReadableNativeArray(std::move(array)) {} }; -jdouble extractDouble(const folly::dynamic &value) { +jdouble extractDouble(const folly::dynamic& value) { if (value.isInt()) { return static_cast(value.getInt()); } else { @@ -55,7 +55,7 @@ jdouble extractDouble(const folly::dynamic &value) { } } -jint extractInteger(const folly::dynamic &value) { +jint extractInteger(const folly::dynamic& value) { // The logic here is taken from convertDynamicIfIntegral, but the // return type and exception are different. if (value.isInt()) { @@ -72,8 +72,8 @@ jint extractInteger(const folly::dynamic &value) { } local_ref extractCallback( - std::weak_ptr &instance, - const folly::dynamic &value) { + std::weak_ptr& instance, + const folly::dynamic& value) { if (value.isNull()) { return local_ref(nullptr); } else { @@ -82,9 +82,9 @@ local_ref extractCallback( } local_ref extractPromise( - std::weak_ptr &instance, - dynamic_iterator &it, - dynamic_iterator &end) { + std::weak_ptr& instance, + dynamic_iterator& it, + dynamic_iterator& end) { auto resolve = extractCallback(instance, *it++); CHECK(it != end); auto reject = extractCallback(instance, *it++); @@ -108,10 +108,10 @@ bool isNullable(char type) { } jvalue extract( - std::weak_ptr &instance, + std::weak_ptr& instance, char type, - dynamic_iterator &it, - dynamic_iterator &end) { + dynamic_iterator& it, + dynamic_iterator& end) { CHECK(it != end); jvalue value; if (type == 'P') { @@ -119,7 +119,7 @@ jvalue extract( return value; } - const auto &arg = *it++; + const auto& arg = *it++; if (isNullable(type) && arg.isNull()) { value.l = nullptr; return value; @@ -170,7 +170,7 @@ jvalue extract( return value; } -std::size_t countJsArgs(const std::string &signature) { +std::size_t countJsArgs(const std::string& signature) { std::size_t count = 0; for (char c : signature) { switch (c) { @@ -209,9 +209,9 @@ std::string MethodInvoker::getMethodName() const { } MethodCallResult MethodInvoker::invoke( - std::weak_ptr &instance, + std::weak_ptr& instance, alias_ref module, - const folly::dynamic ¶ms) { + const folly::dynamic& params) { #ifdef WITH_FBSYSTRACE fbsystrace::FbSystraceSection s( TRACE_TAG_REACT_CXX_BRIDGE, diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h index da7cdd4ecd3..2c5cfb8bc67 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/MethodInvoker.h @@ -42,9 +42,9 @@ class MethodInvoker { bool isSync); MethodCallResult invoke( - std::weak_ptr &instance, + std::weak_ptr& instance, jni::alias_ref module, - const folly::dynamic ¶ms); + const folly::dynamic& params); std::string getMethodName() const; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp index 2d00a652e58..71de6e6cf16 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.cpp @@ -21,7 +21,7 @@ std::string ModuleHolder::getName() const { } xplat::module::CxxModule::Provider ModuleHolder::getProvider( - const std::string &moduleName) const { + const std::string& moduleName) const { return [self = jni::make_global(self()), moduleName] { static auto getModule = ModuleHolder::javaClassStatic()->getMethod( @@ -49,13 +49,13 @@ std::vector> buildNativeModuleList( std::shared_ptr moduleMessageQueue) { std::vector> modules; if (javaModules) { - for (const auto &jm : *javaModules) { + for (const auto& jm : *javaModules) { modules.emplace_back(std::make_unique( winstance, jm, moduleMessageQueue)); } } if (cxxModules) { - for (const auto &cm : *cxxModules) { + for (const auto& cm : *cxxModules) { std::string moduleName = cm->getName(); modules.emplace_back(std::make_unique( winstance, diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h index 2902dd1da19..ec18985a3fe 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ModuleRegistryBuilder.h @@ -25,7 +25,7 @@ class ModuleHolder : public jni::JavaClass { std::string getName() const; xplat::module::CxxModule::Provider getProvider( - const std::string &moduleName) const; + const std::string& moduleName) const; }; std::vector> buildNativeModuleList( diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeArray.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeArray.h index 08816872d64..c7087485521 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeArray.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeArray.h @@ -16,7 +16,7 @@ namespace facebook::react { class NativeArray : public jni::HybridClass { public: - static auto constexpr *kJavaDescriptor = + static auto constexpr* kJavaDescriptor = "Lcom/facebook/react/bridge/NativeArray;"; jni::local_ref toString(); @@ -35,7 +35,7 @@ class NativeArray : public jni::HybridClass { friend HybridBase; template - explicit NativeArray(Dyn &&array) + explicit NativeArray(Dyn&& array) : isConsumed(false), array_(std::forward(array)) { assertInternalType(); } @@ -43,8 +43,8 @@ class NativeArray : public jni::HybridClass { void assertInternalType(); void throwIfConsumed(); - NativeArray(const NativeArray &) = delete; - NativeArray &operator=(const NativeArray &) = delete; + NativeArray(const NativeArray&) = delete; + NativeArray& operator=(const NativeArray&) = delete; }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp index b7134f7276f..04078f143d1 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp @@ -12,14 +12,14 @@ using namespace facebook::jni; namespace facebook::react { namespace exceptions { -const char *gUnexpectedNativeTypeExceptionClass = +const char* gUnexpectedNativeTypeExceptionClass = "com/facebook/react/bridge/UnexpectedNativeTypeException"; } namespace { // Returns a leaked global_ref. -alias_ref getTypeField(const char *fieldName) { +alias_ref getTypeField(const char* fieldName) { static auto cls = ReadableType::javaClassStatic(); auto field = cls->getStaticField(fieldName); return make_global(cls->getStaticFieldValue(field)).release(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.h index cc27b94b150..b3b7bc0f45a 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeCommon.h @@ -25,10 +25,10 @@ struct ReadableType : public jni::JavaClass { namespace exceptions { -extern const char *gUnexpectedNativeTypeExceptionClass; +extern const char* gUnexpectedNativeTypeExceptionClass; template -void throwIfObjectAlreadyConsumed(const T &t, const char *msg) { +void throwIfObjectAlreadyConsumed(const T& t, const char* msg) { if (t->isConsumed) { jni::throwNewJavaException( "com/facebook/react/bridge/ObjectAlreadyConsumedException", msg); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeMap.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeMap.h index b61e22760e5..a451c41aa16 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeMap.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/NativeMap.h @@ -35,13 +35,13 @@ class NativeMap : public jni::HybridClass { friend HybridBase; template - explicit NativeMap(Dyn &&map) + explicit NativeMap(Dyn&& map) : isConsumed(false), map_(std::forward(map)) {} void throwIfConsumed(); - NativeMap(const NativeMap &) = delete; - NativeMap &operator=(const NativeMap &) = delete; + NativeMap(const NativeMap&) = delete; + NativeMap& operator=(const NativeMap&) = delete; }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp index e3d6c3ef03a..a3a60afb27f 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/OnLoad.cpp @@ -69,7 +69,7 @@ class ProxyJavaScriptExecutorHolder : public HybridClass< } // namespace -extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM *vm, void *reserved) { +extern "C" JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { return initialize(vm, [] { #if WITH_GLOGINIT gloginit::initialize(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp index bd9e98fee58..f7b2d2b9d40 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp @@ -24,8 +24,8 @@ const auto EXECUTOR_BASECLASS = "com/facebook/react/bridge/JavaJSExecutor"; static std::string executeJSCallWithProxy( jobject executor, - const std::string &methodName, - const folly::dynamic &arguments) { + const std::string& methodName, + const folly::dynamic& arguments) { static auto executeJSCall = jni::findClassStatic(EXECUTOR_BASECLASS) ->getMethod("executeJSCall"); @@ -44,7 +44,7 @@ std::unique_ptr ProxyExecutorOneTimeFactory::createJSExecutor( } ProxyExecutor::ProxyExecutor( - jni::global_ref &&executorInstance, + jni::global_ref&& executorInstance, std::shared_ptr delegate) : m_executor(std::move(executorInstance)), m_delegate(delegate) {} @@ -58,7 +58,7 @@ void ProxyExecutor::initializeRuntime() { { SystraceSection s("collectNativeModuleDescriptions"); auto moduleRegistry = m_delegate->getModuleRegistry(); - for (const auto &name : moduleRegistry->moduleNames()) { + for (const auto& name : moduleRegistry->moduleNames()) { auto config = moduleRegistry->getConfig(name); nativeModuleConfig.push_back(config ? config->config : nullptr); } @@ -96,16 +96,16 @@ void ProxyExecutor::setBundleRegistry(std::unique_ptr) { void ProxyExecutor::registerBundle( uint32_t bundleId, - const std::string &bundlePath) { + const std::string& bundlePath) { jni::throwNewJavaException( "java/lang/UnsupportedOperationException", "Loading application RAM bundles is not supported for proxy executors"); } void ProxyExecutor::callFunction( - const std::string &moduleId, - const std::string &methodId, - const folly::dynamic &arguments) { + const std::string& moduleId, + const std::string& methodId, + const folly::dynamic& arguments) { auto call = folly::dynamic::array(moduleId, methodId, std::move(arguments)); std::string result = executeJSCallWithProxy( @@ -115,7 +115,7 @@ void ProxyExecutor::callFunction( void ProxyExecutor::invokeCallback( const double callbackId, - const folly::dynamic &arguments) { + const folly::dynamic& arguments) { auto call = folly::dynamic::array(callbackId, std::move(arguments)); std::string result = executeJSCallWithProxy( m_executor.get(), "invokeCallbackAndReturnFlushedQueue", std::move(call)); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h index 4f05c0a9a28..2d080c546bf 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h @@ -21,7 +21,7 @@ namespace facebook::react { */ class ProxyExecutorOneTimeFactory : public JSExecutorFactory { public: - ProxyExecutorOneTimeFactory(jni::global_ref &&executorInstance) + ProxyExecutorOneTimeFactory(jni::global_ref&& executorInstance) : m_executor(std::move(executorInstance)) {} virtual std::unique_ptr createJSExecutor( std::shared_ptr delegate, @@ -34,7 +34,7 @@ class ProxyExecutorOneTimeFactory : public JSExecutorFactory { class ProxyExecutor : public JSExecutor { public: ProxyExecutor( - jni::global_ref &&executorInstance, + jni::global_ref&& executorInstance, std::shared_ptr delegate); virtual ~ProxyExecutor() override; virtual void initializeRuntime() override; @@ -43,15 +43,15 @@ class ProxyExecutor : public JSExecutor { std::string sourceURL) override; virtual void setBundleRegistry( std::unique_ptr bundle) override; - virtual void registerBundle(uint32_t bundleId, const std::string &bundlePath) + virtual void registerBundle(uint32_t bundleId, const std::string& bundlePath) override; virtual void callFunction( - const std::string &moduleId, - const std::string &methodId, - const folly::dynamic &arguments) override; + const std::string& moduleId, + const std::string& methodId, + const folly::dynamic& arguments) override; virtual void invokeCallback( const double callbackId, - const folly::dynamic &arguments) override; + const folly::dynamic& arguments) override; virtual void setGlobalVariable( std::string propName, std::unique_ptr jsonValue) override; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp index f99e2dbd262..d0d8edb87a7 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp @@ -16,7 +16,7 @@ namespace facebook::react { void ReadableNativeArray::mapException(std::exception_ptr ex) { try { std::rethrow_exception(ex); - } catch (const folly::TypeError &err) { + } catch (const folly::TypeError& err) { throwNewJavaException( exceptions::gUnexpectedNativeTypeExceptionClass, err.what()); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h index b9c0d780fae..02d9445192e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.h @@ -25,11 +25,11 @@ class ReadableNativeArray friend HybridBase; template - explicit ReadableNativeArray(Dyn &&array) + explicit ReadableNativeArray(Dyn&& array) : HybridBase(std::forward(array)) {} public: - static constexpr const char *kJavaDescriptor = + static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/ReadableNativeArray;"; static void mapException(std::exception_ptr ex); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp index 75b0d16ebf1..bbd6daab446 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.cpp @@ -14,7 +14,7 @@ namespace facebook::react { void ReadableNativeMap::mapException(std::exception_ptr ex) { try { std::rethrow_exception(ex); - } catch (const folly::TypeError &err) { + } catch (const folly::TypeError& err) { throwNewJavaException( exceptions::gUnexpectedNativeTypeExceptionClass, err.what()); } @@ -23,7 +23,7 @@ void ReadableNativeMap::mapException(std::exception_ptr ex) { void addDynamicToJArray( local_ref> jarray, jint index, - const folly::dynamic &dyn) { + const folly::dynamic& dyn) { switch (dyn.type()) { case folly::dynamic::Type::NULLT: { jarray->setElement(index, nullptr); @@ -68,7 +68,7 @@ local_ref> ReadableNativeMap::importKeys() { } auto jarray = JArrayClass::newArray(map_.size()); jint i = 0; - for (auto &pair : map_.items()) { + for (auto& pair : map_.items()) { auto value = pair.first.asString(); (*keys_).push_back(value); (*jarray)[i++] = make_jstring(value); @@ -83,7 +83,7 @@ local_ref> ReadableNativeMap::importValues() { jint size = keys_.value().size(); auto jarray = JArrayClass::newArray(size); for (jint ii = 0; ii < size; ii++) { - const std::string &key = (*keys_)[ii].getString(); + const std::string& key = (*keys_)[ii].getString(); addDynamicToJArray(jarray, ii, map_.at(key)); } return jarray; @@ -95,14 +95,14 @@ local_ref> ReadableNativeMap::importTypes() { jint size = keys_.value().size(); auto jarray = JArrayClass::newArray(size); for (jint ii = 0; ii < size; ii++) { - const std::string &key = (*keys_)[ii].getString(); + const std::string& key = (*keys_)[ii].getString(); (*jarray)[ii] = ReadableType::getType(map_.at(key).type()); } return jarray; } local_ref -ReadableNativeMap::createWithContents(folly::dynamic &&map) { +ReadableNativeMap::createWithContents(folly::dynamic&& map) { if (map.isNull()) { return local_ref(nullptr); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h index 4fa3c481e9e..16ff720b4c0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/ReadableNativeMap.h @@ -28,7 +28,7 @@ struct ReadableMap : jni::JavaClass { void addDynamicToJArray( jni::local_ref> jarray, jint index, - const folly::dynamic &dyn); + const folly::dynamic& dyn); struct ReadableNativeMap : jni::HybridClass { static auto constexpr kJavaDescriptor = @@ -38,7 +38,7 @@ struct ReadableNativeMap : jni::HybridClass { jni::local_ref> importValues(); jni::local_ref> importTypes(); std::optional keys_; - static jni::local_ref createWithContents(folly::dynamic &&map); + static jni::local_ref createWithContents(folly::dynamic&& map); static void mapException(std::exception_ptr ex); static void registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp index 46f34f08d9e..c6ca317bd94 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.cpp @@ -16,7 +16,7 @@ namespace facebook::react { WritableNativeArray::WritableNativeArray() : HybridBase(folly::dynamic::array()) {} -WritableNativeArray::WritableNativeArray(folly::dynamic &&val) +WritableNativeArray::WritableNativeArray(folly::dynamic&& val) : HybridBase(std::move(val)) { if (!array_.isArray()) { throw std::runtime_error("WritableNativeArray value must be an array."); @@ -57,7 +57,7 @@ void WritableNativeArray::pushString(jstring value) { array_.push_back(wrap_alias(value)->toStdString()); } -void WritableNativeArray::pushNativeArray(ReadableNativeArray *otherArray) { +void WritableNativeArray::pushNativeArray(ReadableNativeArray* otherArray) { if (otherArray == NULL) { pushNull(); return; @@ -66,7 +66,7 @@ void WritableNativeArray::pushNativeArray(ReadableNativeArray *otherArray) { array_.push_back(otherArray->consume()); } -void WritableNativeArray::pushNativeMap(ReadableNativeMap *map) { +void WritableNativeArray::pushNativeMap(ReadableNativeMap* map) { if (map == NULL) { pushNull(); return; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h index 0b1224b6fc5..559beef4d88 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeArray.h @@ -24,11 +24,11 @@ struct WritableArray : jni::JavaClass { struct WritableNativeArray : public jni::HybridClass { - static constexpr const char *kJavaDescriptor = + static constexpr const char* kJavaDescriptor = "Lcom/facebook/react/bridge/WritableNativeArray;"; WritableNativeArray(); - WritableNativeArray(folly::dynamic &&val); + WritableNativeArray(folly::dynamic&& val); static jni::local_ref initHybrid(jni::alias_ref); @@ -37,8 +37,8 @@ struct WritableNativeArray void pushDouble(jdouble value); void pushInt(jint value); void pushString(jstring value); - void pushNativeArray(ReadableNativeArray *otherArray); - void pushNativeMap(ReadableNativeMap *map); + void pushNativeArray(ReadableNativeArray* otherArray); + void pushNativeMap(ReadableNativeMap* map); static void registerNatives(); }; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp index a787d9c6e27..9c53c5c8300 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.cpp @@ -13,7 +13,7 @@ namespace facebook::react { WritableNativeMap::WritableNativeMap() : HybridBase(folly::dynamic::object()) {} -WritableNativeMap::WritableNativeMap(folly::dynamic &&val) +WritableNativeMap::WritableNativeMap(folly::dynamic&& val) : HybridBase(std::move(val)) { if (!map_.isObject()) { throw std::runtime_error("WritableNativeMap value must be an object."); @@ -56,7 +56,7 @@ void WritableNativeMap::putString(std::string key, alias_ref val) { void WritableNativeMap::putNativeArray( std::string key, - ReadableNativeArray *otherArray) { + ReadableNativeArray* otherArray) { if (!otherArray) { putNull(std::move(key)); return; @@ -67,7 +67,7 @@ void WritableNativeMap::putNativeArray( void WritableNativeMap::putNativeMap( std::string key, - ReadableNativeMap *otherMap) { + ReadableNativeMap* otherMap) { if (!otherMap) { putNull(std::move(key)); return; @@ -76,7 +76,7 @@ void WritableNativeMap::putNativeMap( map_.insert(std::move(key), otherMap->consume()); } -void WritableNativeMap::mergeNativeMap(ReadableNativeMap *other) { +void WritableNativeMap::mergeNativeMap(ReadableNativeMap* other) { throwIfConsumed(); other->throwIfConsumed(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h index 61d153f3cf9..d20f007a04c 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jni/WritableNativeMap.h @@ -27,7 +27,7 @@ struct WritableNativeMap "Lcom/facebook/react/bridge/WritableNativeMap;"; WritableNativeMap(); - WritableNativeMap(folly::dynamic &&val); + WritableNativeMap(folly::dynamic&& val); static jni::local_ref initHybrid(jni::alias_ref); @@ -36,9 +36,9 @@ struct WritableNativeMap void putDouble(std::string key, double val); void putInt(std::string key, int val); void putString(std::string key, jni::alias_ref val); - void putNativeArray(std::string key, ReadableNativeArray *val); - void putNativeMap(std::string key, ReadableNativeMap *val); - void mergeNativeMap(ReadableNativeMap *other); + void putNativeArray(std::string key, ReadableNativeArray* val); + void putNativeMap(std::string key, ReadableNativeMap* val); + void mergeNativeMap(ReadableNativeMap* other); static void registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp index 6a812b05be0..f9a4649bca2 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/jscexecutor/OnLoad.cpp @@ -24,9 +24,9 @@ class JSCExecutorFactory : public JSExecutorFactory { std::unique_ptr createJSExecutor( std::shared_ptr delegate, std::shared_ptr jsQueue) override { - auto installBindings = [](jsi::Runtime &runtime) { + auto installBindings = [](jsi::Runtime& runtime) { react::Logger androidLogger = - static_cast( + static_cast( &reactAndroidLoggingHook); react::bindNativeLogger(runtime, androidLogger); }; @@ -50,7 +50,7 @@ class JSCExecutorHolder static jni::local_ref initHybrid( jni::alias_ref, - ReadableNativeMap *) { + ReadableNativeMap*) { // This is kind of a weird place for stuff, but there's no other // good place for initialization which is specific to JSC on // Android. @@ -72,7 +72,7 @@ class JSCExecutorHolder } // namespace facebook::react -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return facebook::jni::initialize( vm, [] { facebook::react::JSCExecutorHolder::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp index 21bf6305cec..49b07b732de 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.cpp @@ -28,11 +28,11 @@ std::vector JReadableMapBuffer::data() const { } jni::local_ref -JReadableMapBuffer::createWithContents(MapBuffer &&map) { +JReadableMapBuffer::createWithContents(MapBuffer&& map) { return newObjectCxxArgs(std::move(map)); } -JReadableMapBuffer::JReadableMapBuffer(MapBuffer &&map) +JReadableMapBuffer::JReadableMapBuffer(MapBuffer&& map) : serializedData_(std::move(map.bytes_)) { react_native_assert( (serializedData_.size() != 0) && "Error no content in map"); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h index 3db58d3bbe3..5949ca54168 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/JReadableMapBuffer.h @@ -23,9 +23,9 @@ class JReadableMapBuffer : public jni::HybridClass { static void registerNatives(); static jni::local_ref createWithContents( - MapBuffer &&map); + MapBuffer&& map); - explicit JReadableMapBuffer(MapBuffer &&map); + explicit JReadableMapBuffer(MapBuffer&& map); jni::local_ref importByteBuffer(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp index d6c51636c23..3a1ec41a161 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/mapbuffer/react/common/mapbuffer/OnLoad.cpp @@ -10,7 +10,7 @@ #include "JReadableMapBuffer.h" #include "JWritableMapBuffer.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize( vm, [] { facebook::react::JReadableMapBuffer::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp index d20f34669ec..73bd0392038 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.cpp @@ -17,7 +17,7 @@ namespace facebook::react { std::function)> DefaultComponentsRegistry::registerComponentDescriptorsFromEntryPoint{}; -DefaultComponentsRegistry::DefaultComponentsRegistry(ComponentFactory *delegate) +DefaultComponentsRegistry::DefaultComponentsRegistry(ComponentFactory* delegate) : delegate_(delegate) {} std::shared_ptr @@ -33,19 +33,18 @@ DefaultComponentsRegistry::sharedProviderRegistry() { jni::local_ref DefaultComponentsRegistry::initHybrid( jni::alias_ref, - ComponentFactory *delegate) { + ComponentFactory* delegate) { auto instance = makeCxxInstance(delegate); auto buildRegistryFunction = - [](const EventDispatcher::Weak &eventDispatcher, - const ContextContainer::Shared &contextContainer) + [](const EventDispatcher::Weak& eventDispatcher, + const ContextContainer::Shared& contextContainer) -> ComponentDescriptorRegistry::Shared { auto registry = DefaultComponentsRegistry::sharedProviderRegistry() ->createComponentDescriptorRegistry( {eventDispatcher, contextContainer}); - auto &mutableRegistry = - const_cast(*registry); + auto& mutableRegistry = const_cast(*registry); mutableRegistry.setFallbackComponentDescriptor( std::make_shared( ComponentDescriptorParameters{ diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h index b6b09438cbc..d1950e8c746 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultComponentsRegistry.h @@ -27,7 +27,7 @@ class DefaultComponentsRegistry std::shared_ptr)> registerComponentDescriptorsFromEntryPoint; - DefaultComponentsRegistry(ComponentFactory *delegate); + DefaultComponentsRegistry(ComponentFactory* delegate); private: friend HybridBase; @@ -35,11 +35,11 @@ class DefaultComponentsRegistry static std::shared_ptr sharedProviderRegistry(); - const ComponentFactory *delegate_; + const ComponentFactory* delegate_; static jni::local_ref initHybrid( jni::alias_ref, - ComponentFactory *delegate); + ComponentFactory* delegate); }; } // namespace facebook::react diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp index 182582251bf..c4a14f39c53 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.cpp @@ -12,13 +12,13 @@ namespace facebook::react { std::function( - const std::string &, - const std::shared_ptr &)> + const std::string&, + const std::shared_ptr&)> DefaultTurboModuleManagerDelegate::cxxModuleProvider{nullptr}; std::function( - const std::string &, - const JavaTurboModule::InitParams &)> + const std::string&, + const JavaTurboModule::InitParams&)> DefaultTurboModuleManagerDelegate::javaModuleProvider{nullptr}; jni::local_ref @@ -34,8 +34,8 @@ void DefaultTurboModuleManagerDelegate::registerNatives() { } std::shared_ptr DefaultTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) { + const std::string& name, + const std::shared_ptr& jsInvoker) { auto moduleProvider = DefaultTurboModuleManagerDelegate::cxxModuleProvider; if (moduleProvider) { return moduleProvider(name, jsInvoker); @@ -44,8 +44,8 @@ std::shared_ptr DefaultTurboModuleManagerDelegate::getTurboModule( } std::shared_ptr DefaultTurboModuleManagerDelegate::getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) { + const std::string& name, + const JavaTurboModule::InitParams& params) { auto moduleProvider = DefaultTurboModuleManagerDelegate::javaModuleProvider; if (moduleProvider) { if (auto resolvedModule = moduleProvider(name, params)) { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h index bbfa17c44dc..fdcf8d00ae9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/DefaultTurboModuleManagerDelegate.h @@ -27,21 +27,21 @@ class DefaultTurboModuleManagerDelegate : public jni::HybridClass< static void registerNatives(); static std::function( - const std::string &, - const std::shared_ptr &)> + const std::string&, + const std::shared_ptr&)> cxxModuleProvider; static std::function( - const std::string &, - const JavaTurboModule::InitParams &)> + const std::string&, + const JavaTurboModule::InitParams&)> javaModuleProvider; std::shared_ptr getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) override; + const std::string& name, + const std::shared_ptr& jsInvoker) override; std::shared_ptr getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) override; + const std::string& name, + const JavaTurboModule::InitParams& params) override; private: friend HybridBase; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp index f93ba96e865..a66675651cd 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/newarchdefaults/OnLoad.cpp @@ -10,7 +10,7 @@ #include "DefaultComponentsRegistry.h" #include "DefaultTurboModuleManagerDelegate.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { facebook::react::DefaultTurboModuleManagerDelegate::registerNatives(); facebook::react::DefaultComponentsRegistry::registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp index 35965eb017c..bd5341c1e1d 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/perftests/OnLoad.cpp @@ -42,8 +42,8 @@ class JavaJSModule : public jni::JavaClass { int b, double x, double y, - const std::string &s, - const std::string &t) { + const std::string& s, + const std::string& t) { static auto method = javaClassLocal() ->getMethod blobModule, - const std::string &blobId) + const std::string& blobId) : blobModule_(blobModule), blobId_(blobId) {} BlobCollector::~BlobCollector() { @@ -36,7 +36,7 @@ void BlobCollector::nativeInstall( jni::alias_ref jThis, jni::alias_ref blobModule, jlong jsContextNativePointer) { - auto &runtime = *((jsi::Runtime *)jsContextNativePointer); + auto& runtime = *((jsi::Runtime*)jsContextNativePointer); auto blobModuleRef = jni::make_global(blobModule); runtime.global().setProperty( runtime, @@ -46,9 +46,9 @@ void BlobCollector::nativeInstall( jsi::PropNameID::forAscii(runtime, "__blobCollectorProvider"), 1, [blobModuleRef]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { auto blobId = args[0].asString(rt).utf8(rt); auto blobCollector = diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h b/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h index d327e44a288..1a0a705d2c7 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/BlobCollector.h @@ -17,7 +17,7 @@ class BlobCollector : public jni::HybridClass, public: BlobCollector( jni::global_ref blobManager, - const std::string &blobId); + const std::string& blobId); ~BlobCollector(); static constexpr auto kJavaDescriptor = diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp index 12b7e7e699d..ded85471548 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/reactnativeblob/OnLoad.cpp @@ -9,7 +9,7 @@ #include "BlobCollector.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return facebook::jni::initialize( vm, [] { facebook::react::BlobCollector::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp index fa21e017741..19ac80c107a 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/reactperflogger/reactperflogger/OnLoad.cpp @@ -9,6 +9,6 @@ #include "JNativeModulePerfLogger.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] {}); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/OnLoad.cpp index f6aa11c21da..7dd0dd11a8a 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/hermes/jni/OnLoad.cpp @@ -9,7 +9,7 @@ #include "JHermesInstance.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize( vm, [] { facebook::react::JHermesInstance::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp index 26a896816ca..0e2a390b9e4 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.cpp @@ -17,9 +17,9 @@ void JJSTimerExecutor::setTimerManager( timerManager_ = timerManager; } -void JJSTimerExecutor::callTimers(WritableNativeArray *timerIDs) { +void JJSTimerExecutor::callTimers(WritableNativeArray* timerIDs) { if (auto timerManager = timerManager_.lock()) { - for (const auto &timerID : timerIDs->consume()) { + for (const auto& timerID : timerIDs->consume()) { timerManager->callTimer((uint32_t)timerID.asInt()); } } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h index 650a46fad32..cc7d9385065 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JJSTimerExecutor.h @@ -26,7 +26,7 @@ class JJSTimerExecutor : public jni::HybridClass { void setTimerManager(std::weak_ptr timerManager); - void callTimers(WritableNativeArray *timerIDs); + void callTimers(WritableNativeArray* timerIDs); private: friend HybridBase; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp index 879def68d93..05905b84121 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.cpp @@ -70,9 +70,9 @@ JReactInstance::JReactInstance( timerManager->setRuntimeExecutor(bufferedRuntimeExecutor); ReactInstance::JSRuntimeFlags options = {.isProfiling = isProfiling}; - instance_->initializeRuntime(options, [this](jsi::Runtime &runtime) { + instance_->initializeRuntime(options, [this](jsi::Runtime& runtime) { react::Logger androidLogger = - static_cast( + static_cast( &reactAndroidLoggingHook); react::bindNativeLogger(runtime, androidLogger); if (jBindingsInstaller_ != nullptr) { @@ -129,7 +129,7 @@ jni::local_ref JReactInstance::initHybrid( void JReactInstance::loadJSBundleFromAssets( jni::alias_ref assetManager, - const std::string &assetURL) { + const std::string& assetURL) { const int kAssetsLength = 9; // strlen("assets://"); auto sourceURL = assetURL.substr(kAssetsLength); @@ -139,8 +139,8 @@ void JReactInstance::loadJSBundleFromAssets( } void JReactInstance::loadJSBundleFromFile( - const std::string &fileName, - const std::string &sourceURL) { + const std::string& fileName, + const std::string& sourceURL) { std::unique_ptr script; RecoverableError::runRethrowingAsRecoverable( [&fileName, &script]() { script = JSBigFileString::fromPath(fileName); }); @@ -170,9 +170,9 @@ JReactInstance::createJSTimerExecutor( } void JReactInstance::callFunctionOnModule( - const std::string &moduleName, - const std::string &methodName, - NativeArray *args) { + const std::string& moduleName, + const std::string& methodName, + NativeArray* args) { instance_->callFunctionOnModule(moduleName, methodName, args->consume()); } @@ -193,7 +193,7 @@ JReactInstance::getRuntimeScheduler() noexcept { void JReactInstance::registerSegment( int segmentId, - const std::string &segmentPath) noexcept { + const std::string& segmentPath) noexcept { instance_->registerSegment((uint32_t)segmentId, segmentPath); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h index 1e2f27dbb43..55ec3e9ffa1 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/JReactInstance.h @@ -57,16 +57,16 @@ class JReactInstance : public jni::HybridClass { void loadJSBundleFromAssets( jni::alias_ref assetManager, - const std::string &assetURL); + const std::string& assetURL); void loadJSBundleFromFile( - const std::string &fileName, - const std::string &sourceURL); + const std::string& fileName, + const std::string& sourceURL); void callFunctionOnModule( - const std::string &moduleName, - const std::string &methodName, - NativeArray *args); + const std::string& moduleName, + const std::string& methodName, + NativeArray* args); jni::alias_ref getUnbufferedRuntimeExecutor() noexcept; @@ -74,7 +74,7 @@ class JReactInstance : public jni::HybridClass { getBufferedRuntimeExecutor() noexcept; jni::alias_ref getRuntimeScheduler() noexcept; - void registerSegment(int segmentId, const std::string &segmentPath) noexcept; + void registerSegment(int segmentId, const std::string& segmentPath) noexcept; void handleMemoryPressureJs(jint level); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/OnLoad.cpp index e8dfb19f5b2..fa091d0f312 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jni/OnLoad.cpp @@ -11,7 +11,7 @@ #include "JJSTimerExecutor.h" #include "JReactInstance.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void * /*unused*/) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*unused*/) { return facebook::jni::initialize(vm, [] { facebook::react::JReactMarker::setLogPerfMarkerIfNeeded(); facebook::react::JReactInstance::registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jsc/jni/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jsc/jni/OnLoad.cpp index 62d26871d4a..0eab4312983 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jsc/jni/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/runtime/jsc/jni/OnLoad.cpp @@ -40,7 +40,7 @@ class JSCInstance : public jni::HybridClass { } // namespace facebook::react -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* reserved) { return facebook::jni::initialize( vm, [] { facebook::react::JSCInstance::registerNatives(); }); } diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp index a0c76fcbcb0..a8e37e77e40 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.cpp @@ -26,8 +26,8 @@ void CompositeTurboModuleManagerDelegate::registerNatives() { std::shared_ptr CompositeTurboModuleManagerDelegate::getTurboModule( - const std::string &moduleName, - const std::shared_ptr &jsInvoker) { + const std::string& moduleName, + const std::shared_ptr& jsInvoker) { for (auto delegate : mDelegates_) { if (auto turboModule = delegate->cthis()->getTurboModule(moduleName, jsInvoker)) { @@ -39,8 +39,8 @@ CompositeTurboModuleManagerDelegate::getTurboModule( std::shared_ptr CompositeTurboModuleManagerDelegate::getTurboModule( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms) { + const std::string& moduleName, + const JavaTurboModule::InitParams& params) { for (auto delegate : mDelegates_) { if (auto turboModule = delegate->cthis()->getTurboModule(moduleName, params)) { diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h index 9f4fdb6c42c..52b24cc8b1e 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/CompositeTurboModuleManagerDelegate.h @@ -28,12 +28,12 @@ class CompositeTurboModuleManagerDelegate static void registerNatives(); std::shared_ptr getTurboModule( - const std::string &moduleName, - const std::shared_ptr &jsInvoker) override; + const std::string& moduleName, + const std::shared_ptr& jsInvoker) override; std::shared_ptr getTurboModule( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms) override; + const std::string& moduleName, + const JavaTurboModule::InitParams& params) override; private: friend HybridBase; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp index f4c388428f2..22ab89a5bc0 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/OnLoad.cpp @@ -20,7 +20,7 @@ void jniEnableCppLogging( perfLogger->cthis()->get()); } -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { // TODO: dvacca ramanpreet unify this with the way // "ComponentDescriptorFactory" is defined in Fabric diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp index baa3e2eeaf0..f524d969c98 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManager.cpp @@ -136,7 +136,7 @@ TurboModuleManager::createTurboModuleProvider() { std::weak_ptr(nativeMethodCallInvoker_), delegate_ = jni::make_weak(delegate_), javaPart_ = jni::make_weak(javaPart_)]( - const std::string &name) -> std::shared_ptr { + const std::string& name) -> std::shared_ptr { auto turboModuleCache = turboModuleCache_.lock(); auto jsCallInvoker = jsCallInvoker_.lock(); auto nativeMethodCallInvoker = nativeMethodCallInvoker_.lock(); @@ -148,7 +148,7 @@ TurboModuleManager::createTurboModuleProvider() { return nullptr; } - const char *moduleName = name.c_str(); + const char* moduleName = name.c_str(); TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName); @@ -170,7 +170,7 @@ TurboModuleManager::createTurboModuleProvider() { static auto getTurboLegacyCxxModule = javaPart->getClass() ->getMethod( - const std::string &)>("getTurboLegacyCxxModule"); + const std::string&)>("getTurboLegacyCxxModule"); auto legacyCxxModule = getTurboLegacyCxxModule(javaPart.get(), name); if (legacyCxxModule) { @@ -186,7 +186,7 @@ TurboModuleManager::createTurboModuleProvider() { static auto getTurboJavaModule = javaPart->getClass() - ->getMethod(const std::string &)>( + ->getMethod(const std::string&)>( "getTurboJavaModule"); auto moduleInstance = getTurboJavaModule(javaPart.get(), name); @@ -216,7 +216,7 @@ TurboModuleManager::createLegacyModuleProvider() { std::weak_ptr(nativeMethodCallInvoker_), delegate_ = jni::make_weak(delegate_), javaPart_ = jni::make_weak(javaPart_)]( - const std::string &name) -> std::shared_ptr { + const std::string& name) -> std::shared_ptr { auto legacyModuleCache = legacyModuleCache_.lock(); auto jsCallInvoker = jsCallInvoker_.lock(); auto nativeMethodCallInvoker = nativeMethodCallInvoker_.lock(); @@ -228,7 +228,7 @@ TurboModuleManager::createLegacyModuleProvider() { return nullptr; } - const char *moduleName = name.c_str(); + const char* moduleName = name.c_str(); TurboModulePerfLogger::moduleJSRequireBeginningStart(moduleName); @@ -244,7 +244,7 @@ TurboModuleManager::createLegacyModuleProvider() { static auto getLegacyCxxModule = javaPart->getClass() ->getMethod( - const std::string &)>("getLegacyCxxModule"); + const std::string&)>("getLegacyCxxModule"); auto legacyCxxModule = getLegacyCxxModule(javaPart.get(), name); if (legacyCxxModule) { @@ -260,7 +260,7 @@ TurboModuleManager::createLegacyModuleProvider() { static auto getLegacyJavaModule = javaPart->getClass() - ->getMethod(const std::string &)>( + ->getMethod(const std::string&)>( "getLegacyJavaModule"); auto moduleInstance = getLegacyJavaModule(javaPart.get(), name); @@ -307,7 +307,7 @@ void TurboModuleManager::installJSIBindings(bool shouldCreateLegacyModules) { bool isInteropLayerDisabled = !shouldCreateLegacyModules; - runtimeExecutor_([this, isInteropLayerDisabled](jsi::Runtime &runtime) { + runtimeExecutor_([this, isInteropLayerDisabled](jsi::Runtime& runtime) { if (isInteropLayerDisabled) { TurboModuleBinding::install(runtime, createTurboModuleProvider()); return; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h index e97575cf1a4..46fac66e2a9 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h +++ b/packages/react-native/ReactAndroid/src/main/jni/react/turbomodule/ReactCommon/TurboModuleManagerDelegate.h @@ -22,11 +22,11 @@ class TurboModuleManagerDelegate "Lcom/facebook/react/turbomodule/core/TurboModuleManagerDelegate;"; virtual std::shared_ptr getTurboModule( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) = 0; + const std::string& name, + const JavaTurboModule::InitParams& params) = 0; virtual std::shared_ptr getTurboModule( - const std::string &name, - const std::shared_ptr &jsInvoker) = 0; + const std::string& name, + const std::shared_ptr& jsInvoker) = 0; private: friend HybridBase; diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp index 909b1d8c720..0d1e2c6f2da 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/ComponentNameResolverManager.cpp @@ -45,8 +45,8 @@ void ComponentNameResolverManager::registerNatives() { } void ComponentNameResolverManager::installJSIBindings() { - runtimeExecutor_([thizz = this](jsi::Runtime &runtime) { - auto viewManagerProvider = [thizz](const std::string &name) -> bool { + runtimeExecutor_([thizz = this](jsi::Runtime& runtime) { + auto viewManagerProvider = [thizz](const std::string& name) -> bool { if (thizz->componentNames_.size() == 0) { static auto getComponentNames = jni::findClassStatic(ComponentNameResolverManager:: diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp index c7beb68a6ac..cf7ae8ea486 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/OnLoad.cpp @@ -10,7 +10,7 @@ #include "ComponentNameResolverManager.h" #include "UIConstantsProviderManager.h" -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { facebook::react::ComponentNameResolverManager::registerNatives(); facebook::react::UIConstantsProviderManager::registerNatives(); diff --git a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.cpp b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.cpp index c9ea6599e07..174b6bb4e54 100644 --- a/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.cpp +++ b/packages/react-native/ReactAndroid/src/main/jni/react/uimanager/UIConstantsProviderManager.cpp @@ -45,7 +45,7 @@ void UIConstantsProviderManager::registerNatives() { } void UIConstantsProviderManager::installJSIBindings() { - runtimeExecutor_([thizz = this](jsi::Runtime &runtime) { + runtimeExecutor_([thizz = this](jsi::Runtime& runtime) { auto uiConstantsProvider = [thizz, &runtime]() -> jsi::Value { static auto getConstants = jni::findClassStatic( diff --git a/packages/react-native/ReactCommon/callinvoker/ReactCommon/CallInvoker.h b/packages/react-native/ReactCommon/callinvoker/ReactCommon/CallInvoker.h index cec0abda69e..d67e82715b7 100644 --- a/packages/react-native/ReactCommon/callinvoker/ReactCommon/CallInvoker.h +++ b/packages/react-native/ReactCommon/callinvoker/ReactCommon/CallInvoker.h @@ -22,20 +22,20 @@ using CallFunc = std::function; */ class CallInvoker { public: - virtual void invokeAsync(CallFunc &&func) = 0; - virtual void invokeAsync(SchedulerPriority /*priority*/, CallFunc &&func) { + virtual void invokeAsync(CallFunc&& func) = 0; + virtual void invokeAsync(SchedulerPriority /*priority*/, CallFunc&& func) { // When call with priority is not implemented, fall back to a regular async // execution invokeAsync(std::move(func)); } - virtual void invokeSync(CallFunc &&func) = 0; + virtual void invokeSync(CallFunc&& func) = 0; virtual ~CallInvoker() {} }; class NativeMethodCallInvoker { public: - virtual void invokeAsync(const std::string &methodName, CallFunc &&func) = 0; - virtual void invokeSync(const std::string &methodName, CallFunc &&func) = 0; + virtual void invokeAsync(const std::string& methodName, CallFunc&& func) = 0; + virtual void invokeSync(const std::string& methodName, CallFunc&& func) = 0; virtual ~NativeMethodCallInvoker() {} }; diff --git a/packages/react-native/ReactCommon/cxxreact/CxxModule.h b/packages/react-native/ReactCommon/cxxreact/CxxModule.h index c6af2bf9f1e..d6d08ce3b66 100644 --- a/packages/react-native/ReactCommon/cxxreact/CxxModule.h +++ b/packages/react-native/ReactCommon/cxxreact/CxxModule.h @@ -73,20 +73,20 @@ class CxxModule { std::function syncFunc; - const char *getType() { + const char* getType() { assert(func || syncFunc); return func ? (isPromise ? "promise" : "async") : "sync"; } // std::function/lambda ctors - Method(std::string aname, std::function &&afunc) + Method(std::string aname, std::function&& afunc) : name(std::move(aname)), callbacks(0), isPromise(false), func(std::bind(std::move(afunc))) {} - Method(std::string aname, std::function &&afunc) + Method(std::string aname, std::function&& afunc) : name(std::move(aname)), callbacks(0), isPromise(false), @@ -94,7 +94,7 @@ class CxxModule { Method( std::string aname, - std::function &&afunc) + std::function&& afunc) : name(std::move(aname)), callbacks(1), isPromise(false), @@ -105,7 +105,7 @@ class CxxModule { Method( std::string aname, - std::function &&afunc) + std::function&& afunc) : name(std::move(aname)), callbacks(2), isPromise(true), @@ -113,7 +113,7 @@ class CxxModule { Method( std::string aname, - std::function &&afunc, + std::function&& afunc, AsyncTagType) : name(std::move(aname)), callbacks(2), @@ -123,21 +123,21 @@ class CxxModule { // method pointer ctors template - Method(std::string aname, T *t, void (T::*method)()) + Method(std::string aname, T* t, void (T::*method)()) : name(std::move(aname)), callbacks(0), isPromise(false), func(std::bind(method, t)) {} template - Method(std::string aname, T *t, void (T::*method)(folly::dynamic)) + Method(std::string aname, T* t, void (T::*method)(folly::dynamic)) : name(std::move(aname)), callbacks(0), isPromise(false), func(std::bind(method, t, std::placeholders::_1)) {} template - Method(std::string aname, T *t, void (T::*method)(folly::dynamic, Callback)) + Method(std::string aname, T* t, void (T::*method)(folly::dynamic, Callback)) : name(std::move(aname)), callbacks(1), isPromise(false), @@ -150,7 +150,7 @@ class CxxModule { template Method( std::string aname, - T *t, + T* t, void (T::*method)(folly::dynamic, Callback, Callback)) : name(std::move(aname)), callbacks(2), @@ -165,7 +165,7 @@ class CxxModule { template Method( std::string aname, - T *t, + T* t, void (T::*method)(folly::dynamic, Callback, Callback), AsyncTagType) : name(std::move(aname)), @@ -186,18 +186,18 @@ class CxxModule { Method( std::string aname, - std::function &&afunc, + std::function&& afunc, SyncTagType) : name(std::move(aname)), callbacks(0), isPromise(false), - syncFunc([afunc = std::move(afunc)](const folly::dynamic &) { + syncFunc([afunc = std::move(afunc)](const folly::dynamic&) { return afunc(); }) {} Method( std::string aname, - std::function &&afunc, + std::function&& afunc, SyncTagType) : name(std::move(aname)), callbacks(0), diff --git a/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.cpp b/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.cpp index 53959a8112a..e62ec1a79f4 100644 --- a/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.cpp +++ b/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.cpp @@ -23,7 +23,7 @@ namespace facebook::react { std::function makeCallback( std::weak_ptr instance, - const folly::dynamic &callbackId) { + const folly::dynamic& callbackId) { if (!callbackId.isNumber()) { throw std::invalid_argument("Expected callback(s) as final argument"); } @@ -62,8 +62,8 @@ void CxxNativeModule::setShouldWarnOnUse(bool value) { } void CxxNativeModule::emitWarnIfWarnOnUsage( - const std::string &method_name, - const std::string &module_name) { + const std::string& method_name, + const std::string& module_name) { if (shouldWarnOnUse_) { std::string message = folly::to( "Calling ", @@ -95,7 +95,7 @@ std::vector CxxNativeModule::getMethods() { lazyInit(); std::vector descs; - for (auto &method : methods_) { + for (auto& method : methods_) { descs.emplace_back(method.name, method.getType()); } return descs; @@ -111,7 +111,7 @@ folly::dynamic CxxNativeModule::getConstants() { emitWarnIfWarnOnUsage("getConstants()", getName()); folly::dynamic constants = folly::dynamic::object(); - for (auto &pair : module_->getConstants()) { + for (auto& pair : module_->getConstants()) { constants.insert(std::move(pair.first), std::move(pair.second)); } return constants; @@ -119,7 +119,7 @@ folly::dynamic CxxNativeModule::getConstants() { void CxxNativeModule::invoke( unsigned int reactMethodId, - folly::dynamic &¶ms, + folly::dynamic&& params, int callId) { if (reactMethodId >= methods_.size()) { throw std::invalid_argument(folly::to( @@ -137,7 +137,7 @@ void CxxNativeModule::invoke( CxxModule::Callback first; CxxModule::Callback second; - const auto &method = methods_[reactMethodId]; + const auto& method = methods_[reactMethodId]; if (!method.func) { throw std::runtime_error(folly::to( @@ -184,7 +184,7 @@ void CxxNativeModule::invoke( // stack. I'm told that will be possible in the future. TODO // mhorowitz #7128529: convert C++ exceptions to Java - const auto &moduleName = name_; + const auto& moduleName = name_; SystraceSection s( "CxxMethodCallQueue", "module", moduleName, "method", method.name); messageQueueThread_->runOnQueue([method, @@ -204,13 +204,13 @@ void CxxNativeModule::invoke( "CxxMethodCallDispatch", "module", moduleName, "method", method.name); try { method.func(std::move(params), first, second); - } catch (const facebook::xplat::JsArgumentException &ex) { + } catch (const facebook::xplat::JsArgumentException& ex) { throw; - } catch (std::exception &e) { + } catch (std::exception& e) { LOG(ERROR) << "std::exception. Method call " << method.name.c_str() << " failed: " << e.what(); std::terminate(); - } catch (std::string &error) { + } catch (std::string& error) { LOG(ERROR) << "std::string. Method call " << method.name.c_str() << " failed: " << error.c_str(); std::terminate(); @@ -224,13 +224,13 @@ void CxxNativeModule::invoke( MethodCallResult CxxNativeModule::callSerializableNativeHook( unsigned int hookId, - folly::dynamic &&args) { + folly::dynamic&& args) { if (hookId >= methods_.size()) { throw std::invalid_argument(folly::to( "methodId ", hookId, " out of range [0..", methods_.size(), "]")); } - const auto &method = methods_[hookId]; + const auto& method = methods_[hookId]; if (!method.syncFunc) { throw std::runtime_error(folly::to( diff --git a/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.h b/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.h index 61d21cb14e0..024b80e13e8 100644 --- a/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.h +++ b/packages/react-native/ReactCommon/cxxreact/CxxNativeModule.h @@ -23,7 +23,7 @@ typedef void (*WarnOnUsageLogger)(std::string message); std::function makeCallback( std::weak_ptr instance, - const folly::dynamic &callbackId); + const folly::dynamic& callbackId); class RN_EXPORT CxxNativeModule : public NativeModule { public: @@ -41,11 +41,11 @@ class RN_EXPORT CxxNativeModule : public NativeModule { std::string getSyncMethodName(unsigned int methodId) override; std::vector getMethods() override; folly::dynamic getConstants() override; - void invoke(unsigned int reactMethodId, folly::dynamic &¶ms, int callId) + void invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) override; MethodCallResult callSerializableNativeHook( unsigned int hookId, - folly::dynamic &&args) override; + folly::dynamic&& args) override; static void setShouldWarnOnUse(bool value); @@ -59,8 +59,8 @@ class RN_EXPORT CxxNativeModule : public NativeModule { std::unique_ptr module_; std::vector methods_; void emitWarnIfWarnOnUsage( - const std::string &method_name, - const std::string &module_name); + const std::string& method_name, + const std::string& module_name); static bool shouldWarnOnUse_; }; diff --git a/packages/react-native/ReactCommon/cxxreact/ErrorUtils.h b/packages/react-native/ReactCommon/cxxreact/ErrorUtils.h index aaf31b6502a..89603e628a7 100644 --- a/packages/react-native/ReactCommon/cxxreact/ErrorUtils.h +++ b/packages/react-native/ReactCommon/cxxreact/ErrorUtils.h @@ -10,7 +10,7 @@ namespace facebook::react { inline static void -handleJSError(jsi::Runtime &runtime, const jsi::JSError &error, bool isFatal) { +handleJSError(jsi::Runtime& runtime, const jsi::JSError& error, bool isFatal) { auto errorUtils = runtime.global().getProperty(runtime, "ErrorUtils"); if (errorUtils.isUndefined() || !errorUtils.isObject() || !errorUtils.getObject(runtime).hasProperty(runtime, "reportFatalError") || diff --git a/packages/react-native/ReactCommon/cxxreact/Instance.cpp b/packages/react-native/ReactCommon/cxxreact/Instance.cpp index f84e51d020a..47fa82aa6f0 100644 --- a/packages/react-native/ReactCommon/cxxreact/Instance.cpp +++ b/packages/react-native/ReactCommon/cxxreact/Instance.cpp @@ -110,7 +110,7 @@ void Instance::loadScriptFromString( void Instance::loadRAMBundleFromString( std::unique_ptr script, - const std::string &sourceURL) { + const std::string& sourceURL) { auto bundle = std::make_unique(std::move(script)); auto startupScript = bundle->getStartupCode(); auto registry = RAMBundleRegistry::singleBundleRegistry(std::move(bundle)); @@ -118,8 +118,8 @@ void Instance::loadRAMBundleFromString( } void Instance::loadRAMBundleFromFile( - const std::string &sourcePath, - const std::string &sourceURL, + const std::string& sourcePath, + const std::string& sourceURL, bool loadSynchronously) { auto bundle = std::make_unique(sourcePath.c_str()); auto startupScript = bundle->getStartupCode(); @@ -157,7 +157,7 @@ void Instance::setGlobalVariable( std::move(propName), std::move(jsonValue)); } -void *Instance::getJavaScriptContext() { +void* Instance::getJavaScriptContext() { return nativeToJsBridge_ ? nativeToJsBridge_->getJavaScriptContext() : nullptr; } @@ -171,15 +171,15 @@ bool Instance::isBatchActive() { } void Instance::callJSFunction( - std::string &&module, - std::string &&method, - folly::dynamic &¶ms) { + std::string&& module, + std::string&& method, + folly::dynamic&& params) { callback_->incrementPendingJSCalls(); nativeToJsBridge_->callFunction( std::move(module), std::move(method), std::move(params)); } -void Instance::callJSCallback(uint64_t callbackId, folly::dynamic &¶ms) { +void Instance::callJSCallback(uint64_t callbackId, folly::dynamic&& params) { SystraceSection s("Instance::callJSCallback"); callback_->incrementPendingJSCalls(); nativeToJsBridge_->invokeCallback((double)callbackId, std::move(params)); @@ -187,15 +187,15 @@ void Instance::callJSCallback(uint64_t callbackId, folly::dynamic &¶ms) { void Instance::registerBundle( uint32_t bundleId, - const std::string &bundlePath) { + const std::string& bundlePath) { nativeToJsBridge_->registerBundle(bundleId, bundlePath); } -const ModuleRegistry &Instance::getModuleRegistry() const { +const ModuleRegistry& Instance::getModuleRegistry() const { return *moduleRegistry_; } -ModuleRegistry &Instance::getModuleRegistry() { +ModuleRegistry& Instance::getModuleRegistry() { return *moduleRegistry_; } @@ -220,18 +220,18 @@ RuntimeExecutor Instance::getRuntimeExecutor() { std::weak_ptr weakNativeToJsBridge = nativeToJsBridge_; return [weakNativeToJsBridge]( - std::function &&callback) { + std::function&& callback) { if (auto strongNativeToJsBridge = weakNativeToJsBridge.lock()) { strongNativeToJsBridge->runOnExecutorQueue( - [callback = std::move(callback)](JSExecutor *executor) { + [callback = std::move(callback)](JSExecutor* executor) { // Assumes the underlying executor is a JSIExecutor - jsi::Runtime *runtime = - (jsi::Runtime *)executor->getJavaScriptContext(); + jsi::Runtime* runtime = + (jsi::Runtime*)executor->getJavaScriptContext(); try { react_native_assert(runtime != nullptr); callback(*runtime); executor->flush(); - } catch (jsi::JSError &originalError) { + } catch (jsi::JSError& originalError) { handleJSError(*runtime, originalError, true); } }); @@ -258,13 +258,13 @@ void Instance::JSCallInvoker::setNativeToJsBridgeAndFlushCalls( } } -void Instance::JSCallInvoker::invokeSync(std::function &&work) { +void Instance::JSCallInvoker::invokeSync(std::function&& work) { // TODO: Replace JS Callinvoker with RuntimeExecutor. throw std::runtime_error( "Synchronous native -> JS calls are currently not supported."); } -void Instance::JSCallInvoker::invokeAsync(std::function &&work) { +void Instance::JSCallInvoker::invokeAsync(std::function&& work) { std::scoped_lock guard(m_mutex); /** @@ -289,10 +289,10 @@ void Instance::JSCallInvoker::invokeAsync(std::function &&work) { scheduleAsync(std::move(work)); } -void Instance::JSCallInvoker::scheduleAsync(std::function &&work) { +void Instance::JSCallInvoker::scheduleAsync(std::function&& work) { if (auto strongNativeToJsBridge = m_nativeToJsBridge.lock()) { strongNativeToJsBridge->runOnExecutorQueue( - [work = std::move(work)](JSExecutor *executor) { + [work = std::move(work)](JSExecutor* executor) { work(); executor->flush(); }); diff --git a/packages/react-native/ReactCommon/cxxreact/Instance.h b/packages/react-native/ReactCommon/cxxreact/Instance.h index ca0106de18f..db2e0a7a50c 100644 --- a/packages/react-native/ReactCommon/cxxreact/Instance.h +++ b/packages/react-native/ReactCommon/cxxreact/Instance.h @@ -57,10 +57,10 @@ class RN_EXPORT Instance { bool loadSynchronously); void loadRAMBundleFromString( std::unique_ptr script, - const std::string &sourceURL); + const std::string& sourceURL); void loadRAMBundleFromFile( - const std::string &sourcePath, - const std::string &sourceURL, + const std::string& sourcePath, + const std::string& sourceURL, bool loadSynchronously); void loadRAMBundle( std::unique_ptr bundleRegistry, @@ -71,20 +71,20 @@ class RN_EXPORT Instance { void setGlobalVariable( std::string propName, std::unique_ptr jsonValue); - void *getJavaScriptContext(); + void* getJavaScriptContext(); bool isInspectable(); bool isBatchActive(); void callJSFunction( - std::string &&module, - std::string &&method, - folly::dynamic &¶ms); - void callJSCallback(uint64_t callbackId, folly::dynamic &¶ms); + std::string&& module, + std::string&& method, + folly::dynamic&& params); + void callJSCallback(uint64_t callbackId, folly::dynamic&& params); // This method is experimental, and may be modified or removed. - void registerBundle(uint32_t bundleId, const std::string &bundlePath); + void registerBundle(uint32_t bundleId, const std::string& bundlePath); - const ModuleRegistry &getModuleRegistry() const; - ModuleRegistry &getModuleRegistry(); + const ModuleRegistry& getModuleRegistry() const; + ModuleRegistry& getModuleRegistry(); void handleMemoryPressure(int pressureLevel); @@ -133,7 +133,7 @@ class RN_EXPORT Instance { RuntimeExecutor getRuntimeExecutor(); private: - void callNativeModules(folly::dynamic &&calls, bool isEndOfBatch); + void callNativeModules(folly::dynamic&& calls, bool isEndOfBatch); void loadBundle( std::unique_ptr bundleRegistry, std::unique_ptr startupScript, @@ -158,13 +158,13 @@ class RN_EXPORT Instance { bool m_shouldBuffer = true; std::list> m_workBuffer; - void scheduleAsync(std::function &&work); + void scheduleAsync(std::function&& work); public: void setNativeToJsBridgeAndFlushCalls( std::weak_ptr nativeToJsBridge); - void invokeAsync(std::function &&work) override; - void invokeSync(std::function &&work) override; + void invokeAsync(std::function&& work) override; + void invokeSync(std::function&& work) override; }; std::shared_ptr jsCallInvoker_ = diff --git a/packages/react-native/ReactCommon/cxxreact/JSBigString.cpp b/packages/react-native/ReactCommon/cxxreact/JSBigString.cpp index ca2a41ebcc2..7ca8e18bfd8 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSBigString.cpp +++ b/packages/react-native/ReactCommon/cxxreact/JSBigString.cpp @@ -24,7 +24,7 @@ JSBigFileString::JSBigFileString(int fd, size_t size, off_t offset /*= 0*/) m_fd = dup(fd); if (m_fd == -1) { - const char *message = + const char* message = "JSBigFileString::JSBigFileString - Could not duplicate file descriptor"; LOG(ERROR) << message; throw std::runtime_error(message); @@ -50,18 +50,18 @@ JSBigFileString::JSBigFileString(int fd, size_t size, off_t offset /*= 0*/) JSBigFileString::~JSBigFileString() { if (m_data) { - munmap((void *)m_data, m_size); + munmap((void*)m_data, m_size); } close(m_fd); } -const char *JSBigFileString::c_str() const { +const char* JSBigFileString::c_str() const { if (m_size == 0) { return ""; } if (!m_data) { m_data = - (const char *)mmap(0, m_size, PROT_READ, MAP_PRIVATE, m_fd, m_mapOff); + (const char*)mmap(0, m_size, PROT_READ, MAP_PRIVATE, m_fd, m_mapOff); CHECK(m_data != MAP_FAILED) << " fd: " << m_fd << " size: " << m_size << " offset: " << m_mapOff << " error: " << std::strerror(errno); @@ -69,7 +69,7 @@ const char *JSBigFileString::c_str() const { static const size_t kMinPageSize = 4096; CHECK(!(reinterpret_cast(m_data) & (kMinPageSize - 1))) << "mmap address misaligned, likely corrupted" - << " m_data: " << (const void *)m_data; + << " m_data: " << (const void*)m_data; CHECK(m_pageOff <= m_size) << "offset impossibly large, likely corrupted" << " m_pageOff: " << m_pageOff << " m_size: " << m_size; @@ -87,7 +87,7 @@ int JSBigFileString::fd() const { } std::unique_ptr JSBigFileString::fromPath( - const std::string &sourceURL) { + const std::string& sourceURL) { int fd = ::open(sourceURL.c_str(), O_RDONLY); if (fd == -1) { diff --git a/packages/react-native/ReactCommon/cxxreact/JSBigString.h b/packages/react-native/ReactCommon/cxxreact/JSBigString.h index 79fdb666e3a..59f9545acfb 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSBigString.h +++ b/packages/react-native/ReactCommon/cxxreact/JSBigString.h @@ -31,15 +31,15 @@ class JSBigString { JSBigString() = default; // Not copyable - JSBigString(const JSBigString &) = delete; - JSBigString &operator=(const JSBigString &) = delete; + JSBigString(const JSBigString&) = delete; + JSBigString& operator=(const JSBigString&) = delete; virtual ~JSBigString() {} virtual bool isAscii() const = 0; // This needs to be a \0 terminated string - virtual const char *c_str() const = 0; + virtual const char* c_str() const = 0; // Length of the c_str without the NULL byte. virtual size_t size() const = 0; @@ -56,7 +56,7 @@ class JSBigStdString : public JSBigString { return m_isAscii; } - const char *c_str() const override { + const char* c_str() const override { return m_str.c_str(); } @@ -89,7 +89,7 @@ class RN_EXPORT JSBigBufferString : public JSBigString { return true; } - const char *c_str() const override { + const char* c_str() const override { return m_data; } @@ -97,12 +97,12 @@ class RN_EXPORT JSBigBufferString : public JSBigString { return m_size; } - char *data() { + char* data() { return m_data; } private: - char *m_data; + char* m_data; size_t m_size; }; @@ -116,20 +116,20 @@ class RN_EXPORT JSBigFileString : public JSBigString { return true; } - const char *c_str() const override; + const char* c_str() const override; size_t size() const override; int fd() const; static std::unique_ptr fromPath( - const std::string &sourceURL); + const std::string& sourceURL); private: int m_fd; // The file descriptor being mmapped size_t m_size; // The size of the mmapped region mutable off_t m_pageOff; // The offset in the mmapped region to the data. off_t m_mapOff; // The offset in the file to the mmapped region. - mutable const char *m_data; // Pointer to the mmapped region. + mutable const char* m_data; // Pointer to the mmapped region. }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/cxxreact/JSBundleType.cpp b/packages/react-native/ReactCommon/cxxreact/JSBundleType.cpp index b869ceacf29..ba8dd87aec6 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSBundleType.cpp +++ b/packages/react-native/ReactCommon/cxxreact/JSBundleType.cpp @@ -14,7 +14,7 @@ static uint32_t constexpr RAMBundleMagicNumber = 0xFB0BD1E5; // "Hermes" in ancient Greek encoded in UTF-16BE and truncated to 8 bytes. static uint64_t constexpr HermesBCBundleMagicNumber = 0x1F1903C103BC1FC6; -ScriptTag parseTypeFromHeader(const BundleHeader &header) { +ScriptTag parseTypeFromHeader(const BundleHeader& header) { switch (header.magic32.value) { case RAMBundleMagicNumber: return ScriptTag::RAMBundle; @@ -23,7 +23,7 @@ ScriptTag parseTypeFromHeader(const BundleHeader &header) { } } -const char *stringForScriptTag(const ScriptTag &tag) { +const char* stringForScriptTag(const ScriptTag& tag) { switch (tag) { case ScriptTag::String: return "String"; @@ -33,7 +33,7 @@ const char *stringForScriptTag(const ScriptTag &tag) { return ""; } -bool isHermesBytecodeBundle(const BundleHeader &header) { +bool isHermesBytecodeBundle(const BundleHeader& header) { return header.magic64 == HermesBCBundleMagicNumber; } diff --git a/packages/react-native/ReactCommon/cxxreact/JSBundleType.h b/packages/react-native/ReactCommon/cxxreact/JSBundleType.h index 945e19c58ba..c88add2cb0c 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSBundleType.h +++ b/packages/react-native/ReactCommon/cxxreact/JSBundleType.h @@ -57,17 +57,17 @@ FOLLY_PACK_POP * Takes the first 8 bytes of a bundle, and returns a tag describing the * bundle's format. */ -RN_EXPORT ScriptTag parseTypeFromHeader(const BundleHeader &header); +RN_EXPORT ScriptTag parseTypeFromHeader(const BundleHeader& header); /** * Convert an `ScriptTag` enum into a string, useful for emitting in errors * and diagnostic messages. */ -RN_EXPORT const char *stringForScriptTag(const ScriptTag &tag); +RN_EXPORT const char* stringForScriptTag(const ScriptTag& tag); /** * Check whether a given bundle is hermesc-generated bytecode */ -RN_EXPORT bool isHermesBytecodeBundle(const BundleHeader &header); +RN_EXPORT bool isHermesBytecodeBundle(const BundleHeader& header); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/cxxreact/JSExecutor.cpp b/packages/react-native/ReactCommon/cxxreact/JSExecutor.cpp index dbca822cf19..fa0cb3f1944 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSExecutor.cpp +++ b/packages/react-native/ReactCommon/cxxreact/JSExecutor.cpp @@ -17,7 +17,7 @@ namespace facebook::react { std::string JSExecutor::getSyntheticBundlePath( uint32_t bundleId, - const std::string &bundlePath) { + const std::string& bundlePath) { if (bundleId == RAMBundleRegistry::MAIN_BUNDLE_ID) { return bundlePath; } diff --git a/packages/react-native/ReactCommon/cxxreact/JSExecutor.h b/packages/react-native/ReactCommon/cxxreact/JSExecutor.h index 02dbf1928b7..0a3b4705fe4 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSExecutor.h +++ b/packages/react-native/ReactCommon/cxxreact/JSExecutor.h @@ -35,18 +35,18 @@ class ExecutorDelegate { virtual std::shared_ptr getModuleRegistry() = 0; virtual void callNativeModules( - JSExecutor &executor, - folly::dynamic &&calls, + JSExecutor& executor, + folly::dynamic&& calls, bool isEndOfBatch) = 0; virtual MethodCallResult callSerializableNativeHook( - JSExecutor &executor, + JSExecutor& executor, unsigned int moduleId, unsigned int methodId, - folly::dynamic &&args) = 0; + folly::dynamic&& args) = 0; }; using NativeExtensionsProvider = - std::function; + std::function; class JSExecutorFactory { public: @@ -81,7 +81,7 @@ class RN_EXPORT JSExecutor { */ virtual void registerBundle( uint32_t bundleId, - const std::string &bundlePath) = 0; + const std::string& bundlePath) = 0; /** * Executes BatchedBridge.callFunctionReturnFlushedQueue with the module ID, @@ -90,9 +90,9 @@ class RN_EXPORT JSExecutor { * native modules methods. */ virtual void callFunction( - const std::string &moduleId, - const std::string &methodId, - const folly::dynamic &arguments) = 0; + const std::string& moduleId, + const std::string& methodId, + const folly::dynamic& arguments) = 0; /** * Executes BatchedBridge.invokeCallbackAndReturnFlushedQueue with the cbID, @@ -102,13 +102,13 @@ class RN_EXPORT JSExecutor { */ virtual void invokeCallback( const double callbackId, - const folly::dynamic &arguments) = 0; + const folly::dynamic& arguments) = 0; virtual void setGlobalVariable( std::string propName, std::unique_ptr jsonValue) = 0; - virtual void *getJavaScriptContext() { + virtual void* getJavaScriptContext() { return nullptr; } @@ -136,7 +136,7 @@ class RN_EXPORT JSExecutor { static std::string getSyntheticBundlePath( uint32_t bundleId, - const std::string &bundlePath); + const std::string& bundlePath); static double performanceNow(); }; diff --git a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp index f1d05a06b3b..1f646bb2451 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp +++ b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.cpp @@ -16,12 +16,12 @@ namespace facebook::react { std::function(std::string)> JSIndexedRAMBundle::buildFactory() { - return [](const std::string &bundlePath) { + return [](const std::string& bundlePath) { return std::make_unique(bundlePath.c_str()); }; } -JSIndexedRAMBundle::JSIndexedRAMBundle(const char *sourcePath) { +JSIndexedRAMBundle::JSIndexedRAMBundle(const char* sourcePath) { m_bundle = std::make_unique(sourcePath, std::ifstream::binary); if (!m_bundle) { throw std::ios_base::failure(folly::to( @@ -52,7 +52,7 @@ void JSIndexedRAMBundle::init() { sizeof(header) == 12, "header size must exactly match the input file format"); - readBundle(reinterpret_cast(header), sizeof(header)); + readBundle(reinterpret_cast(header), sizeof(header)); const size_t numTableEntries = folly::Endian::little(header[1]); const size_t startupCodeSize = folly::Endian::little(header[2]); @@ -61,8 +61,7 @@ void JSIndexedRAMBundle::init() { m_baseOffset = sizeof(header) + m_table.byteLength(); // read the lookup table from the file - readBundle( - reinterpret_cast(m_table.data.get()), m_table.byteLength()); + readBundle(reinterpret_cast(m_table.data.get()), m_table.byteLength()); // read the startup code m_startupCode = std::unique_ptr( @@ -104,7 +103,7 @@ std::string JSIndexedRAMBundle::getModuleCode(const uint32_t id) const { return ret; } -void JSIndexedRAMBundle::readBundle(char *buffer, const std::streamsize bytes) +void JSIndexedRAMBundle::readBundle(char* buffer, const std::streamsize bytes) const { if (!m_bundle->read(buffer, bytes)) { if (m_bundle->rdstate() & std::ios::eofbit) { @@ -116,7 +115,7 @@ void JSIndexedRAMBundle::readBundle(char *buffer, const std::streamsize bytes) } void JSIndexedRAMBundle::readBundle( - char *buffer, + char* buffer, const std::streamsize bytes, const std::ifstream::pos_type position) const { if (!m_bundle->seekg(position)) { diff --git a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h index 8f5c548e916..59c6942c61c 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h +++ b/packages/react-native/ReactCommon/cxxreact/JSIndexedRAMBundle.h @@ -25,7 +25,7 @@ class RN_EXPORT JSIndexedRAMBundle : public JSModulesUnbundle { buildFactory(); // Throws std::runtime_error on failure. - JSIndexedRAMBundle(const char *sourceURL); + JSIndexedRAMBundle(const char* sourceURL); JSIndexedRAMBundle(std::unique_ptr script); // Throws std::runtime_error on failure. @@ -56,9 +56,9 @@ class RN_EXPORT JSIndexedRAMBundle : public JSModulesUnbundle { void init(); std::string getModuleCode(const uint32_t id) const; - void readBundle(char *buffer, const std::streamsize bytes) const; + void readBundle(char* buffer, const std::streamsize bytes) const; void readBundle( - char *buffer, + char* buffer, const std::streamsize bytes, const std::istream::pos_type position) const; diff --git a/packages/react-native/ReactCommon/cxxreact/JSModulesUnbundle.h b/packages/react-native/ReactCommon/cxxreact/JSModulesUnbundle.h index 85bf46a7714..02affba2503 100644 --- a/packages/react-native/ReactCommon/cxxreact/JSModulesUnbundle.h +++ b/packages/react-native/ReactCommon/cxxreact/JSModulesUnbundle.h @@ -40,7 +40,7 @@ class JSModulesUnbundle { virtual Module getModule(uint32_t moduleId) const = 0; private: - JSModulesUnbundle(const JSModulesUnbundle &) = delete; + JSModulesUnbundle(const JSModulesUnbundle&) = delete; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers-inl.h b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers-inl.h index 22bd10a4d60..2efb9943649 100644 --- a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers-inl.h +++ b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers-inl.h @@ -14,13 +14,13 @@ namespace xplat { namespace detail { template -R jsArg1(const folly::dynamic &arg, M asFoo, const T &...desc) { +R jsArg1(const folly::dynamic& arg, M asFoo, const T&... desc) { try { return (arg.*asFoo)(); - } catch (const folly::TypeError &ex) { + } catch (const folly::TypeError& ex) { throw JsArgumentException(folly::to( "Error converting javascript arg ", desc..., " to C++: ", ex.what())); - } catch (const std::range_error &ex) { + } catch (const std::range_error& ex) { throw JsArgumentException(folly::to( "Could not convert argument ", desc..., @@ -33,26 +33,26 @@ R jsArg1(const folly::dynamic &arg, M asFoo, const T &...desc) { template R jsArg( - const folly::dynamic &arg, + const folly::dynamic& arg, R (folly::dynamic::*asFoo)() const, - const T &...desc) { + const T&... desc) { return detail::jsArg1(arg, asFoo, desc...); } template R jsArg( - const folly::dynamic &arg, - R (folly::dynamic::*asFoo)() const &, - const T &...desc) { + const folly::dynamic& arg, + R (folly::dynamic::*asFoo)() const&, + const T&... desc) { return detail::jsArg1(arg, asFoo, desc...); } template // NOLINTNEXTLINE (T62192316) -typename detail::is_dynamic::type &jsArgAsDynamic(T &&args, size_t n) { +typename detail::is_dynamic::type& jsArgAsDynamic(T&& args, size_t n) { try { return args[n]; - } catch (const std::out_of_range &ex) { + } catch (const std::out_of_range& ex) { // Use 1-base counting for argument description. throw JsArgumentException(folly::to( "JavaScript provided ", @@ -66,16 +66,16 @@ typename detail::is_dynamic::type &jsArgAsDynamic(T &&args, size_t n) { template R jsArgN( - const folly::dynamic &args, + const folly::dynamic& args, size_t n, R (folly::dynamic::*asFoo)() const) { return jsArg(jsArgAsDynamic(args, n), asFoo, n); } template R jsArgN( - const folly::dynamic &args, + const folly::dynamic& args, size_t n, - R (folly::dynamic::*asFoo)() const &) { + R (folly::dynamic::*asFoo)() const&) { return jsArg(jsArgAsDynamic(args, n), asFoo, n); } @@ -84,12 +84,12 @@ namespace detail { // This is a helper for jsArgAsArray and jsArgAsObject. template -typename detail::is_dynamic::type &jsArgAsType( - T &&args, +typename detail::is_dynamic::type& jsArgAsType( + T&& args, size_t n, - const char *required, + const char* required, bool (folly::dynamic::*isFoo)() const) { - T &ret = jsArgAsDynamic(args, n); + T& ret = jsArgAsDynamic(args, n); if ((ret.*isFoo)()) { return ret; } @@ -107,12 +107,12 @@ typename detail::is_dynamic::type &jsArgAsType( } // end namespace detail template -typename detail::is_dynamic::type &jsArgAsArray(T &&args, size_t n) { +typename detail::is_dynamic::type& jsArgAsArray(T&& args, size_t n) { return detail::jsArgAsType(args, n, "Array", &folly::dynamic::isArray); } template -typename detail::is_dynamic::type &jsArgAsObject(T &&args, size_t n) { +typename detail::is_dynamic::type& jsArgAsObject(T&& args, size_t n) { return detail::jsArgAsType(args, n, "Object", &folly::dynamic::isObject); } diff --git a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h index 9c6973e0da9..14e357c030c 100644 --- a/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h +++ b/packages/react-native/ReactCommon/cxxreact/JsArgumentHelpers.h @@ -26,7 +26,7 @@ namespace xplat { class JsArgumentException : public std::logic_error { public: - JsArgumentException(const std::string &msg) : std::logic_error(msg) {} + JsArgumentException(const std::string& msg) : std::logic_error(msg) {} }; // This extracts a single argument by calling the given method pointer on it. @@ -37,14 +37,14 @@ class JsArgumentException : public std::logic_error { template R jsArg( - const folly::dynamic &arg, + const folly::dynamic& arg, R (folly::dynamic::*asFoo)() const, - const T &...desc); + const T&... desc); template R jsArg( - const folly::dynamic &arg, - R (folly::dynamic::*asFoo)() const &, - const T &...desc); + const folly::dynamic& arg, + R (folly::dynamic::*asFoo)() const&, + const T&... desc); // This is like jsArg, but a operates on a dynamic representing an array of // arguments. The argument n is used both to index the array and build the @@ -53,14 +53,14 @@ R jsArg( template R jsArgN( - const folly::dynamic &args, + const folly::dynamic& args, size_t n, R (folly::dynamic::*asFoo)() const); template R jsArgN( - const folly::dynamic &args, + const folly::dynamic& args, size_t n, - R (folly::dynamic::*asFoo)() const &); + R (folly::dynamic::*asFoo)() const&); namespace detail { @@ -81,41 +81,41 @@ struct is_dynamic { // Extract the n'th arg from the given dynamic, as a dynamic. Throws a // JsArgumentException if there is no n'th arg in the input. template -typename detail::is_dynamic::type &jsArgAsDynamic(T &&args, size_t n); +typename detail::is_dynamic::type& jsArgAsDynamic(T&& args, size_t n); // Extract the n'th arg from the given dynamic, as a dynamic Array. Throws a // JsArgumentException if there is no n'th arg in the input, or it is not an // Array. template -typename detail::is_dynamic::type &jsArgAsArray(T &&args, size_t n); +typename detail::is_dynamic::type& jsArgAsArray(T&& args, size_t n); // Extract the n'th arg from the given dynamic, as a dynamic Object. Throws a // JsArgumentException if there is no n'th arg in the input, or it is not an // Object. template -typename detail::is_dynamic::type &jsArgAsObject(T &&args, size_t n); +typename detail::is_dynamic::type& jsArgAsObject(T&& args, size_t n); // Extract the n'th arg from the given dynamic, as a bool. Throws a // JsArgumentException if this fails for some reason. -inline bool jsArgAsBool(const folly::dynamic &args, size_t n) { +inline bool jsArgAsBool(const folly::dynamic& args, size_t n) { return jsArgN(args, n, &folly::dynamic::asBool); } // Extract the n'th arg from the given dynamic, as an integer. Throws a // JsArgumentException if this fails for some reason. -inline int64_t jsArgAsInt(const folly::dynamic &args, size_t n) { +inline int64_t jsArgAsInt(const folly::dynamic& args, size_t n) { return jsArgN(args, n, &folly::dynamic::asInt); } // Extract the n'th arg from the given dynamic, as a double. Throws a // JsArgumentException if this fails for some reason. -inline double jsArgAsDouble(const folly::dynamic &args, size_t n) { +inline double jsArgAsDouble(const folly::dynamic& args, size_t n) { return jsArgN(args, n, &folly::dynamic::asDouble); } // Extract the n'th arg from the given dynamic, as a string. Throws a // JsArgumentException if this fails for some reason. -inline std::string jsArgAsString(const folly::dynamic &args, size_t n) { +inline std::string jsArgAsString(const folly::dynamic& args, size_t n) { return jsArgN(args, n, &folly::dynamic::asString); } diff --git a/packages/react-native/ReactCommon/cxxreact/MessageQueueThread.h b/packages/react-native/ReactCommon/cxxreact/MessageQueueThread.h index b31f2168731..f8946c2f9ee 100644 --- a/packages/react-native/ReactCommon/cxxreact/MessageQueueThread.h +++ b/packages/react-native/ReactCommon/cxxreact/MessageQueueThread.h @@ -16,10 +16,10 @@ namespace facebook::react { class MessageQueueThread { public: virtual ~MessageQueueThread() {} - virtual void runOnQueue(std::function &&) = 0; + virtual void runOnQueue(std::function&&) = 0; // runOnQueueSync and quitSynchronous are dangerous. They should only be // used for initialization and cleanup. - virtual void runOnQueueSync(std::function &&) = 0; + virtual void runOnQueueSync(std::function&&) = 0; // Once quitSynchronous() returns, no further work should run on the queue. virtual void quitSynchronous() = 0; }; diff --git a/packages/react-native/ReactCommon/cxxreact/MethodCall.cpp b/packages/react-native/ReactCommon/cxxreact/MethodCall.cpp index 463a31ee510..bc354a6d6ea 100644 --- a/packages/react-native/ReactCommon/cxxreact/MethodCall.cpp +++ b/packages/react-native/ReactCommon/cxxreact/MethodCall.cpp @@ -17,9 +17,9 @@ namespace facebook::react { #define REQUEST_PARAMS 2 #define REQUEST_CALLID 3 -static const char *errorPrefix = "Malformed calls from JS: "; +static const char* errorPrefix = "Malformed calls from JS: "; -std::vector parseMethodCalls(folly::dynamic &&jsonData) { +std::vector parseMethodCalls(folly::dynamic&& jsonData) { if (jsonData.isNull()) { return {}; } @@ -34,9 +34,9 @@ std::vector parseMethodCalls(folly::dynamic &&jsonData) { folly::to(errorPrefix, "size == ", jsonData.size())); } - auto &moduleIds = jsonData[REQUEST_MODULE_IDS]; - auto &methodIds = jsonData[REQUEST_METHOD_IDS]; - auto ¶ms = jsonData[REQUEST_PARAMS]; + auto& moduleIds = jsonData[REQUEST_MODULE_IDS]; + auto& methodIds = jsonData[REQUEST_METHOD_IDS]; + auto& params = jsonData[REQUEST_PARAMS]; int callId = -1; if (!moduleIds.isArray() || !methodIds.isArray() || !params.isArray()) { diff --git a/packages/react-native/ReactCommon/cxxreact/MethodCall.h b/packages/react-native/ReactCommon/cxxreact/MethodCall.h index 4394bcb8247..6869aabc08f 100644 --- a/packages/react-native/ReactCommon/cxxreact/MethodCall.h +++ b/packages/react-native/ReactCommon/cxxreact/MethodCall.h @@ -21,7 +21,7 @@ struct MethodCall { folly::dynamic arguments; int callId; - MethodCall(int mod, int meth, folly::dynamic &&args, int cid) + MethodCall(int mod, int meth, folly::dynamic&& args, int cid) : moduleId(mod), methodId(meth), arguments(std::move(args)), @@ -29,6 +29,6 @@ struct MethodCall { }; /// \throws std::invalid_argument -std::vector parseMethodCalls(folly::dynamic &&calls); +std::vector parseMethodCalls(folly::dynamic&& calls); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.cpp b/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.cpp index 75f6a350c36..f6e0d118048 100644 --- a/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.cpp +++ b/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.cpp @@ -91,7 +91,7 @@ std::vector ModuleRegistry::moduleNames() { return names; } -std::optional ModuleRegistry::getConfig(const std::string &name) { +std::optional ModuleRegistry::getConfig(const std::string& name) { SystraceSection s("ModuleRegistry::getConfig", "module", name); // Initialize modulesByName_ @@ -137,7 +137,7 @@ std::optional ModuleRegistry::getConfig(const std::string &name) { size_t index = it->second; CHECK(index < modules_.size()); - NativeModule *module = modules_[index].get(); + NativeModule* module = modules_[index].get(); // string name, object constants, array methodNames (methodId is index), // [array promiseMethodIds], [array syncMethodIds] @@ -162,7 +162,7 @@ std::optional ModuleRegistry::getConfig(const std::string &name) { folly::dynamic promiseMethodIds = folly::dynamic::array; folly::dynamic syncMethodIds = folly::dynamic::array; - for (auto &descriptor : methods) { + for (auto& descriptor : methods) { // TODO: #10487027 compare tags instead of doing string comparison? methodNames.push_back(std::move(descriptor.name)); if (descriptor.type == "promise") { @@ -214,7 +214,7 @@ std::string ModuleRegistry::getModuleSyncMethodName( void ModuleRegistry::callNativeMethod( unsigned int moduleId, unsigned int methodId, - folly::dynamic &¶ms, + folly::dynamic&& params, int callId) { if (moduleId >= modules_.size()) { throw std::runtime_error(folly::to( @@ -226,7 +226,7 @@ void ModuleRegistry::callNativeMethod( MethodCallResult ModuleRegistry::callSerializableNativeHook( unsigned int moduleId, unsigned int methodId, - folly::dynamic &¶ms) { + folly::dynamic&& params) { if (moduleId >= modules_.size()) { throw std::runtime_error(folly::to( "moduleId ", moduleId, "out of range [0..", modules_.size(), ")")); diff --git a/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.h b/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.h index a9b5555d1f5..f3d5c76d780 100644 --- a/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.h +++ b/packages/react-native/ReactCommon/cxxreact/ModuleRegistry.h @@ -37,7 +37,7 @@ class RN_EXPORT ModuleRegistry { // notifyCatalystInstanceInitialized: this is really only used by view-related // code notifyCatalystInstanceDestroy: use RAII instead - using ModuleNotFoundCallback = std::function; + using ModuleNotFoundCallback = std::function; ModuleRegistry( std::vector> modules, @@ -46,17 +46,17 @@ class RN_EXPORT ModuleRegistry { std::vector moduleNames(); - std::optional getConfig(const std::string &name); + std::optional getConfig(const std::string& name); void callNativeMethod( unsigned int moduleId, unsigned int methodId, - folly::dynamic &¶ms, + folly::dynamic&& params, int callId); MethodCallResult callSerializableNativeHook( unsigned int moduleId, unsigned int methodId, - folly::dynamic &&args); + folly::dynamic&& args); std::string getModuleName(unsigned int moduleId); std::string getModuleSyncMethodName( diff --git a/packages/react-native/ReactCommon/cxxreact/NativeModule.h b/packages/react-native/ReactCommon/cxxreact/NativeModule.h index 211eefeb333..aa09befa183 100644 --- a/packages/react-native/ReactCommon/cxxreact/NativeModule.h +++ b/packages/react-native/ReactCommon/cxxreact/NativeModule.h @@ -34,10 +34,10 @@ class NativeModule { virtual std::vector getMethods() = 0; virtual folly::dynamic getConstants() = 0; virtual void - invoke(unsigned int reactMethodId, folly::dynamic &¶ms, int callId) = 0; + invoke(unsigned int reactMethodId, folly::dynamic&& params, int callId) = 0; virtual MethodCallResult callSerializableNativeHook( unsigned int reactMethodId, - folly::dynamic &&args) = 0; + folly::dynamic&& args) = 0; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.cpp b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.cpp index 319c162a6e6..d7c11b9b015 100644 --- a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.cpp +++ b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.cpp @@ -50,8 +50,8 @@ class JsToNativeBridge : public react::ExecutorDelegate { } void callNativeModules( - [[maybe_unused]] JSExecutor &executor, - folly::dynamic &&calls, + [[maybe_unused]] JSExecutor& executor, + folly::dynamic&& calls, bool isEndOfBatch) override { CHECK(m_registry || calls.empty()) << "native module calls cannot be completed with no native modules"; @@ -65,7 +65,7 @@ class JsToNativeBridge : public react::ExecutorDelegate { // An exception anywhere in here stops processing of the batch. This // was the behavior of the Android bridge, and since exception handling // terminates the whole bridge, there's not much point in continuing. - for (auto &call : methodCalls) { + for (auto& call : methodCalls) { m_registry->callNativeMethod( call.moduleId, call.methodId, std::move(call.arguments), call.callId); } @@ -83,10 +83,10 @@ class JsToNativeBridge : public react::ExecutorDelegate { } MethodCallResult callSerializableNativeHook( - [[maybe_unused]] JSExecutor &executor, + [[maybe_unused]] JSExecutor& executor, unsigned int moduleId, unsigned int methodId, - folly::dynamic &&args) override { + folly::dynamic&& args) override { return m_registry->callSerializableNativeHook( moduleId, methodId, std::move(args)); } @@ -105,7 +105,7 @@ class JsToNativeBridge : public react::ExecutorDelegate { }; NativeToJsBridge::NativeToJsBridge( - JSExecutorFactory *jsExecutorFactory, + JSExecutorFactory* jsExecutorFactory, std::shared_ptr registry, std::shared_ptr jsQueue, std::shared_ptr callback) @@ -123,7 +123,7 @@ NativeToJsBridge::~NativeToJsBridge() { void NativeToJsBridge::initializeRuntime() { runOnExecutorQueue( - [](JSExecutor *executor) mutable { executor->initializeRuntime(); }); + [](JSExecutor* executor) mutable { executor->initializeRuntime(); }); } void NativeToJsBridge::loadBundle( @@ -135,7 +135,7 @@ void NativeToJsBridge::loadBundle( bundleRegistryWrap = folly::makeMoveWrapper(std::move(bundleRegistry)), startupScript = folly::makeMoveWrapper(std::move(startupScript)), startupScriptSourceURL = - std::move(startupScriptSourceURL)](JSExecutor *executor) mutable { + std::move(startupScriptSourceURL)](JSExecutor* executor) mutable { auto bundleRegistry = bundleRegistryWrap.move(); if (bundleRegistry) { executor->setBundleRegistry(std::move(bundleRegistry)); @@ -167,9 +167,9 @@ void NativeToJsBridge::loadBundleSync( } void NativeToJsBridge::callFunction( - std::string &&module, - std::string &&method, - folly::dynamic &&arguments) { + std::string&& module, + std::string&& method, + folly::dynamic&& arguments) { int systraceCookie = -1; #ifdef WITH_FBSYSTRACE systraceCookie = m_systraceCookie++; @@ -181,7 +181,7 @@ void NativeToJsBridge::callFunction( module = std::move(module), method = std::move(method), arguments = std::move(arguments), - systraceCookie](JSExecutor *executor) { + systraceCookie](JSExecutor* executor) { if (m_applicationScriptHasFailure) { LOG(ERROR) << "Attempting to call JS function on a bad application bundle: " @@ -208,7 +208,7 @@ void NativeToJsBridge::callFunction( void NativeToJsBridge::invokeCallback( double callbackId, - folly::dynamic &&arguments) { + folly::dynamic&& arguments) { int systraceCookie = -1; #ifdef WITH_FBSYSTRACE systraceCookie = m_systraceCookie++; @@ -218,7 +218,7 @@ void NativeToJsBridge::invokeCallback( runOnExecutorQueue( [this, callbackId, arguments = std::move(arguments), systraceCookie]( - JSExecutor *executor) { + JSExecutor* executor) { if (m_applicationScriptHasFailure) { LOG(ERROR) << "Attempting to call JS callback on a bad application bundle: " @@ -239,8 +239,8 @@ void NativeToJsBridge::invokeCallback( void NativeToJsBridge::registerBundle( uint32_t bundleId, - const std::string &bundlePath) { - runOnExecutorQueue([bundleId, bundlePath](JSExecutor *executor) { + const std::string& bundlePath) { + runOnExecutorQueue([bundleId, bundlePath](JSExecutor* executor) { executor->registerBundle(bundleId, bundlePath); }); } @@ -250,12 +250,12 @@ void NativeToJsBridge::setGlobalVariable( std::unique_ptr jsonValue) { runOnExecutorQueue([propName = std::move(propName), jsonValue = folly::makeMoveWrapper(std::move(jsonValue))]( - JSExecutor *executor) mutable { + JSExecutor* executor) mutable { executor->setGlobalVariable(propName, jsonValue.move()); }); } -void *NativeToJsBridge::getJavaScriptContext() { +void* NativeToJsBridge::getJavaScriptContext() { // TODO(cjhopman): this seems unsafe unless we require that it is only called // on the main js queue. return m_executor->getJavaScriptContext(); @@ -270,7 +270,7 @@ bool NativeToJsBridge::isBatchActive() { } void NativeToJsBridge::handleMemoryPressure(int pressureLevel) { - runOnExecutorQueue([=](JSExecutor *executor) { + runOnExecutorQueue([=](JSExecutor* executor) { executor->handleMemoryPressure(pressureLevel); }); } @@ -288,7 +288,7 @@ void NativeToJsBridge::destroy() { } void NativeToJsBridge::runOnExecutorQueue( - std::function task) { + std::function task) { if (*m_destroyed) { return; } @@ -325,15 +325,15 @@ NativeToJsBridge::getDecoratedNativeMethodCallInvoker( m_nativeInvoker(std::move(nativeInvoker)) {} void invokeAsync( - const std::string &methodName, - std::function &&func) override { + const std::string& methodName, + std::function&& func) override { if (auto strongJsToNativeBridge = m_jsToNativeBridge.lock()) { strongJsToNativeBridge->recordTurboModuleAsyncMethodCall(); } m_nativeInvoker->invokeAsync(methodName, std::move(func)); } - void invokeSync(const std::string &methodName, std::function &&func) + void invokeSync(const std::string& methodName, std::function&& func) override { m_nativeInvoker->invokeSync(methodName, std::move(func)); } diff --git a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h index 4d29fdd661f..991e34db251 100644 --- a/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h +++ b/packages/react-native/ReactCommon/cxxreact/NativeToJsBridge.h @@ -43,7 +43,7 @@ class NativeToJsBridge { * This must be called on the main JS thread. */ NativeToJsBridge( - JSExecutorFactory *jsExecutorFactory, + JSExecutorFactory* jsExecutorFactory, std::shared_ptr registry, std::shared_ptr jsQueue, std::shared_ptr callback); @@ -54,14 +54,14 @@ class NativeToJsBridge { * arguments in JS. */ void callFunction( - std::string &&module, - std::string &&method, - folly::dynamic &&args); + std::string&& module, + std::string&& method, + folly::dynamic&& args); /** * Invokes a callback with the cbID, and optional additional arguments in JS. */ - void invokeCallback(double callbackId, folly::dynamic &&args); + void invokeCallback(double callbackId, folly::dynamic&& args); /** * Sets global variables in the JS Context. @@ -82,11 +82,11 @@ class NativeToJsBridge { std::unique_ptr startupCode, std::string sourceURL); - void registerBundle(uint32_t bundleId, const std::string &bundlePath); + void registerBundle(uint32_t bundleId, const std::string& bundlePath); void setGlobalVariable( std::string propName, std::unique_ptr jsonValue); - void *getJavaScriptContext(); + void* getJavaScriptContext(); bool isInspectable(); bool isBatchActive(); @@ -97,7 +97,7 @@ class NativeToJsBridge { */ void destroy(); - void runOnExecutorQueue(std::function task); + void runOnExecutorQueue(std::function task); /** * NativeMethodCallInvoker is used by TurboModules to schedule work on the diff --git a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp index c90860dbeeb..99447e1a0bd 100644 --- a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp +++ b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.cpp @@ -72,7 +72,7 @@ JSModulesUnbundle::Module RAMBundleRegistry::getModule( }; } -JSModulesUnbundle *RAMBundleRegistry::getBundle(uint32_t bundleId) const { +JSModulesUnbundle* RAMBundleRegistry::getBundle(uint32_t bundleId) const { return m_bundles.at(bundleId).get(); } diff --git a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h index db6931ea2d2..9defcc13bde 100644 --- a/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h +++ b/packages/react-native/ReactCommon/cxxreact/RAMBundleRegistry.h @@ -36,15 +36,15 @@ class RN_EXPORT RAMBundleRegistry { std::function(std::string)> factory = nullptr); - RAMBundleRegistry(RAMBundleRegistry &&) = default; - RAMBundleRegistry &operator=(RAMBundleRegistry &&) = default; + RAMBundleRegistry(RAMBundleRegistry&&) = default; + RAMBundleRegistry& operator=(RAMBundleRegistry&&) = default; void registerBundle(uint32_t bundleId, std::string bundlePath); JSModulesUnbundle::Module getModule(uint32_t bundleId, uint32_t moduleId); virtual ~RAMBundleRegistry(){}; private: - JSModulesUnbundle *getBundle(uint32_t bundleId) const; + JSModulesUnbundle* getBundle(uint32_t bundleId) const; std::function(std::string)> m_factory; std::unordered_map m_bundlePaths; diff --git a/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp b/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp index 5ea9011ea7d..e9059dac713 100644 --- a/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp +++ b/packages/react-native/ReactCommon/cxxreact/ReactMarker.cpp @@ -27,7 +27,7 @@ void logMarker(const ReactMarkerId markerId) { logTaggedMarker(markerId, nullptr); } -void logTaggedMarker(const ReactMarkerId markerId, const char *tag) { +void logTaggedMarker(const ReactMarkerId markerId, const char* tag) { logTaggedMarkerImpl(markerId, tag); } @@ -35,7 +35,7 @@ void logMarkerBridgeless(const ReactMarkerId markerId) { logTaggedMarkerBridgeless(markerId, nullptr); } -void logTaggedMarkerBridgeless(const ReactMarkerId markerId, const char *tag) { +void logTaggedMarkerBridgeless(const ReactMarkerId markerId, const char* tag) { logTaggedMarkerBridgelessImpl(markerId, tag); } @@ -43,7 +43,7 @@ void logMarkerDone(const ReactMarkerId markerId, double markerTime) { StartupLogger::getInstance().logStartupEvent(markerId, markerTime); } -StartupLogger &StartupLogger::getInstance() { +StartupLogger& StartupLogger::getInstance() { static StartupLogger instance; return instance; } diff --git a/packages/react-native/ReactCommon/cxxreact/ReactMarker.h b/packages/react-native/ReactCommon/cxxreact/ReactMarker.h index c10769f7608..8d3a532e2c4 100644 --- a/packages/react-native/ReactCommon/cxxreact/ReactMarker.h +++ b/packages/react-native/ReactCommon/cxxreact/ReactMarker.h @@ -38,13 +38,13 @@ enum ReactMarkerId { #ifdef __APPLE__ using LogTaggedMarker = - std::function; // Bridge only + std::function; // Bridge only using LogTaggedMarkerBridgeless = - std::function; + std::function; #else typedef void ( - *LogTaggedMarker)(const ReactMarkerId, const char *tag); // Bridge only -typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char *tag); + *LogTaggedMarker)(const ReactMarkerId, const char* tag); // Bridge only +typedef void (*LogTaggedMarkerBridgeless)(const ReactMarkerId, const char* tag); #endif #ifndef RN_EXPORT @@ -57,21 +57,21 @@ extern RN_EXPORT LogTaggedMarker logTaggedMarkerBridgelessImpl; extern RN_EXPORT void logMarker(const ReactMarkerId markerId); // Bridge only extern RN_EXPORT void logTaggedMarker( const ReactMarkerId markerId, - const char *tag); // Bridge only + const char* tag); // Bridge only extern RN_EXPORT void logMarkerBridgeless(const ReactMarkerId markerId); extern RN_EXPORT void logTaggedMarkerBridgeless( const ReactMarkerId markerId, - const char *tag); + const char* tag); struct ReactMarkerEvent { const ReactMarkerId markerId; - const char *tag; + const char* tag; double time; }; class RN_EXPORT StartupLogger { public: - static StartupLogger &getInstance(); + static StartupLogger& getInstance(); void logStartupEvent(const ReactMarkerId markerName, double markerTime); double getAppStartupStartTime(); @@ -83,8 +83,8 @@ class RN_EXPORT StartupLogger { private: StartupLogger() = default; - StartupLogger(const StartupLogger &) = delete; - StartupLogger &operator=(const StartupLogger &) = delete; + StartupLogger(const StartupLogger&) = delete; + StartupLogger& operator=(const StartupLogger&) = delete; double appStartupStartTime = std::nan(""); double appStartupEndTime = std::nan(""); diff --git a/packages/react-native/ReactCommon/cxxreact/RecoverableError.h b/packages/react-native/ReactCommon/cxxreact/RecoverableError.h index 3f01dd561a8..bf3907b9e52 100644 --- a/packages/react-native/ReactCommon/cxxreact/RecoverableError.h +++ b/packages/react-native/ReactCommon/cxxreact/RecoverableError.h @@ -19,10 +19,10 @@ namespace facebook::react { * An exception that it is expected we should be able to recover from. */ struct RecoverableError : public std::exception { - explicit RecoverableError(const std::string &what_) + explicit RecoverableError(const std::string& what_) : m_what{"facebook::react::Recoverable: " + what_} {} - virtual const char *what() const noexcept override { + virtual const char* what() const noexcept override { return m_what.c_str(); } @@ -36,7 +36,7 @@ struct RecoverableError : public std::exception { inline static void runRethrowingAsRecoverable(std::function act) { try { act(); - } catch (const E &err) { + } catch (const E& err) { throw RecoverableError(err.what()); } } diff --git a/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.cpp b/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.cpp index 2474be8ad68..a739bc84007 100644 --- a/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.cpp +++ b/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.cpp @@ -28,11 +28,11 @@ double Sample::add(double a, double b) { return a + b; } -std::string Sample::concat(const std::string &a, const std::string &b) { +std::string Sample::concat(const std::string& a, const std::string& b) { return a + b; } -std::string Sample::repeat(int count, const std::string &str) { +std::string Sample::repeat(int count, const std::string& str) { std::string ret; for (int i = 0; i < count; i++) { ret += str; @@ -155,7 +155,7 @@ auto SampleCxxModule::getMethods() -> std::vector { void SampleCxxModule::save(folly::dynamic args) { std::map m; - for (const auto &p : jsArgN(args, 0, &dynamic::items)) { + for (const auto& p : jsArgN(args, 0, &dynamic::items)) { m.emplace( jsArg(p.first, &dynamic::asString, "map key"), jsArg(p.second, &dynamic::asString, "map value")); @@ -165,7 +165,7 @@ void SampleCxxModule::save(folly::dynamic args) { void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) { dynamic d = dynamic::object; - for (const auto &p : sample_->load()) { + for (const auto& p : sample_->load()) { d.insert(p.first, p.second); } cb({d}); @@ -176,7 +176,7 @@ void SampleCxxModule::load([[maybe_unused]] folly::dynamic args, Callback cb) { } // namespace facebook // By convention, the function name should be the same as the class name. -facebook::xplat::module::CxxModule *SampleCxxModule() { +facebook::xplat::module::CxxModule* SampleCxxModule() { return new facebook::xplat::samples::SampleCxxModule( std::make_unique()); } diff --git a/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.h b/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.h index 58452827501..155f5842dd7 100644 --- a/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.h +++ b/packages/react-native/ReactCommon/cxxreact/SampleCxxModule.h @@ -23,8 +23,8 @@ class Sample { public: std::string hello(); double add(double a, double b); - std::string concat(const std::string &a, const std::string &b); - std::string repeat(int count, const std::string &str); + std::string concat(const std::string& a, const std::string& b); + std::string repeat(int count, const std::string& str); void save(std::map dict); std::map load(); void call_later(int msec, std::function f); @@ -56,4 +56,4 @@ class SampleCxxModule : public module::CxxModule { } // namespace xplat } // namespace facebook -extern "C" facebook::xplat::module::CxxModule *SampleCxxModule(); +extern "C" facebook::xplat::module::CxxModule* SampleCxxModule(); diff --git a/packages/react-native/ReactCommon/cxxreact/SystraceSection.h b/packages/react-native/ReactCommon/cxxreact/SystraceSection.h index f1579db8fc4..1208e3df6e5 100644 --- a/packages/react-native/ReactCommon/cxxreact/SystraceSection.h +++ b/packages/react-native/ReactCommon/cxxreact/SystraceSection.h @@ -37,8 +37,8 @@ struct ConcreteSystraceSection { public: template explicit ConcreteSystraceSection( - const char *name, - ConvertsToStringPiece &&...args) + const char* name, + ConvertsToStringPiece&&... args) : m_section(TRACE_TAG_REACT_CXX_BRIDGE, name, args...) {} private: @@ -50,8 +50,8 @@ struct DummySystraceSection { public: template explicit DummySystraceSection( - __unused const char *name, - __unused ConvertsToStringPiece &&...args) {} + __unused const char* name, + __unused ConvertsToStringPiece&&... args) {} }; using SystraceSection = DummySystraceSection; #endif diff --git a/packages/react-native/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp b/packages/react-native/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp index 004859cce72..622ac708beb 100644 --- a/packages/react-native/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp +++ b/packages/react-native/ReactCommon/cxxreact/tests/RecoverableErrorTest.cpp @@ -19,7 +19,7 @@ TEST(RecoverableError, RunRethrowingAsRecoverableRecoverTest) { RecoverableError::runRethrowingAsRecoverable( []() { throw std::runtime_error("catch me"); }); FAIL() << "Unthrown exception"; - } catch (const RecoverableError &err) { + } catch (const RecoverableError& err) { ASSERT_STREQ(err.what(), "facebook::react::Recoverable: catch me"); } catch (...) { FAIL() << "Uncaught exception"; @@ -31,9 +31,9 @@ TEST(RecoverableError, RunRethrowingAsRecoverableFallthroughTest) { RecoverableError::runRethrowingAsRecoverable( []() { throw std::logic_error("catch me"); }); FAIL() << "Unthrown exception"; - } catch (const RecoverableError &err) { + } catch (const RecoverableError& err) { FAIL() << "Recovered exception that should have fallen through"; - } catch (const std::exception &err) { + } catch (const std::exception& err) { ASSERT_STREQ(err.what(), "catch me"); } } diff --git a/packages/react-native/ReactCommon/cxxreact/tests/jsarg_helpers.cpp b/packages/react-native/ReactCommon/cxxreact/tests/jsarg_helpers.cpp index 82a99a05fa0..6deaf64cd7a 100644 --- a/packages/react-native/ReactCommon/cxxreact/tests/jsarg_helpers.cpp +++ b/packages/react-native/ReactCommon/cxxreact/tests/jsarg_helpers.cpp @@ -20,7 +20,7 @@ using dynamic = folly::dynamic; try { \ statement; \ FAIL() << "Expected JsArgumentException(" << (exstr) << ") not thrown"; \ - } catch (const JsArgumentException &ex) { \ + } catch (const JsArgumentException& ex) { \ EXPECT_EQ(ex.what(), std::string(exstr)); \ } \ } while (0) // let any other exception escape, gtest will deal. @@ -45,8 +45,8 @@ TEST(JsArgumentHelpersTest, args) { EXPECT_EQ(jsArgAsObject(args, 5), anObject); // const args - const folly::dynamic &cargs = args; - const folly::dynamic &a4 = jsArgAsArray(cargs, 4); + const folly::dynamic& cargs = args; + const folly::dynamic& a4 = jsArgAsArray(cargs, 4); EXPECT_EQ(a4, anArray); EXPECT_EQ(jsArgAsObject(cargs, 5), anObject); @@ -85,7 +85,7 @@ TEST(JsArgumentHelpersTest, args) { jsArgAsInt(args, 3); FAIL() << "Expected JsArgumentException(" << exhead << "..." << extail << ") not thrown"; - } catch (const JsArgumentException &ex) { + } catch (const JsArgumentException& ex) { const std::string exwhat = ex.what(); EXPECT_GT(exwhat.size(), exhead.size()); diff --git a/packages/react-native/ReactCommon/cxxreact/tests/jsbigstring.cpp b/packages/react-native/ReactCommon/cxxreact/tests/jsbigstring.cpp index 7ffa42a47f9..7d43418aba3 100644 --- a/packages/react-native/ReactCommon/cxxreact/tests/jsbigstring.cpp +++ b/packages/react-native/ReactCommon/cxxreact/tests/jsbigstring.cpp @@ -16,7 +16,7 @@ using namespace facebook::react; namespace { int tempFileFromString(std::string contents) { - const char *tmpDir = getenv("TMPDIR"); + const char* tmpDir = getenv("TMPDIR"); if (tmpDir == nullptr) tmpDir = "/tmp"; std::string tmp{tmpDir}; diff --git a/packages/react-native/ReactCommon/cxxreact/tests/main.cpp b/packages/react-native/ReactCommon/cxxreact/tests/main.cpp index d0d05052717..7e5762fc7fe 100644 --- a/packages/react-native/ReactCommon/cxxreact/tests/main.cpp +++ b/packages/react-native/ReactCommon/cxxreact/tests/main.cpp @@ -8,7 +8,7 @@ #include #include -int main(int argc, char **argv) { +int main(int argc, char** argv) { ::testing::InitGoogleTest(&argc, argv); folly::init(&argc, &argv); return RUN_ALL_TESTS(); diff --git a/packages/react-native/ReactCommon/cxxreact/tests/methodcall.cpp b/packages/react-native/ReactCommon/cxxreact/tests/methodcall.cpp index ff5bcec8ab0..f124a2430c7 100644 --- a/packages/react-native/ReactCommon/cxxreact/tests/methodcall.cpp +++ b/packages/react-native/ReactCommon/cxxreact/tests/methodcall.cpp @@ -31,21 +31,21 @@ TEST(parseMethodCalls, InvalidReturnFormat) { auto input = dynamic::object("foo", 1); parseMethodCalls(std::move(input)); ADD_FAILURE(); - } catch (const std::invalid_argument &) { + } catch (const std::invalid_argument&) { // ignored } try { auto input = dynamic::array(dynamic::object("foo", 1)); parseMethodCalls(std::move(input)); ADD_FAILURE(); - } catch (const std::invalid_argument &) { + } catch (const std::invalid_argument&) { // ignored } try { auto input = dynamic::array(1, 4, dynamic::object("foo", 2)); parseMethodCalls(std::move(input)); ADD_FAILURE(); - } catch (const std::invalid_argument &) { + } catch (const std::invalid_argument&) { // ignored } try { @@ -53,7 +53,7 @@ TEST(parseMethodCalls, InvalidReturnFormat) { dynamic::array(1), dynamic::array(4), dynamic::object("foo", 2)); parseMethodCalls(std::move(input)); ADD_FAILURE(); - } catch (const std::invalid_argument &) { + } catch (const std::invalid_argument&) { // ignored } try { @@ -61,7 +61,7 @@ TEST(parseMethodCalls, InvalidReturnFormat) { dynamic::array(dynamic::array(1), dynamic::array(4), dynamic::array()); parseMethodCalls(std::move(input)); ADD_FAILURE(); - } catch (const std::invalid_argument &) { + } catch (const std::invalid_argument&) { // ignored } } @@ -113,7 +113,7 @@ TEST(parseMethodCalls, MapReturn) { auto returnedCall = returnedCalls[0]; EXPECT_EQ(1, returnedCall.arguments.size()); EXPECT_EQ(folly::dynamic::OBJECT, returnedCall.arguments[0].type()); - auto &returnedMap = returnedCall.arguments[0]; + auto& returnedMap = returnedCall.arguments[0]; auto foo = returnedMap.at("foo"); EXPECT_EQ(folly::dynamic("hello"), foo); auto bar = returnedMap.at("bar"); @@ -129,7 +129,7 @@ TEST(parseMethodCalls, ArrayReturn) { auto returnedCall = returnedCalls[0]; EXPECT_EQ(1, returnedCall.arguments.size()); EXPECT_EQ(folly::dynamic::ARRAY, returnedCall.arguments[0].type()); - auto &returnedArray = returnedCall.arguments[0]; + auto& returnedArray = returnedCall.arguments[0]; EXPECT_EQ(3, returnedArray.size()); EXPECT_EQ(folly::dynamic("foo"), returnedArray[0]); EXPECT_EQ(folly::dynamic(42.0), returnedArray[1]); diff --git a/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp b/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp index 5be2da157b5..82b0e58ac7a 100644 --- a/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp +++ b/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.cpp @@ -36,7 +36,7 @@ class HermesExecutorRuntimeAdapter virtual ~HermesExecutorRuntimeAdapter() = default; - HermesRuntime &getRuntime() override { + HermesRuntime& getRuntime() override { return *runtime_; } @@ -133,10 +133,10 @@ class DecoratedRuntime : public jsi::WithRuntimeDecorator { // manage the debugger registration. DecoratedRuntime( std::unique_ptr runtime, - HermesRuntime &hermesRuntime, + HermesRuntime& hermesRuntime, std::shared_ptr jsQueue, bool enableDebugger, - const std::string &debuggerName) + const std::string& debuggerName) : jsi::WithRuntimeDecorator(*runtime, reentrancyCheck_), runtime_(std::move(runtime)) { enableDebugger_ = enableDebugger; @@ -175,7 +175,7 @@ void HermesExecutorFactory::setEnableDebugger(bool enableDebugger) { enableDebugger_ = enableDebugger; } -void HermesExecutorFactory::setDebuggerName(const std::string &debuggerName) { +void HermesExecutorFactory::setDebuggerName(const std::string& debuggerName) { debuggerName_ = debuggerName; } @@ -188,7 +188,7 @@ std::unique_ptr HermesExecutorFactory::createJSExecutor( hermesRuntime = hermes::makeHermesRuntime(runtimeConfig_); } - HermesRuntime &hermesRuntimeRef = *hermesRuntime; + HermesRuntime& hermesRuntimeRef = *hermesRuntime; auto decoratedRuntime = std::make_shared( std::move(hermesRuntime), hermesRuntimeRef, @@ -228,7 +228,7 @@ HermesExecutor::HermesExecutor( std::shared_ptr runtime, std::shared_ptr delegate, std::shared_ptr jsQueue, - const JSIScopedTimeoutInvoker &timeoutInvoker, + const JSIScopedTimeoutInvoker& timeoutInvoker, RuntimeInstaller runtimeInstaller) : JSIExecutor(runtime, delegate, timeoutInvoker, runtimeInstaller) { jsi::addNativeTracingHooks(*runtime); diff --git a/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.h b/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.h index 1be5b60e215..723ed547302 100644 --- a/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.h +++ b/packages/react-native/ReactCommon/hermes/executor/HermesExecutorFactory.h @@ -18,7 +18,7 @@ class HermesExecutorFactory : public JSExecutorFactory { public: explicit HermesExecutorFactory( JSIExecutor::RuntimeInstaller runtimeInstaller, - const JSIScopedTimeoutInvoker &timeoutInvoker = + const JSIScopedTimeoutInvoker& timeoutInvoker = JSIExecutor::defaultTimeoutInvoker, ::hermes::vm::RuntimeConfig runtimeConfig = defaultRuntimeConfig()) : runtimeInstaller_(runtimeInstaller), @@ -29,7 +29,7 @@ class HermesExecutorFactory : public JSExecutorFactory { void setEnableDebugger(bool enableDebugger); - void setDebuggerName(const std::string &debuggerName); + void setDebuggerName(const std::string& debuggerName); std::unique_ptr createJSExecutor( std::shared_ptr delegate, @@ -51,7 +51,7 @@ class HermesExecutor : public JSIExecutor { std::shared_ptr runtime, std::shared_ptr delegate, std::shared_ptr jsQueue, - const JSIScopedTimeoutInvoker &timeoutInvoker, + const JSIScopedTimeoutInvoker& timeoutInvoker, RuntimeInstaller runtimeInstaller); private: diff --git a/packages/react-native/ReactCommon/hermes/executor/JSITracing.cpp b/packages/react-native/ReactCommon/hermes/executor/JSITracing.cpp index 3c013cf94e4..4c246c173b8 100644 --- a/packages/react-native/ReactCommon/hermes/executor/JSITracing.cpp +++ b/packages/react-native/ReactCommon/hermes/executor/JSITracing.cpp @@ -9,7 +9,7 @@ namespace facebook { namespace jsi { -void addNativeTracingHooks(Runtime &rt) { +void addNativeTracingHooks(Runtime& rt) { // Unimplemented } } // namespace jsi diff --git a/packages/react-native/ReactCommon/hermes/executor/JSITracing.h b/packages/react-native/ReactCommon/hermes/executor/JSITracing.h index 13505637c1c..c1a7288a51a 100644 --- a/packages/react-native/ReactCommon/hermes/executor/JSITracing.h +++ b/packages/react-native/ReactCommon/hermes/executor/JSITracing.h @@ -10,7 +10,7 @@ namespace facebook { namespace jsi { -void addNativeTracingHooks(Runtime &rt); +void addNativeTracingHooks(Runtime& rt); } // namespace jsi } // namespace facebook diff --git a/packages/react-native/ReactCommon/jsc/JSCRuntime.cpp b/packages/react-native/ReactCommon/jsc/JSCRuntime.cpp index 2148c752fea..5cce0c7b46f 100644 --- a/packages/react-native/ReactCommon/jsc/JSCRuntime.cpp +++ b/packages/react-native/ReactCommon/jsc/JSCRuntime.cpp @@ -28,8 +28,8 @@ class ArgsConverter; class JSCRuntime; struct Lock { - void lock(const jsc::JSCRuntime &) const {} - void unlock(const jsc::JSCRuntime &) const {} + void lock(const jsc::JSCRuntime&) const {} + void unlock(const jsc::JSCRuntime&) const {} }; class JSCRuntime : public jsi::Runtime { @@ -41,15 +41,15 @@ class JSCRuntime : public jsi::Runtime { ~JSCRuntime(); std::shared_ptr prepareJavaScript( - const std::shared_ptr &buffer, + const std::shared_ptr& buffer, std::string sourceURL) override; jsi::Value evaluatePreparedJavaScript( - const std::shared_ptr &js) override; + const std::shared_ptr& js) override; jsi::Value evaluateJavaScript( - const std::shared_ptr &buffer, - const std::string &sourceURL) override; + const std::shared_ptr& buffer, + const std::string& sourceURL) override; bool drainMicrotasks(int maxMicrotasksHint = -1) override; @@ -59,7 +59,7 @@ class JSCRuntime : public jsi::Runtime { bool isInspectable() override; - void setDescription(const std::string &desc); + void setDescription(const std::string& desc); // Please don't use the following two functions, only exposed for // integration efforts. @@ -71,7 +71,7 @@ class JSCRuntime : public jsi::Runtime { jsi::Value createValue(JSValueRef value) const; // Value->JSValueRef (similar to above) - JSValueRef valueRef(const jsi::Value &value); + JSValueRef valueRef(const jsi::Value& value); protected: friend class detail::ArgsConverter; @@ -79,24 +79,24 @@ class JSCRuntime : public jsi::Runtime { #ifndef NDEBUG JSCSymbolValue( JSGlobalContextRef ctx, - const std::atomic &ctxInvalid, + const std::atomic& ctxInvalid, JSValueRef sym, - std::atomic &counter); + std::atomic& counter); #else JSCSymbolValue( JSGlobalContextRef ctx, - const std::atomic &ctxInvalid, + const std::atomic& ctxInvalid, JSValueRef sym); #endif void invalidate() override; JSGlobalContextRef ctx_; - const std::atomic &ctxInvalid_; + const std::atomic& ctxInvalid_; // There is no C type in the JSC API to represent Symbol, so this stored // a JSValueRef which contains the Symbol. JSValueRef sym_; #ifndef NDEBUG - std::atomic &counter_; + std::atomic& counter_; #endif protected: friend class JSCRuntime; @@ -104,7 +104,7 @@ class JSCRuntime : public jsi::Runtime { class JSCStringValue final : public PointerValue { #ifndef NDEBUG - JSCStringValue(JSStringRef str, std::atomic &counter); + JSCStringValue(JSStringRef str, std::atomic& counter); #else JSCStringValue(JSStringRef str); #endif @@ -112,7 +112,7 @@ class JSCRuntime : public jsi::Runtime { JSStringRef str_; #ifndef NDEBUG - std::atomic &counter_; + std::atomic& counter_; #endif protected: friend class JSCRuntime; @@ -121,131 +121,128 @@ class JSCRuntime : public jsi::Runtime { class JSCObjectValue final : public PointerValue { JSCObjectValue( JSGlobalContextRef ctx, - const std::atomic &ctxInvalid, + const std::atomic& ctxInvalid, JSObjectRef obj #ifndef NDEBUG , - std::atomic &counter + std::atomic& counter #endif ); void invalidate() override; JSGlobalContextRef ctx_; - const std::atomic &ctxInvalid_; + const std::atomic& ctxInvalid_; JSObjectRef obj_; #ifndef NDEBUG - std::atomic &counter_; + std::atomic& counter_; #endif protected: friend class JSCRuntime; }; - PointerValue *cloneSymbol(const Runtime::PointerValue *pv) override; - PointerValue *cloneBigInt(const Runtime::PointerValue *pv) override; - PointerValue *cloneString(const Runtime::PointerValue *pv) override; - PointerValue *cloneObject(const Runtime::PointerValue *pv) override; - PointerValue *clonePropNameID(const Runtime::PointerValue *pv) override; + PointerValue* cloneSymbol(const Runtime::PointerValue* pv) override; + PointerValue* cloneBigInt(const Runtime::PointerValue* pv) override; + PointerValue* cloneString(const Runtime::PointerValue* pv) override; + PointerValue* cloneObject(const Runtime::PointerValue* pv) override; + PointerValue* clonePropNameID(const Runtime::PointerValue* pv) override; - jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) + jsi::PropNameID createPropNameIDFromAscii(const char* str, size_t length) override; - jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) + jsi::PropNameID createPropNameIDFromUtf8(const uint8_t* utf8, size_t length) override; - jsi::PropNameID createPropNameIDFromString(const jsi::String &str) override; - jsi::PropNameID createPropNameIDFromSymbol(const jsi::Symbol &sym) override; - std::string utf8(const jsi::PropNameID &) override; - bool compare(const jsi::PropNameID &, const jsi::PropNameID &) override; + jsi::PropNameID createPropNameIDFromString(const jsi::String& str) override; + jsi::PropNameID createPropNameIDFromSymbol(const jsi::Symbol& sym) override; + std::string utf8(const jsi::PropNameID&) override; + bool compare(const jsi::PropNameID&, const jsi::PropNameID&) override; - std::string symbolToString(const jsi::Symbol &) override; + std::string symbolToString(const jsi::Symbol&) override; jsi::BigInt createBigIntFromInt64(int64_t) override; jsi::BigInt createBigIntFromUint64(uint64_t) override; - bool bigintIsInt64(const jsi::BigInt &) override; - bool bigintIsUint64(const jsi::BigInt &) override; - uint64_t truncate(const jsi::BigInt &) override; - jsi::String bigintToString(const jsi::BigInt &, int) override; + bool bigintIsInt64(const jsi::BigInt&) override; + bool bigintIsUint64(const jsi::BigInt&) override; + uint64_t truncate(const jsi::BigInt&) override; + jsi::String bigintToString(const jsi::BigInt&, int) override; - jsi::String createStringFromAscii(const char *str, size_t length) override; - jsi::String createStringFromUtf8(const uint8_t *utf8, size_t length) override; - std::string utf8(const jsi::String &) override; + jsi::String createStringFromAscii(const char* str, size_t length) override; + jsi::String createStringFromUtf8(const uint8_t* utf8, size_t length) override; + std::string utf8(const jsi::String&) override; jsi::Object createObject() override; jsi::Object createObject(std::shared_ptr ho) override; virtual std::shared_ptr getHostObject( - const jsi::Object &) override; - jsi::HostFunctionType &getHostFunction(const jsi::Function &) override; + const jsi::Object&) override; + jsi::HostFunctionType& getHostFunction(const jsi::Function&) override; - bool hasNativeState(const jsi::Object &) override; - std::shared_ptr getNativeState( - const jsi::Object &) override; - void setNativeState(const jsi::Object &, std::shared_ptr) + bool hasNativeState(const jsi::Object&) override; + std::shared_ptr getNativeState(const jsi::Object&) override; + void setNativeState(const jsi::Object&, std::shared_ptr) override; - jsi::Value getProperty(const jsi::Object &, const jsi::String &name) override; - jsi::Value getProperty(const jsi::Object &, const jsi::PropNameID &name) + jsi::Value getProperty(const jsi::Object&, const jsi::String& name) override; + jsi::Value getProperty(const jsi::Object&, const jsi::PropNameID& name) override; - bool hasProperty(const jsi::Object &, const jsi::String &name) override; - bool hasProperty(const jsi::Object &, const jsi::PropNameID &name) override; + bool hasProperty(const jsi::Object&, const jsi::String& name) override; + bool hasProperty(const jsi::Object&, const jsi::PropNameID& name) override; void setPropertyValue( - const jsi::Object &, - const jsi::String &name, - const jsi::Value &value) override; + const jsi::Object&, + const jsi::String& name, + const jsi::Value& value) override; void setPropertyValue( - const jsi::Object &, - const jsi::PropNameID &name, - const jsi::Value &value) override; - bool isArray(const jsi::Object &) const override; - bool isArrayBuffer(const jsi::Object &) const override; - bool isFunction(const jsi::Object &) const override; - bool isHostObject(const jsi::Object &) const override; - bool isHostFunction(const jsi::Function &) const override; - jsi::Array getPropertyNames(const jsi::Object &) override; + const jsi::Object&, + const jsi::PropNameID& name, + const jsi::Value& value) override; + bool isArray(const jsi::Object&) const override; + bool isArrayBuffer(const jsi::Object&) const override; + bool isFunction(const jsi::Object&) const override; + bool isHostObject(const jsi::Object&) const override; + bool isHostFunction(const jsi::Function&) const override; + jsi::Array getPropertyNames(const jsi::Object&) override; // TODO: revisit this implementation - jsi::WeakObject createWeakObject(const jsi::Object &) override; - jsi::Value lockWeakObject(const jsi::WeakObject &) override; + jsi::WeakObject createWeakObject(const jsi::Object&) override; + jsi::Value lockWeakObject(const jsi::WeakObject&) override; jsi::Array createArray(size_t length) override; jsi::ArrayBuffer createArrayBuffer( std::shared_ptr buffer) override; - size_t size(const jsi::Array &) override; - size_t size(const jsi::ArrayBuffer &) override; - uint8_t *data(const jsi::ArrayBuffer &) override; - jsi::Value getValueAtIndex(const jsi::Array &, size_t i) override; - void setValueAtIndexImpl( - const jsi::Array &, - size_t i, - const jsi::Value &value) override; + size_t size(const jsi::Array&) override; + size_t size(const jsi::ArrayBuffer&) override; + uint8_t* data(const jsi::ArrayBuffer&) override; + jsi::Value getValueAtIndex(const jsi::Array&, size_t i) override; + void setValueAtIndexImpl(const jsi::Array&, size_t i, const jsi::Value& value) + override; jsi::Function createFunctionFromHostFunction( - const jsi::PropNameID &name, + const jsi::PropNameID& name, unsigned int paramCount, jsi::HostFunctionType func) override; jsi::Value call( - const jsi::Function &, - const jsi::Value &jsThis, - const jsi::Value *args, + const jsi::Function&, + const jsi::Value& jsThis, + const jsi::Value* args, size_t count) override; jsi::Value callAsConstructor( - const jsi::Function &, - const jsi::Value *args, + const jsi::Function&, + const jsi::Value* args, size_t count) override; - bool strictEquals(const jsi::Symbol &a, const jsi::Symbol &b) const override; - bool strictEquals(const jsi::BigInt &a, const jsi::BigInt &b) const override; - bool strictEquals(const jsi::String &a, const jsi::String &b) const override; - bool strictEquals(const jsi::Object &a, const jsi::Object &b) const override; - bool instanceOf(const jsi::Object &o, const jsi::Function &f) override; + bool strictEquals(const jsi::Symbol& a, const jsi::Symbol& b) const override; + bool strictEquals(const jsi::BigInt& a, const jsi::BigInt& b) const override; + bool strictEquals(const jsi::String& a, const jsi::String& b) const override; + bool strictEquals(const jsi::Object& a, const jsi::Object& b) const override; + bool instanceOf(const jsi::Object& o, const jsi::Function& f) override; private: // Basically convenience casts - static JSValueRef symbolRef(const jsi::Symbol &str); - static JSStringRef stringRef(const jsi::String &str); - static JSStringRef stringRef(const jsi::PropNameID &sym); - static JSObjectRef objectRef(const jsi::Object &obj); + static JSValueRef symbolRef(const jsi::Symbol& str); + static JSStringRef stringRef(const jsi::String& str); + static JSStringRef stringRef(const jsi::PropNameID& sym); + static JSObjectRef objectRef(const jsi::Object& obj); #ifdef RN_FABRIC_ENABLED - static JSObjectRef objectRef(const jsi::WeakObject &obj); + static JSObjectRef objectRef(const jsi::WeakObject& obj); #endif // Factory methods for creating String/Object @@ -255,14 +252,14 @@ class JSCRuntime : public jsi::Runtime { jsi::Object createObject(JSObjectRef objectRef) const; // Used by factory methods and clone methods - jsi::Runtime::PointerValue *makeSymbolValue(JSValueRef sym) const; - jsi::Runtime::PointerValue *makeStringValue(JSStringRef str) const; - jsi::Runtime::PointerValue *makeObjectValue(JSObjectRef obj) const; + jsi::Runtime::PointerValue* makeSymbolValue(JSValueRef sym) const; + jsi::Runtime::PointerValue* makeStringValue(JSStringRef str) const; + jsi::Runtime::PointerValue* makeObjectValue(JSObjectRef obj) const; void checkException(JSValueRef exc); void checkException(JSValueRef res, JSValueRef exc); - void checkException(JSValueRef exc, const char *msg); - void checkException(JSValueRef res, JSValueRef exc, const char *msg); + void checkException(JSValueRef exc, const char* msg); + void checkException(JSValueRef res, JSValueRef exc, const char* msg); JSGlobalContextRef ctx_; std::atomic ctxInvalid_; @@ -325,7 +322,7 @@ std::string JSStringToSTLString(JSStringRef str) { // in stackBuffer.size() bytes of UTF-8 (including the null terminator). std::array stackBuffer; std::unique_ptr heapBuffer; - char *buffer; + char* buffer; // NOTE: By definition, maxBytes >= 1 since the null terminator is included. size_t maxBytes = JSStringGetMaximumUTF8CStringSize(str); if (maxBytes <= stackBuffer.size()) { @@ -380,7 +377,7 @@ JSStringRef getIsArrayString() { // std::string utility namespace { -std::string to_string(void *value) { +std::string to_string(void* value) { std::ostringstream ss; ss << value; return ss.str(); @@ -428,16 +425,16 @@ JSCRuntime::~JSCRuntime() { } std::shared_ptr JSCRuntime::prepareJavaScript( - const std::shared_ptr &buffer, + const std::shared_ptr& buffer, std::string sourceURL) { return std::make_shared( buffer, std::move(sourceURL)); } jsi::Value JSCRuntime::evaluatePreparedJavaScript( - const std::shared_ptr &js) { + const std::shared_ptr& js) { assert( - dynamic_cast(js.get()) && + dynamic_cast(js.get()) && "preparedJavaScript must be a SourceJavaScriptPreparation"); auto sourceJs = std::static_pointer_cast(js); @@ -445,10 +442,10 @@ jsi::Value JSCRuntime::evaluatePreparedJavaScript( } jsi::Value JSCRuntime::evaluateJavaScript( - const std::shared_ptr &buffer, - const std::string &sourceURL) { + const std::shared_ptr& buffer, + const std::string& sourceURL) { std::string tmp( - reinterpret_cast(buffer->data()), buffer->size()); + reinterpret_cast(buffer->data()), buffer->size()); JSStringRef sourceRef = JSStringCreateWithUTF8CString(tmp.c_str()); JSStringRef sourceURLRef = nullptr; if (!sourceURL.empty()) { @@ -505,11 +502,11 @@ bool smellsLikeES6Symbol(JSGlobalContextRef ctx, JSValueRef ref) { JSCRuntime::JSCSymbolValue::JSCSymbolValue( JSGlobalContextRef ctx, - const std::atomic &ctxInvalid, + const std::atomic& ctxInvalid, JSValueRef sym #ifndef NDEBUG , - std::atomic &counter + std::atomic& counter #endif ) : ctx_(ctx), @@ -541,7 +538,7 @@ void JSCRuntime::JSCSymbolValue::invalidate() { #ifndef NDEBUG JSCRuntime::JSCStringValue::JSCStringValue( JSStringRef str, - std::atomic &counter) + std::atomic& counter) : str_(JSStringRetain(str)), counter_(counter) { // Since std::atomic returns a copy instead of a reference when calling // operator+= we must do this explicitly in the constructor @@ -566,11 +563,11 @@ void JSCRuntime::JSCStringValue::invalidate() { JSCRuntime::JSCObjectValue::JSCObjectValue( JSGlobalContextRef ctx, - const std::atomic &ctxInvalid, + const std::atomic& ctxInvalid, JSObjectRef obj #ifndef NDEBUG , - std::atomic &counter + std::atomic& counter #endif ) : ctx_(ctx), @@ -619,52 +616,52 @@ void JSCRuntime::JSCObjectValue::invalidate() { delete this; } -jsi::Runtime::PointerValue *JSCRuntime::cloneSymbol( - const jsi::Runtime::PointerValue *pv) { +jsi::Runtime::PointerValue* JSCRuntime::cloneSymbol( + const jsi::Runtime::PointerValue* pv) { if (!pv) { return nullptr; } - const JSCSymbolValue *symbol = static_cast(pv); + const JSCSymbolValue* symbol = static_cast(pv); return makeSymbolValue(symbol->sym_); } -jsi::Runtime::PointerValue *JSCRuntime::cloneBigInt( - const Runtime::PointerValue *) { +jsi::Runtime::PointerValue* JSCRuntime::cloneBigInt( + const Runtime::PointerValue*) { throw std::logic_error("Not implemented"); } -jsi::Runtime::PointerValue *JSCRuntime::cloneString( - const jsi::Runtime::PointerValue *pv) { +jsi::Runtime::PointerValue* JSCRuntime::cloneString( + const jsi::Runtime::PointerValue* pv) { if (!pv) { return nullptr; } - const JSCStringValue *string = static_cast(pv); + const JSCStringValue* string = static_cast(pv); return makeStringValue(string->str_); } -jsi::Runtime::PointerValue *JSCRuntime::cloneObject( - const jsi::Runtime::PointerValue *pv) { +jsi::Runtime::PointerValue* JSCRuntime::cloneObject( + const jsi::Runtime::PointerValue* pv) { if (!pv) { return nullptr; } - const JSCObjectValue *object = static_cast(pv); + const JSCObjectValue* object = static_cast(pv); assert( object->ctx_ == ctx_ && "Don't try to clone an object backed by a different Runtime"); return makeObjectValue(object->obj_); } -jsi::Runtime::PointerValue *JSCRuntime::clonePropNameID( - const jsi::Runtime::PointerValue *pv) { +jsi::Runtime::PointerValue* JSCRuntime::clonePropNameID( + const jsi::Runtime::PointerValue* pv) { if (!pv) { return nullptr; } - const JSCStringValue *string = static_cast(pv); + const JSCStringValue* string = static_cast(pv); return makeStringValue(string->str_); } jsi::PropNameID JSCRuntime::createPropNameIDFromAscii( - const char *str, + const char* str, size_t length) { // For system JSC this must is identical to a string std::string tmp(str, length); @@ -675,35 +672,35 @@ jsi::PropNameID JSCRuntime::createPropNameIDFromAscii( } jsi::PropNameID JSCRuntime::createPropNameIDFromUtf8( - const uint8_t *utf8, + const uint8_t* utf8, size_t length) { - std::string tmp(reinterpret_cast(utf8), length); + std::string tmp(reinterpret_cast(utf8), length); JSStringRef strRef = JSStringCreateWithUTF8CString(tmp.c_str()); auto res = createPropNameID(strRef); JSStringRelease(strRef); return res; } -jsi::PropNameID JSCRuntime::createPropNameIDFromString(const jsi::String &str) { +jsi::PropNameID JSCRuntime::createPropNameIDFromString(const jsi::String& str) { return createPropNameID(stringRef(str)); } -jsi::PropNameID JSCRuntime::createPropNameIDFromSymbol(const jsi::Symbol &sym) { +jsi::PropNameID JSCRuntime::createPropNameIDFromSymbol(const jsi::Symbol& sym) { // TODO: Support for symbols through the native API in JSC is very limited. // While we could construct a PropNameID here, we would not be able to get a // symbol property through the C++ API. throw std::logic_error("Not implemented"); } -std::string JSCRuntime::utf8(const jsi::PropNameID &sym) { +std::string JSCRuntime::utf8(const jsi::PropNameID& sym) { return JSStringToSTLString(stringRef(sym)); } -bool JSCRuntime::compare(const jsi::PropNameID &a, const jsi::PropNameID &b) { +bool JSCRuntime::compare(const jsi::PropNameID& a, const jsi::PropNameID& b) { return JSStringIsEqual(stringRef(a), stringRef(b)); } -std::string JSCRuntime::symbolToString(const jsi::Symbol &sym) { +std::string JSCRuntime::symbolToString(const jsi::Symbol& sym) { return jsi::Value(*this, sym).toString(*this).utf8(*this); } @@ -715,40 +712,40 @@ jsi::BigInt JSCRuntime::createBigIntFromUint64(uint64_t) { throw std::logic_error("Not implemented"); } -bool JSCRuntime::bigintIsInt64(const jsi::BigInt &) { +bool JSCRuntime::bigintIsInt64(const jsi::BigInt&) { throw std::logic_error("Not implemented"); } -bool JSCRuntime::bigintIsUint64(const jsi::BigInt &) { +bool JSCRuntime::bigintIsUint64(const jsi::BigInt&) { throw std::logic_error("Not implemented"); } -uint64_t JSCRuntime::truncate(const jsi::BigInt &) { +uint64_t JSCRuntime::truncate(const jsi::BigInt&) { throw std::logic_error("Not implemented"); } -jsi::String JSCRuntime::bigintToString(const jsi::BigInt &, int) { +jsi::String JSCRuntime::bigintToString(const jsi::BigInt&, int) { throw std::logic_error("Not implemented"); } -jsi::String JSCRuntime::createStringFromAscii(const char *str, size_t length) { +jsi::String JSCRuntime::createStringFromAscii(const char* str, size_t length) { // Yes we end up double casting for semantic reasons (UTF8 contains ASCII, // not the other way around) return this->createStringFromUtf8( - reinterpret_cast(str), length); + reinterpret_cast(str), length); } jsi::String JSCRuntime::createStringFromUtf8( - const uint8_t *str, + const uint8_t* str, size_t length) { - std::string tmp(reinterpret_cast(str), length); + std::string tmp(reinterpret_cast(str), length); JSStringRef stringRef = JSStringCreateWithUTF8CString(tmp.c_str()); auto result = createString(stringRef); JSStringRelease(stringRef); return result; } -std::string JSCRuntime::utf8(const jsi::String &str) { +std::string JSCRuntime::utf8(const jsi::String& str) { return JSStringToSTLString(stringRef(str)); } @@ -760,11 +757,11 @@ jsi::Object JSCRuntime::createObject() { namespace detail { struct HostObjectProxyBase { HostObjectProxyBase( - JSCRuntime &rt, - const std::shared_ptr &sho) + JSCRuntime& rt, + const std::shared_ptr& sho) : runtime(rt), hostObject(sho) {} - JSCRuntime &runtime; + JSCRuntime& runtime; std::shared_ptr hostObject; }; } // namespace detail @@ -780,17 +777,17 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr ho) { JSContextRef ctx, JSObjectRef object, JSStringRef propName, - JSValueRef *exception) { - auto proxy = static_cast(JSObjectGetPrivate(object)); - auto &rt = proxy->runtime; + JSValueRef* exception) { + auto proxy = static_cast(JSObjectGetPrivate(object)); + auto& rt = proxy->runtime; jsi::PropNameID sym = rt.createPropNameID(propName); jsi::Value ret; try { ret = proxy->hostObject->get(rt, sym); - } catch (const jsi::JSError &error) { + } catch (const jsi::JSError& error) { *exception = rt.valueRef(error.value()); return JSValueMakeUndefined(ctx); - } catch (const std::exception &ex) { + } catch (const std::exception& ex) { auto excValue = rt.global() .getPropertyAsFunction(rt, "Error") @@ -823,17 +820,17 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr ho) { JSObjectRef object, JSStringRef propName, JSValueRef value, - JSValueRef *exception) { + JSValueRef* exception) { JSC_UNUSED(ctx); - auto proxy = static_cast(JSObjectGetPrivate(object)); - auto &rt = proxy->runtime; + auto proxy = static_cast(JSObjectGetPrivate(object)); + auto& rt = proxy->runtime; jsi::PropNameID sym = rt.createPropNameID(propName); try { proxy->hostObject->set(rt, sym, rt.createValue(value)); - } catch (const jsi::JSError &error) { + } catch (const jsi::JSError& error) { *exception = rt.valueRef(error.value()); return false; - } catch (const std::exception &ex) { + } catch (const std::exception& ex) { auto excValue = rt.global() .getPropertyAsFunction(rt, "Error") @@ -867,10 +864,10 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr ho) { JSObjectRef object, JSPropertyNameAccumulatorRef propertyNames) noexcept { JSC_UNUSED(ctx); - auto proxy = static_cast(JSObjectGetPrivate(object)); - auto &rt = proxy->runtime; + auto proxy = static_cast(JSObjectGetPrivate(object)); + auto& rt = proxy->runtime; auto names = proxy->hostObject->getPropertyNames(rt); - for (auto &name : names) { + for (auto& name : names) { JSPropertyNameAccumulatorAddName(propertyNames, stringRef(name)); } } @@ -878,7 +875,7 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr ho) { #undef JSC_UNUSED static void finalize(JSObjectRef obj) { - auto hostObject = static_cast(JSObjectGetPrivate(obj)); + auto hostObject = static_cast(JSObjectGetPrivate(obj)); JSObjectSetPrivate(obj, nullptr); delete hostObject; } @@ -903,34 +900,34 @@ jsi::Object JSCRuntime::createObject(std::shared_ptr ho) { } std::shared_ptr JSCRuntime::getHostObject( - const jsi::Object &obj) { + const jsi::Object& obj) { // We are guaranteed at this point to have isHostObject(obj) == true // so the private data should be HostObjectMetadata JSObjectRef object = objectRef(obj); auto metadata = - static_cast(JSObjectGetPrivate(object)); + static_cast(JSObjectGetPrivate(object)); assert(metadata); return metadata->hostObject; } -bool JSCRuntime::hasNativeState(const jsi::Object &) { +bool JSCRuntime::hasNativeState(const jsi::Object&) { throw std::logic_error("Not implemented"); } std::shared_ptr JSCRuntime::getNativeState( - const jsi::Object &) { + const jsi::Object&) { throw std::logic_error("Not implemented"); } void JSCRuntime::setNativeState( - const jsi::Object &, + const jsi::Object&, std::shared_ptr) { throw std::logic_error("Not implemented"); } jsi::Value JSCRuntime::getProperty( - const jsi::Object &obj, - const jsi::String &name) { + const jsi::Object& obj, + const jsi::String& name) { JSObjectRef objRef = objectRef(obj); JSValueRef exc = nullptr; JSValueRef res = JSObjectGetProperty(ctx_, objRef, stringRef(name), &exc); @@ -939,8 +936,8 @@ jsi::Value JSCRuntime::getProperty( } jsi::Value JSCRuntime::getProperty( - const jsi::Object &obj, - const jsi::PropNameID &name) { + const jsi::Object& obj, + const jsi::PropNameID& name) { JSObjectRef objRef = objectRef(obj); JSValueRef exc = nullptr; JSValueRef res = JSObjectGetProperty(ctx_, objRef, stringRef(name), &exc); @@ -948,22 +945,22 @@ jsi::Value JSCRuntime::getProperty( return createValue(res); } -bool JSCRuntime::hasProperty(const jsi::Object &obj, const jsi::String &name) { +bool JSCRuntime::hasProperty(const jsi::Object& obj, const jsi::String& name) { JSObjectRef objRef = objectRef(obj); return JSObjectHasProperty(ctx_, objRef, stringRef(name)); } bool JSCRuntime::hasProperty( - const jsi::Object &obj, - const jsi::PropNameID &name) { + const jsi::Object& obj, + const jsi::PropNameID& name) { JSObjectRef objRef = objectRef(obj); return JSObjectHasProperty(ctx_, objRef, stringRef(name)); } void JSCRuntime::setPropertyValue( - const jsi::Object &object, - const jsi::PropNameID &name, - const jsi::Value &value) { + const jsi::Object& object, + const jsi::PropNameID& name, + const jsi::Value& value) { JSValueRef exc = nullptr; JSObjectSetProperty( ctx_, @@ -976,9 +973,9 @@ void JSCRuntime::setPropertyValue( } void JSCRuntime::setPropertyValue( - const jsi::Object &object, - const jsi::String &name, - const jsi::Value &value) { + const jsi::Object& object, + const jsi::String& name, + const jsi::Value& value) { JSValueRef exc = nullptr; JSObjectSetProperty( ctx_, @@ -990,7 +987,7 @@ void JSCRuntime::setPropertyValue( checkException(exc); } -bool JSCRuntime::isArray(const jsi::Object &obj) const { +bool JSCRuntime::isArray(const jsi::Object& obj) const { #if !defined(_JSC_FAST_IS_ARRAY) JSObjectRef global = JSContextGetGlobalObject(ctx_); JSStringRef arrayString = getArrayString(); @@ -1016,7 +1013,7 @@ bool JSCRuntime::isArray(const jsi::Object &obj) const { #endif } -bool JSCRuntime::isArrayBuffer(const jsi::Object &obj) const { +bool JSCRuntime::isArrayBuffer(const jsi::Object& obj) const { #if defined(_JSC_NO_ARRAY_BUFFERS) throw std::runtime_error("Unsupported"); #else @@ -1025,16 +1022,16 @@ bool JSCRuntime::isArrayBuffer(const jsi::Object &obj) const { #endif } -uint8_t *JSCRuntime::data(const jsi::ArrayBuffer &obj) { +uint8_t* JSCRuntime::data(const jsi::ArrayBuffer& obj) { #if defined(_JSC_NO_ARRAY_BUFFERS) throw std::runtime_error("Unsupported"); #else - return static_cast( + return static_cast( JSObjectGetArrayBufferBytesPtr(ctx_, objectRef(obj), nullptr)); #endif } -size_t JSCRuntime::size(const jsi::ArrayBuffer &obj) { +size_t JSCRuntime::size(const jsi::ArrayBuffer& obj) { #if defined(_JSC_NO_ARRAY_BUFFERS) throw std::runtime_error("Unsupported"); #else @@ -1042,17 +1039,17 @@ size_t JSCRuntime::size(const jsi::ArrayBuffer &obj) { #endif } -bool JSCRuntime::isFunction(const jsi::Object &obj) const { +bool JSCRuntime::isFunction(const jsi::Object& obj) const { return JSObjectIsFunction(ctx_, objectRef(obj)); } -bool JSCRuntime::isHostObject(const jsi::Object &obj) const { +bool JSCRuntime::isHostObject(const jsi::Object& obj) const { auto cls = hostObjectClass; return cls != nullptr && JSValueIsObjectOfClass(ctx_, objectRef(obj), cls); } // Very expensive -jsi::Array JSCRuntime::getPropertyNames(const jsi::Object &obj) { +jsi::Array JSCRuntime::getPropertyNames(const jsi::Object& obj) { JSPropertyNameArrayRef names = JSObjectCopyPropertyNames(ctx_, objectRef(obj)); size_t len = JSPropertyNameArrayGetCount(names); @@ -1066,7 +1063,7 @@ jsi::Array JSCRuntime::getPropertyNames(const jsi::Object &obj) { return result; } -jsi::WeakObject JSCRuntime::createWeakObject(const jsi::Object &obj) { +jsi::WeakObject JSCRuntime::createWeakObject(const jsi::Object& obj) { #ifdef RN_FABRIC_ENABLED // TODO: revisit this implementation JSObjectRef objRef = objectRef(obj); @@ -1076,7 +1073,7 @@ jsi::WeakObject JSCRuntime::createWeakObject(const jsi::Object &obj) { #endif } -jsi::Value JSCRuntime::lockWeakObject(const jsi::WeakObject &obj) { +jsi::Value JSCRuntime::lockWeakObject(const jsi::WeakObject& obj) { #ifdef RN_FABRIC_ENABLED // TODO: revisit this implementation JSObjectRef objRef = objectRef(obj); @@ -1106,12 +1103,12 @@ jsi::ArrayBuffer JSCRuntime::createArrayBuffer( throw std::logic_error("Not implemented"); } -size_t JSCRuntime::size(const jsi::Array &arr) { +size_t JSCRuntime::size(const jsi::Array& arr) { return static_cast( getProperty(arr, createPropNameID(getLengthString())).getNumber()); } -jsi::Value JSCRuntime::getValueAtIndex(const jsi::Array &arr, size_t i) { +jsi::Value JSCRuntime::getValueAtIndex(const jsi::Array& arr, size_t i) { JSValueRef exc = nullptr; auto res = JSObjectGetPropertyAtIndex(ctx_, objectRef(arr), (int)i, &exc); checkException(exc); @@ -1119,9 +1116,9 @@ jsi::Value JSCRuntime::getValueAtIndex(const jsi::Array &arr, size_t i) { } void JSCRuntime::setValueAtIndexImpl( - const jsi::Array &arr, + const jsi::Array& arr, size_t i, - const jsi::Value &value) { + const jsi::Value& value) { JSValueRef exc = nullptr; JSObjectSetPropertyAtIndex( ctx_, objectRef(arr), (int)i, valueRef(value), &exc); @@ -1137,7 +1134,7 @@ class HostFunctionProxy { HostFunctionProxy(jsi::HostFunctionType hostFunction) : hostFunction_(hostFunction) {} - jsi::HostFunctionType &getHostFunction() { + jsi::HostFunctionType& getHostFunction() { return hostFunction_; } @@ -1147,7 +1144,7 @@ class HostFunctionProxy { } // namespace jsi::Function JSCRuntime::createFunctionFromHostFunction( - const jsi::PropNameID &name, + const jsi::PropNameID& name, unsigned int paramCount, jsi::HostFunctionType func) { class HostFunctionMetadata : public HostFunctionProxy { @@ -1156,8 +1153,8 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( // We need to set up the prototype chain properly here. In theory we // could set func.prototype.prototype = Function.prototype to get the // same result. Not sure which approach is better. - HostFunctionMetadata *metadata = - static_cast(JSObjectGetPrivate(object)); + HostFunctionMetadata* metadata = + static_cast(JSObjectGetPrivate(object)); JSValueRef exc = nullptr; JSObjectSetProperty( @@ -1205,7 +1202,7 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( JSObjectSetPrototype(ctx, object, funcProto); } - static JSValueRef makeError(JSCRuntime &rt, const std::string &desc) { + static JSValueRef makeError(JSCRuntime& rt, const std::string& desc) { jsi::Value value = rt.global().getPropertyAsFunction(rt, "Error").call(rt, desc); return rt.valueRef(value); @@ -1217,14 +1214,14 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], - JSValueRef *exception) { - HostFunctionMetadata *metadata = - static_cast(JSObjectGetPrivate(function)); - JSCRuntime &rt = *(metadata->runtime); + JSValueRef* exception) { + HostFunctionMetadata* metadata = + static_cast(JSObjectGetPrivate(function)); + JSCRuntime& rt = *(metadata->runtime); const unsigned maxStackArgCount = 8; jsi::Value stackArgs[maxStackArgCount]; std::unique_ptr heapArgs; - jsi::Value *args; + jsi::Value* args; if (argumentCount > maxStackArgCount) { heapArgs = std::make_unique(argumentCount); for (size_t i = 0; i < argumentCount; i++) { @@ -1242,15 +1239,15 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( try { res = rt.valueRef( metadata->hostFunction_(rt, thisVal, args, argumentCount)); - } catch (const jsi::JSError &error) { + } catch (const jsi::JSError& error) { *exception = rt.valueRef(error.value()); res = JSValueMakeUndefined(ctx); - } catch (const std::exception &ex) { + } catch (const std::exception& ex) { std::string exceptionString("Exception in HostFunction: "); exceptionString += ex.what(); *exception = makeError(rt, exceptionString); res = JSValueMakeUndefined(ctx); - } catch (const std::string &ex) { + } catch (const std::string& ex) { std::string exceptionString("Exception in HostFunction: "); exceptionString += ex; *exception = makeError(rt, exceptionString); @@ -1264,14 +1261,14 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( } static void finalize(JSObjectRef object) { - HostFunctionMetadata *metadata = - static_cast(JSObjectGetPrivate(object)); + HostFunctionMetadata* metadata = + static_cast(JSObjectGetPrivate(object)); JSObjectSetPrivate(object, nullptr); delete metadata; } HostFunctionMetadata( - JSCRuntime *rt, + JSCRuntime* rt, jsi::HostFunctionType hf, unsigned ac, JSStringRef n) @@ -1280,7 +1277,7 @@ jsi::Function JSCRuntime::createFunctionFromHostFunction( argCount(ac), name(JSStringRetain(n)) {} - JSCRuntime *runtime; + JSCRuntime* runtime; unsigned argCount; JSStringRef name; }; @@ -1307,8 +1304,8 @@ namespace detail { class ArgsConverter { public: - ArgsConverter(JSCRuntime &rt, const jsi::Value *args, size_t count) { - JSValueRef *destination = inline_; + ArgsConverter(JSCRuntime& rt, const jsi::Value* args, size_t count) { + JSValueRef* destination = inline_; if (count > maxStackArgs) { outOfLine_ = std::make_unique(count); destination = outOfLine_.get(); @@ -1319,7 +1316,7 @@ class ArgsConverter { } } - operator JSValueRef *() { + operator JSValueRef*() { return outOfLine_ ? outOfLine_.get() : inline_; } @@ -1330,22 +1327,22 @@ class ArgsConverter { }; } // namespace detail -bool JSCRuntime::isHostFunction(const jsi::Function &obj) const { +bool JSCRuntime::isHostFunction(const jsi::Function& obj) const { auto cls = hostFunctionClass; return cls != nullptr && JSValueIsObjectOfClass(ctx_, objectRef(obj), cls); } -jsi::HostFunctionType &JSCRuntime::getHostFunction(const jsi::Function &obj) { +jsi::HostFunctionType& JSCRuntime::getHostFunction(const jsi::Function& obj) { // We know that isHostFunction(obj) is true here, so its safe to proceed auto proxy = - static_cast(JSObjectGetPrivate(objectRef(obj))); + static_cast(JSObjectGetPrivate(objectRef(obj))); return proxy->getHostFunction(); } jsi::Value JSCRuntime::call( - const jsi::Function &f, - const jsi::Value &jsThis, - const jsi::Value *args, + const jsi::Function& f, + const jsi::Value& jsThis, + const jsi::Value* args, size_t count) { JSValueRef exc = nullptr; auto res = JSObjectCallAsFunction( @@ -1360,8 +1357,8 @@ jsi::Value JSCRuntime::call( } jsi::Value JSCRuntime::callAsConstructor( - const jsi::Function &f, - const jsi::Value *args, + const jsi::Function& f, + const jsi::Value* args, size_t count) { JSValueRef exc = nullptr; auto res = JSObjectCallAsConstructor( @@ -1374,30 +1371,30 @@ jsi::Value JSCRuntime::callAsConstructor( return createValue(res); } -bool JSCRuntime::strictEquals(const jsi::Symbol &a, const jsi::Symbol &b) +bool JSCRuntime::strictEquals(const jsi::Symbol& a, const jsi::Symbol& b) const { JSValueRef exc = nullptr; bool ret = JSValueIsEqual(ctx_, symbolRef(a), symbolRef(b), &exc); - const_cast(this)->checkException(exc); + const_cast(this)->checkException(exc); return ret; } -bool JSCRuntime::strictEquals(const jsi::BigInt &a, const jsi::BigInt &b) +bool JSCRuntime::strictEquals(const jsi::BigInt& a, const jsi::BigInt& b) const { throw std::logic_error("Not implemented"); } -bool JSCRuntime::strictEquals(const jsi::String &a, const jsi::String &b) +bool JSCRuntime::strictEquals(const jsi::String& a, const jsi::String& b) const { return JSStringIsEqual(stringRef(a), stringRef(b)); } -bool JSCRuntime::strictEquals(const jsi::Object &a, const jsi::Object &b) +bool JSCRuntime::strictEquals(const jsi::Object& a, const jsi::Object& b) const { return objectRef(a) == objectRef(b); } -bool JSCRuntime::instanceOf(const jsi::Object &o, const jsi::Function &f) { +bool JSCRuntime::instanceOf(const jsi::Object& o, const jsi::Function& f) { JSValueRef exc = nullptr; bool res = JSValueIsInstanceOfConstructor(ctx_, objectRef(o), objectRef(f), &exc); @@ -1405,7 +1402,7 @@ bool JSCRuntime::instanceOf(const jsi::Object &o, const jsi::Function &f) { return res; } -jsi::Runtime::PointerValue *JSCRuntime::makeSymbolValue( +jsi::Runtime::PointerValue* JSCRuntime::makeSymbolValue( JSValueRef symbolRef) const { #ifndef NDEBUG return new JSCSymbolValue(ctx_, ctxInvalid_, symbolRef, symbolCounter_); @@ -1421,7 +1418,7 @@ JSStringRef getEmptyString() { } } // namespace -jsi::Runtime::PointerValue *JSCRuntime::makeStringValue( +jsi::Runtime::PointerValue* JSCRuntime::makeStringValue( JSStringRef stringRef) const { if (!stringRef) { stringRef = getEmptyString(); @@ -1445,7 +1442,7 @@ jsi::PropNameID JSCRuntime::createPropNameID(JSStringRef str) { return make(makeStringValue(str)); } -jsi::Runtime::PointerValue *JSCRuntime::makeObjectValue( +jsi::Runtime::PointerValue* JSCRuntime::makeObjectValue( JSObjectRef objectRef) const { if (!objectRef) { objectRef = JSObjectMake(ctx_, nullptr, nullptr); @@ -1496,7 +1493,7 @@ jsi::Value JSCRuntime::createValue(JSValueRef value) const { } } -JSValueRef JSCRuntime::valueRef(const jsi::Value &value) { +JSValueRef JSCRuntime::valueRef(const jsi::Value& value) { // I would rather switch on value.kind_ if (value.isUndefined()) { return JSValueMakeUndefined(ctx_); @@ -1518,26 +1515,26 @@ JSValueRef JSCRuntime::valueRef(const jsi::Value &value) { } } -JSValueRef JSCRuntime::symbolRef(const jsi::Symbol &sym) { - return static_cast(getPointerValue(sym))->sym_; +JSValueRef JSCRuntime::symbolRef(const jsi::Symbol& sym) { + return static_cast(getPointerValue(sym))->sym_; } -JSStringRef JSCRuntime::stringRef(const jsi::String &str) { - return static_cast(getPointerValue(str))->str_; +JSStringRef JSCRuntime::stringRef(const jsi::String& str) { + return static_cast(getPointerValue(str))->str_; } -JSStringRef JSCRuntime::stringRef(const jsi::PropNameID &sym) { - return static_cast(getPointerValue(sym))->str_; +JSStringRef JSCRuntime::stringRef(const jsi::PropNameID& sym) { + return static_cast(getPointerValue(sym))->str_; } -JSObjectRef JSCRuntime::objectRef(const jsi::Object &obj) { - return static_cast(getPointerValue(obj))->obj_; +JSObjectRef JSCRuntime::objectRef(const jsi::Object& obj) { + return static_cast(getPointerValue(obj))->obj_; } #ifdef RN_FABRIC_ENABLED -JSObjectRef JSCRuntime::objectRef(const jsi::WeakObject &obj) { +JSObjectRef JSCRuntime::objectRef(const jsi::WeakObject& obj) { // TODO: revisit this implementation - return static_cast(getPointerValue(obj))->obj_; + return static_cast(getPointerValue(obj))->obj_; } #endif @@ -1553,7 +1550,7 @@ void JSCRuntime::checkException(JSValueRef res, JSValueRef exc) { } } -void JSCRuntime::checkException(JSValueRef exc, const char *msg) { +void JSCRuntime::checkException(JSValueRef exc, const char* msg) { if (JSC_UNLIKELY(exc)) { throw jsi::JSError(std::string(msg), *this, createValue(exc)); } @@ -1562,7 +1559,7 @@ void JSCRuntime::checkException(JSValueRef exc, const char *msg) { void JSCRuntime::checkException( JSValueRef res, JSValueRef exc, - const char *msg) { + const char* msg) { if (JSC_UNLIKELY(!res)) { throw jsi::JSError(std::string(msg), *this, createValue(exc)); } diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp index 8b25ff1e95b..dbd7551b6fa 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp +++ b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.cpp @@ -17,7 +17,7 @@ namespace facebook::react { using facebook::react::JSErrorHandlerKey; static MapBuffer -parseErrorStack(const jsi::JSError &error, bool isFatal, bool isHermes) { +parseErrorStack(const jsi::JSError& error, bool isFatal, bool isHermes) { /** * This parses the different stack traces and puts them into one format * This borrows heavily from TraceKit (https://github.com/occ/TraceKit) @@ -95,7 +95,7 @@ JsErrorHandler::JsErrorHandler( JsErrorHandler::~JsErrorHandler() {} -void JsErrorHandler::handleJsError(const jsi::JSError &error, bool isFatal) { +void JsErrorHandler::handleJsError(const jsi::JSError& error, bool isFatal) { // TODO: Current error parsing works and is stable. Can investigate using // REGEX_HERMES to get additional Hermes data, though it requires JS setup. MapBuffer errorMap = parseErrorStack(error, isFatal, false); diff --git a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h index a188169a670..558bda29e5d 100644 --- a/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h +++ b/packages/react-native/ReactCommon/jserrorhandler/JsErrorHandler.h @@ -30,7 +30,7 @@ class JsErrorHandler { JsErrorHandler(JsErrorHandlingFunc jsErrorHandlingFunc); ~JsErrorHandler(); - void handleJsError(const jsi::JSError &error, bool isFatal); + void handleJsError(const jsi::JSError& error, bool isFatal); private: JsErrorHandlingFunc _jsErrorHandlingFunc; diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp index 59898a1798d..279e45a056d 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp +++ b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp @@ -31,7 +31,7 @@ class JSIExecutor::NativeModuleProxy : public jsi::HostObject { NativeModuleProxy(std::shared_ptr nativeModules) : weakNativeModules_(nativeModules) {} - Value get(Runtime &rt, const PropNameID &name) override { + Value get(Runtime& rt, const PropNameID& name) override { if (name.utf8(rt) == "name") { return jsi::String::createFromAscii(rt, "NativeModules"); } @@ -44,7 +44,7 @@ class JSIExecutor::NativeModuleProxy : public jsi::HostObject { return nativeModules->getModule(rt, name); } - void set(Runtime &, const PropNameID &, const Value &) override { + void set(Runtime&, const PropNameID&, const Value&) override { throw std::runtime_error( "Unable to put on NativeModules: Operation unsupported"); } @@ -56,7 +56,7 @@ class JSIExecutor::NativeModuleProxy : public jsi::HostObject { namespace { // basename_r isn't in all iOS SDKs, so use this simple version instead. -std::string simpleBasename(const std::string &path) { +std::string simpleBasename(const std::string& path) { size_t pos = path.rfind("/"); return (pos != std::string::npos) ? path.substr(pos) : path; } @@ -66,7 +66,7 @@ std::string simpleBasename(const std::string &path) { JSIExecutor::JSIExecutor( std::shared_ptr runtime, std::shared_ptr delegate, - const JSIScopedTimeoutInvoker &scopedTimeoutInvoker, + const JSIScopedTimeoutInvoker& scopedTimeoutInvoker, RuntimeInstaller runtimeInstaller) : runtime_(runtime), delegate_(delegate), @@ -98,9 +98,9 @@ void JSIExecutor::initializeRuntime() { PropNameID::forAscii(*runtime_, "nativeFlushQueueImmediate"), 1, [this]( - jsi::Runtime &, - const jsi::Value &, - const jsi::Value *args, + jsi::Runtime&, + const jsi::Value&, + const jsi::Value* args, size_t count) { if (count != 1) { throw std::invalid_argument( @@ -118,9 +118,9 @@ void JSIExecutor::initializeRuntime() { PropNameID::forAscii(*runtime_, "nativeCallSyncHook"), 1, [this]( - jsi::Runtime &, - const jsi::Value &, - const jsi::Value *args, + jsi::Runtime&, + const jsi::Value&, + const jsi::Value* args, size_t count) { return nativeCallSyncHook(args, count); })); runtime_->global().setProperty( @@ -131,9 +131,9 @@ void JSIExecutor::initializeRuntime() { PropNameID::forAscii(*runtime_, "globalEvalWithSourceUrl"), 1, [this]( - jsi::Runtime &, - const jsi::Value &, - const jsi::Value *args, + jsi::Runtime&, + const jsi::Value&, + const jsi::Value* args, size_t count) { return globalEvalWithSourceUrl(args, count); })); if (runtimeInstaller_) { @@ -178,9 +178,9 @@ void JSIExecutor::setBundleRegistry(std::unique_ptr r) { PropNameID::forAscii(*runtime_, "nativeRequire"), 2, [this]( - [[maybe_unused]] Runtime &rt, - const facebook::jsi::Value &, - const facebook::jsi::Value *args, + [[maybe_unused]] Runtime& rt, + const facebook::jsi::Value&, + const facebook::jsi::Value* args, size_t count) { return nativeRequire(args, count); })); } bundleRegistry_ = std::move(r); @@ -188,7 +188,7 @@ void JSIExecutor::setBundleRegistry(std::unique_ptr r) { void JSIExecutor::registerBundle( uint32_t bundleId, - const std::string &bundlePath) { + const std::string& bundlePath) { const auto tag = folly::to(bundleId); ReactMarker::logTaggedMarker( ReactMarker::REGISTER_JS_SEGMENT_START, tag.c_str()); @@ -209,7 +209,7 @@ void JSIExecutor::registerBundle( } // Looping on \c drainMicrotasks until it completes or hits the retries bound. -static void performMicrotaskCheckpoint(jsi::Runtime &runtime) { +static void performMicrotaskCheckpoint(jsi::Runtime& runtime) { uint8_t retries = 0; // A heuristic number to guard infinite or absurd numbers of retries. const static unsigned int kRetriesBound = 255; @@ -221,7 +221,7 @@ static void performMicrotaskCheckpoint(jsi::Runtime &runtime) { if (runtime.drainMicrotasks()) { break; } - } catch (jsi::JSError &error) { + } catch (jsi::JSError& error) { handleJSError(runtime, error, true); } retries++; @@ -233,9 +233,9 @@ static void performMicrotaskCheckpoint(jsi::Runtime &runtime) { } void JSIExecutor::callFunction( - const std::string &moduleId, - const std::string &methodId, - const folly::dynamic &arguments) { + const std::string& moduleId, + const std::string& methodId, + const folly::dynamic& arguments) { SystraceSection s( "JSIExecutor::callFunction", "moduleId", moduleId, "methodId", methodId); if (!callFunctionReturnFlushedQueue_) { @@ -274,7 +274,7 @@ void JSIExecutor::callFunction( void JSIExecutor::invokeCallback( const double callbackId, - const folly::dynamic &arguments) { + const folly::dynamic& arguments) { SystraceSection s("JSIExecutor::invokeCallback", "callbackId", callbackId); if (!invokeCallbackAndReturnFlushedQueue_) { bindBridge(); @@ -302,7 +302,7 @@ void JSIExecutor::setGlobalVariable( propName.c_str(), Value::createFromJsonUtf8( *runtime_, - reinterpret_cast(jsonValue->c_str()), + reinterpret_cast(jsonValue->c_str()), jsonValue->size())); } @@ -310,7 +310,7 @@ std::string JSIExecutor::getDescription() { return "JSI (" + runtime_->description() + ")"; } -void *JSIExecutor::getJavaScriptContext() { +void* JSIExecutor::getJavaScriptContext() { return runtime_.get(); } @@ -330,7 +330,7 @@ void JSIExecutor::handleMemoryPressure(int pressureLevel) { TRIM_MEMORY_RUNNING_MODERATE = 5, TRIM_MEMORY_UI_HIDDEN = 20, }; - const char *levelName; + const char* levelName; switch (pressureLevel) { case TRIM_MEMORY_BACKGROUND: levelName = "TRIM_MEMORY_BACKGROUND"; @@ -406,7 +406,7 @@ void JSIExecutor::bindBridge() { }); } -void JSIExecutor::callNativeModules(const Value &queue, bool isEndOfBatch) { +void JSIExecutor::callNativeModules(const Value& queue, bool isEndOfBatch) { SystraceSection s("JSIExecutor::callNativeModules"); // If this fails, you need to pass a fully functional delegate with a // module registry to the factory/ctor. @@ -455,7 +455,7 @@ void JSIExecutor::flush() { } } -Value JSIExecutor::nativeRequire(const Value *args, size_t count) { +Value JSIExecutor::nativeRequire(const Value* args, size_t count) { if (count > 2 || count == 0) { throw std::invalid_argument("Got wrong number of args"); } @@ -469,7 +469,7 @@ Value JSIExecutor::nativeRequire(const Value *args, size_t count) { return facebook::jsi::Value(); } -Value JSIExecutor::nativeCallSyncHook(const Value *args, size_t count) { +Value JSIExecutor::nativeCallSyncHook(const Value* args, size_t count) { if (count != 3) { throw std::invalid_argument("nativeCallSyncHook arg count must be 3"); } @@ -530,7 +530,7 @@ Value JSIExecutor::nativeCallSyncHook(const Value *args, size_t count) { return returnValue; } -Value JSIExecutor::globalEvalWithSourceUrl(const Value *args, size_t count) { +Value JSIExecutor::globalEvalWithSourceUrl(const Value* args, size_t count) { if (count != 1 && count != 2) { throw std::invalid_argument( "globalEvalWithSourceUrl arg count must be 1 or 2"); @@ -546,7 +546,7 @@ Value JSIExecutor::globalEvalWithSourceUrl(const Value *args, size_t count) { std::make_unique(std::move(code)), url); } -void bindNativeLogger(Runtime &runtime, Logger logger) { +void bindNativeLogger(Runtime& runtime, Logger logger) { runtime.global().setProperty( runtime, "nativeLoggingHook", @@ -555,9 +555,9 @@ void bindNativeLogger(Runtime &runtime, Logger logger) { PropNameID::forAscii(runtime, "nativeLoggingHook"), 2, [logger = std::move(logger)]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *args, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* args, size_t count) { if (count != 2) { throw std::invalid_argument( @@ -570,7 +570,7 @@ void bindNativeLogger(Runtime &runtime, Logger logger) { })); } -void bindNativePerformanceNow(Runtime &runtime) { +void bindNativePerformanceNow(Runtime& runtime) { runtime.global().setProperty( runtime, "nativePerformanceNow", @@ -578,9 +578,9 @@ void bindNativePerformanceNow(Runtime &runtime) { runtime, PropNameID::forAscii(runtime, "nativePerformanceNow"), 0, - [](jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *args, + [](jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* args, size_t count) { return Value(JSExecutor::performanceNow()); })); } diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h index d5101df849f..f76b66482fd 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h +++ b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h @@ -48,7 +48,7 @@ namespace facebook::react { // }) // using JSIScopedTimeoutInvoker = std::function &invokee, + const std::function& invokee, std::function errorMessageProducer)>; class BigStringBuffer : public jsi::Buffer { @@ -60,8 +60,8 @@ class BigStringBuffer : public jsi::Buffer { return script_->size(); } - const uint8_t *data() const override { - return reinterpret_cast(script_->c_str()); + const uint8_t* data() const override { + return reinterpret_cast(script_->c_str()); } private: @@ -70,38 +70,38 @@ class BigStringBuffer : public jsi::Buffer { class JSIExecutor : public JSExecutor { public: - using RuntimeInstaller = std::function; + using RuntimeInstaller = std::function; JSIExecutor( std::shared_ptr runtime, std::shared_ptr delegate, - const JSIScopedTimeoutInvoker &timeoutInvoker, + const JSIScopedTimeoutInvoker& timeoutInvoker, RuntimeInstaller runtimeInstaller); void initializeRuntime() override; void loadBundle( std::unique_ptr script, std::string sourceURL) override; void setBundleRegistry(std::unique_ptr) override; - void registerBundle(uint32_t bundleId, const std::string &bundlePath) + void registerBundle(uint32_t bundleId, const std::string& bundlePath) override; void callFunction( - const std::string &moduleId, - const std::string &methodId, - const folly::dynamic &arguments) override; - void invokeCallback(const double callbackId, const folly::dynamic &arguments) + const std::string& moduleId, + const std::string& methodId, + const folly::dynamic& arguments) override; + void invokeCallback(const double callbackId, const folly::dynamic& arguments) override; void setGlobalVariable( std::string propName, std::unique_ptr jsonValue) override; std::string getDescription() override; - void *getJavaScriptContext() override; + void* getJavaScriptContext() override; bool isInspectable() override; void handleMemoryPressure(int pressureLevel) override; // An implementation of JSIScopedTimeoutInvoker that simply runs the // invokee, with no timeout. static void defaultTimeoutInvoker( - const std::function &invokee, + const std::function& invokee, std::function errorMessageProducer) { (void)errorMessageProducer; invokee(); @@ -113,10 +113,10 @@ class JSIExecutor : public JSExecutor { class NativeModuleProxy; void bindBridge(); - void callNativeModules(const jsi::Value &queue, bool isEndOfBatch); - jsi::Value nativeCallSyncHook(const jsi::Value *args, size_t count); - jsi::Value nativeRequire(const jsi::Value *args, size_t count); - jsi::Value globalEvalWithSourceUrl(const jsi::Value *args, size_t count); + void callNativeModules(const jsi::Value& queue, bool isEndOfBatch); + jsi::Value nativeCallSyncHook(const jsi::Value* args, size_t count); + jsi::Value nativeRequire(const jsi::Value* args, size_t count); + jsi::Value globalEvalWithSourceUrl(const jsi::Value* args, size_t count); std::shared_ptr runtime_; std::shared_ptr delegate_; @@ -133,10 +133,10 @@ class JSIExecutor : public JSExecutor { }; using Logger = - std::function; -void bindNativeLogger(jsi::Runtime &runtime, Logger logger); + std::function; +void bindNativeLogger(jsi::Runtime& runtime, Logger logger); -void bindNativePerformanceNow(jsi::Runtime &runtime); +void bindNativePerformanceNow(jsi::Runtime& runtime); double performanceNow(); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp index 15919802a43..56503c683e4 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp +++ b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.cpp @@ -24,7 +24,7 @@ JSINativeModules::JSINativeModules( std::shared_ptr moduleRegistry) : m_moduleRegistry(std::move(moduleRegistry)) {} -Value JSINativeModules::getModule(Runtime &rt, const PropNameID &name) { +Value JSINativeModules::getModule(Runtime& rt, const PropNameID& name) { if (!m_moduleRegistry) { return nullptr; } @@ -65,8 +65,8 @@ void JSINativeModules::reset() { } std::optional JSINativeModules::createModule( - Runtime &rt, - const std::string &name) { + Runtime& rt, + const std::string& name) { bool hasLogger(ReactMarker::logTaggedMarkerImpl); if (hasLogger) { ReactMarker::logTaggedMarker( diff --git a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h index 365158f6207..9b63e9438b9 100644 --- a/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h +++ b/packages/react-native/ReactCommon/jsiexecutor/jsireact/JSINativeModules.h @@ -22,7 +22,7 @@ namespace facebook::react { class JSINativeModules { public: explicit JSINativeModules(std::shared_ptr moduleRegistry); - jsi::Value getModule(jsi::Runtime &rt, const jsi::PropNameID &name); + jsi::Value getModule(jsi::Runtime& rt, const jsi::PropNameID& name); void reset(); private: @@ -31,8 +31,8 @@ class JSINativeModules { std::unordered_map m_objects; std::optional createModule( - jsi::Runtime &rt, - const std::string &name); + jsi::Runtime& rt, + const std::string& name); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.cpp b/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.cpp index ba9c73d6eb2..93ab7fad40d 100644 --- a/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.cpp +++ b/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.cpp @@ -26,8 +26,8 @@ namespace { class InspectorImpl : public IInspector { public: int addPage( - const std::string &title, - const std::string &vm, + const std::string& title, + const std::string& vm, ConnectFunc connectFunc) override; void removePage(int pageId) override; @@ -44,8 +44,8 @@ class InspectorImpl : public IInspector { }; int InspectorImpl::addPage( - const std::string &title, - const std::string &vm, + const std::string& title, + const std::string& vm, ConnectFunc connectFunc) { std::scoped_lock lock(mutex_); @@ -67,7 +67,7 @@ std::vector InspectorImpl::getPages() const { std::scoped_lock lock(mutex_); std::vector inspectorPages; - for (auto &it : titles_) { + for (auto& it : titles_) { inspectorPages.push_back(InspectorPage{ it.first, std::get<0>(it.second), std::get<1>(it.second)}); } @@ -94,7 +94,7 @@ std::unique_ptr InspectorImpl::connect( } // namespace -IInspector &getInspectorInstance() { +IInspector& getInspectorInstance() { static InspectorImpl instance; return instance; } diff --git a/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.h b/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.h index 115a56382c8..c92e41db907 100644 --- a/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.h +++ b/packages/react-native/ReactCommon/jsinspector/InspectorInterfaces.h @@ -63,8 +63,8 @@ class JSINSPECTOR_EXPORT IInspector : public IDestructible { /// addPage is called by the VM to add a page to the list of debuggable pages. virtual int addPage( - const std::string &title, - const std::string &vm, + const std::string& title, + const std::string& vm, ConnectFunc connectFunc) = 0; /// removePage is called by the VM to remove a page from the list of @@ -83,7 +83,7 @@ class JSINSPECTOR_EXPORT IInspector : public IDestructible { /// getInspectorInstance retrieves the singleton inspector that tracks all /// debuggable pages in this process. -extern IInspector &getInspectorInstance(); +extern IInspector& getInspectorInstance(); /// makeTestInspectorInstance creates an independent inspector instance that /// should only be used in tests. diff --git a/packages/react-native/ReactCommon/logger/react_native_log.cpp b/packages/react-native/ReactCommon/logger/react_native_log.cpp index ba89efcd1fd..6f032a06b28 100644 --- a/packages/react-native/ReactCommon/logger/react_native_log.cpp +++ b/packages/react-native/ReactCommon/logger/react_native_log.cpp @@ -13,20 +13,20 @@ static reactnativelogfunctype _reactnativelogfunc = NULL; void set_react_native_logfunc(reactnativelogfunctype newlogfunc) { _reactnativelogfunc = newlogfunc; } -void react_native_log_info(const char *message) { +void react_native_log_info(const char* message) { _react_native_log(ReactNativeLogLevelInfo, message); } -void react_native_log_warn(const char *message) { +void react_native_log_warn(const char* message) { _react_native_log(ReactNativeLogLevelWarning, message); } -void react_native_log_error(const char *message) { +void react_native_log_error(const char* message) { _react_native_log(ReactNativeLogLevelError, message); } -void react_native_log_fatal(const char *message) { +void react_native_log_fatal(const char* message) { _react_native_log(ReactNativeLogLevelFatal, message); } -void _react_native_log(ReactNativeLogLevel level, const char *message) { +void _react_native_log(ReactNativeLogLevel level, const char* message) { if (_reactnativelogfunc == NULL) { _react_native_log_default(level, message); } else { @@ -34,7 +34,7 @@ void _react_native_log(ReactNativeLogLevel level, const char *message) { } } -void _react_native_log_default(ReactNativeLogLevel level, const char *message) { +void _react_native_log_default(ReactNativeLogLevel level, const char* message) { switch (level) { case ReactNativeLogLevelInfo: LOG(INFO) << message; diff --git a/packages/react-native/ReactCommon/logger/react_native_log.h b/packages/react-native/ReactCommon/logger/react_native_log.h index 9ac23eeaaca..5f585efa428 100644 --- a/packages/react-native/ReactCommon/logger/react_native_log.h +++ b/packages/react-native/ReactCommon/logger/react_native_log.h @@ -14,20 +14,20 @@ enum ReactNativeLogLevel { ReactNativeLogLevelFatal = 4 }; -typedef void (*reactnativelogfunctype)(ReactNativeLogLevel, const char *); +typedef void (*reactnativelogfunctype)(ReactNativeLogLevel, const char*); #ifdef __cplusplus extern "C" { #endif // __cplusplus void set_react_native_logfunc(reactnativelogfunctype newlogfunc); -void react_native_log_info(const char *text); -void react_native_log_warn(const char *text); -void react_native_log_error(const char *text); -void react_native_log_fatal(const char *text); +void react_native_log_info(const char* text); +void react_native_log_warn(const char* text); +void react_native_log_error(const char* text); +void react_native_log_fatal(const char* text); -void _react_native_log(ReactNativeLogLevel level, const char *text); -void _react_native_log_default(ReactNativeLogLevel level, const char *text); +void _react_native_log(ReactNativeLogLevel level, const char* text); +void _react_native_log_default(ReactNativeLogLevel level, const char* text); #ifdef __cplusplus } #endif // __cpusplus diff --git a/packages/react-native/ReactCommon/react/bridging/AString.h b/packages/react-native/ReactCommon/react/bridging/AString.h index cad91246ae4..0592955320d 100644 --- a/packages/react-native/ReactCommon/react/bridging/AString.h +++ b/packages/react-native/ReactCommon/react/bridging/AString.h @@ -16,25 +16,25 @@ namespace facebook::react { template <> struct Bridging { - static std::string fromJs(jsi::Runtime &rt, const jsi::String &value) { + static std::string fromJs(jsi::Runtime& rt, const jsi::String& value) { return value.utf8(rt); } - static jsi::String toJs(jsi::Runtime &rt, const std::string &value) { + static jsi::String toJs(jsi::Runtime& rt, const std::string& value) { return jsi::String::createFromUtf8(rt, value); } }; template <> struct Bridging { - static jsi::String toJs(jsi::Runtime &rt, std::string_view value) { + static jsi::String toJs(jsi::Runtime& rt, std::string_view value) { return jsi::String::createFromUtf8( - rt, reinterpret_cast(value.data()), value.length()); + rt, reinterpret_cast(value.data()), value.length()); } }; template <> -struct Bridging : Bridging {}; +struct Bridging : Bridging {}; template struct Bridging : Bridging {}; diff --git a/packages/react-native/ReactCommon/react/bridging/Array.h b/packages/react-native/ReactCommon/react/bridging/Array.h index af36c392d06..2814e5f6ae2 100644 --- a/packages/react-native/ReactCommon/react/bridging/Array.h +++ b/packages/react-native/ReactCommon/react/bridging/Array.h @@ -25,18 +25,18 @@ namespace array_detail { template struct BridgingStatic { static jsi::Array toJs( - jsi::Runtime &rt, - const T &array, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const T& array, + const std::shared_ptr& jsInvoker) { return toJs(rt, array, jsInvoker, std::make_index_sequence{}); } private: template static jsi::Array toJs( - facebook::jsi::Runtime &rt, - const T &array, - const std::shared_ptr &jsInvoker, + facebook::jsi::Runtime& rt, + const T& array, + const std::shared_ptr& jsInvoker, std::index_sequence) { return jsi::Array::createWithElements( rt, bridging::toJs(rt, std::get(array), jsInvoker)...); @@ -46,13 +46,13 @@ struct BridgingStatic { template struct BridgingDynamic { static jsi::Array toJs( - jsi::Runtime &rt, - const T &list, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const T& list, + const std::shared_ptr& jsInvoker) { jsi::Array result(rt, list.size()); size_t index = 0; - for (const auto &item : list) { + for (const auto& item : list) { result.setValueAtIndex(rt, index++, bridging::toJs(rt, item, jsInvoker)); } @@ -89,9 +89,9 @@ template struct Bridging> : array_detail::BridgingDynamic> { static std::vector fromJs( - facebook::jsi::Runtime &rt, - const jsi::Array &array, - const std::shared_ptr &jsInvoker) { + facebook::jsi::Runtime& rt, + const jsi::Array& array, + const std::shared_ptr& jsInvoker) { size_t length = array.length(rt); std::vector vector; @@ -109,9 +109,9 @@ struct Bridging> template struct Bridging> : array_detail::BridgingDynamic> { static std::set fromJs( - facebook::jsi::Runtime &rt, - const jsi::Array &array, - const std::shared_ptr &jsInvoker) { + facebook::jsi::Runtime& rt, + const jsi::Array& array, + const std::shared_ptr& jsInvoker) { size_t length = array.length(rt); std::set set; diff --git a/packages/react-native/ReactCommon/react/bridging/Base.h b/packages/react-native/ReactCommon/react/bridging/Base.h index 0de8aa19e7b..f351872eef5 100644 --- a/packages/react-native/ReactCommon/react/bridging/Base.h +++ b/packages/react-native/ReactCommon/react/bridging/Base.h @@ -24,7 +24,7 @@ struct Bridging; template <> struct Bridging { // Highly generic code may result in "casting" to void. - static void fromJs(jsi::Runtime &, const jsi::Value &) {} + static void fromJs(jsi::Runtime&, const jsi::Value&) {} }; namespace bridging { @@ -62,13 +62,13 @@ template using bridging_t = typename detail::bridging_wrapper::type; template , int> = 0> -auto fromJs(jsi::Runtime &rt, T &&value, const std::shared_ptr &) +auto fromJs(jsi::Runtime& rt, T&& value, const std::shared_ptr&) -> decltype(static_cast(convert(rt, std::forward(value)))) { return convert(rt, std::forward(value)); } template -auto fromJs(jsi::Runtime &rt, T &&value, const std::shared_ptr &) +auto fromJs(jsi::Runtime& rt, T&& value, const std::shared_ptr&) -> decltype(Bridging>::fromJs( rt, convert(rt, std::forward(value)))) { @@ -78,9 +78,9 @@ auto fromJs(jsi::Runtime &rt, T &&value, const std::shared_ptr &) template auto fromJs( - jsi::Runtime &rt, - T &&value, - const std::shared_ptr &jsInvoker) + jsi::Runtime& rt, + T&& value, + const std::shared_ptr& jsInvoker) -> decltype(Bridging>::fromJs( rt, convert(rt, std::forward(value)), @@ -91,26 +91,26 @@ auto fromJs( template , int> = 0> auto toJs( - jsi::Runtime &rt, - T &&value, - const std::shared_ptr & = nullptr) -> remove_cvref_t { + jsi::Runtime& rt, + T&& value, + const std::shared_ptr& = nullptr) -> remove_cvref_t { return convert(rt, std::forward(value)); } template auto toJs( - jsi::Runtime &rt, - T &&value, - const std::shared_ptr & = nullptr) + jsi::Runtime& rt, + T&& value, + const std::shared_ptr& = nullptr) -> decltype(Bridging>::toJs(rt, std::forward(value))) { return Bridging>::toJs(rt, std::forward(value)); } template auto toJs( - jsi::Runtime &rt, - T &&value, - const std::shared_ptr &jsInvoker) + jsi::Runtime& rt, + T&& value, + const std::shared_ptr& jsInvoker) -> decltype(Bridging>::toJs( rt, std::forward(value), @@ -126,7 +126,7 @@ inline constexpr bool supportsFromJs< T, Arg, std::void_t( - std::declval(), + std::declval(), std::declval(), nullptr))>> = true; @@ -138,12 +138,12 @@ inline constexpr bool supportsToJs< T, Ret, std::void_t(), + std::declval(), std::declval(), nullptr))>> = std::is_convertible_v< decltype(toJs( - std::declval(), + std::declval(), std::declval(), nullptr)), Ret>; diff --git a/packages/react-native/ReactCommon/react/bridging/Bool.h b/packages/react-native/ReactCommon/react/bridging/Bool.h index b720e120aee..f81d3f9fc26 100644 --- a/packages/react-native/ReactCommon/react/bridging/Bool.h +++ b/packages/react-native/ReactCommon/react/bridging/Bool.h @@ -13,11 +13,11 @@ namespace facebook::react { template <> struct Bridging { - static bool fromJs(jsi::Runtime &rt, const jsi::Value &value) { + static bool fromJs(jsi::Runtime& rt, const jsi::Value& value) { return value.asBool(); } - static jsi::Value toJs(jsi::Runtime &, bool value) { + static jsi::Value toJs(jsi::Runtime&, bool value) { return value; } }; diff --git a/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h b/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h index 03bb1b12ab3..9efa29628e3 100644 --- a/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h +++ b/packages/react-native/ReactCommon/react/bridging/CallbackWrapper.h @@ -18,21 +18,21 @@ namespace facebook::react { class CallbackWrapper : public LongLivedObject { private: CallbackWrapper( - jsi::Function &&callback, - jsi::Runtime &runtime, + jsi::Function&& callback, + jsi::Runtime& runtime, std::shared_ptr jsInvoker) : callback_(std::move(callback)), runtime_(runtime), jsInvoker_(std::move(jsInvoker)) {} jsi::Function callback_; - jsi::Runtime &runtime_; + jsi::Runtime& runtime_; std::shared_ptr jsInvoker_; public: static std::weak_ptr createWeak( - jsi::Function &&callback, - jsi::Runtime &runtime, + jsi::Function&& callback, + jsi::Runtime& runtime, std::shared_ptr jsInvoker) { auto wrapper = std::shared_ptr(new CallbackWrapper( std::move(callback), runtime, std::move(jsInvoker))); @@ -45,15 +45,15 @@ class CallbackWrapper : public LongLivedObject { allowRelease(); } - jsi::Function &callback() { + jsi::Function& callback() { return callback_; } - jsi::Runtime &runtime() { + jsi::Runtime& runtime() { return runtime_; } - CallInvoker &jsInvoker() { + CallInvoker& jsInvoker() { return *(jsInvoker_); } diff --git a/packages/react-native/ReactCommon/react/bridging/Class.h b/packages/react-native/ReactCommon/react/bridging/Class.h index 24217db66c9..61fa82e338c 100644 --- a/packages/react-native/ReactCommon/react/bridging/Class.h +++ b/packages/react-native/ReactCommon/react/bridging/Class.h @@ -18,11 +18,11 @@ template < typename... Args, typename... JSArgs> T callFromJs( - jsi::Runtime &rt, - R (C::*method)(jsi::Runtime &, Args...), - const std::shared_ptr &jsInvoker, - C *instance, - JSArgs &&...args) { + jsi::Runtime& rt, + R (C::*method)(jsi::Runtime&, Args...), + const std::shared_ptr& jsInvoker, + C* instance, + JSArgs&&... args) { static_assert( sizeof...(Args) == sizeof...(JSArgs), "Incorrect arguments length"); static_assert( diff --git a/packages/react-native/ReactCommon/react/bridging/Convert.h b/packages/react-native/ReactCommon/react/bridging/Convert.h index 43d35ed5059..8ed1666a64a 100644 --- a/packages/react-native/ReactCommon/react/bridging/Convert.h +++ b/packages/react-native/ReactCommon/react/bridging/Convert.h @@ -48,7 +48,7 @@ template struct ConverterBase { using BaseT = remove_cvref_t; - ConverterBase(jsi::Runtime &rt, T &&value) + ConverterBase(jsi::Runtime& rt, T&& value) : rt_(rt), value_(std::forward(value)) {} operator BaseT() && { @@ -89,7 +89,7 @@ struct ConverterBase { operator U() && = delete; // Prevent unwanted upcasting of JSI values. protected: - jsi::Runtime &rt_; + jsi::Runtime& rt_; T value_; }; @@ -134,7 +134,7 @@ struct Converter : public ConverterBase { template struct Converter> : public ConverterBase { - Converter(jsi::Runtime &rt, std::optional value) + Converter(jsi::Runtime& rt, std::optional value) : ConverterBase(rt, value ? std::move(*value) : jsi::Value::null()) {} operator std::optional() && { @@ -146,24 +146,24 @@ struct Converter> : public ConverterBase { }; template , int> = 0> -auto convert(jsi::Runtime &rt, T &&value) { +auto convert(jsi::Runtime& rt, T&& value) { return Converter(rt, std::forward(value)); } template < typename T, std::enable_if_t || std::is_scalar_v, int> = 0> -auto convert(jsi::Runtime &rt, std::optional value) { +auto convert(jsi::Runtime& rt, std::optional value) { return Converter>(rt, std::move(value)); } template , int> = 0> -auto convert(jsi::Runtime &rt, T &&value) { +auto convert(jsi::Runtime& rt, T&& value) { return value; } template -auto convert(jsi::Runtime &rt, Converter &&converter) { +auto convert(jsi::Runtime& rt, Converter&& converter) { return std::move(converter); } diff --git a/packages/react-native/ReactCommon/react/bridging/Dynamic.h b/packages/react-native/ReactCommon/react/bridging/Dynamic.h index be9555b49d5..90d1954386f 100644 --- a/packages/react-native/ReactCommon/react/bridging/Dynamic.h +++ b/packages/react-native/ReactCommon/react/bridging/Dynamic.h @@ -14,11 +14,11 @@ namespace facebook::react { template <> struct Bridging { - static folly::dynamic fromJs(jsi::Runtime &rt, const jsi::Value &value) { + static folly::dynamic fromJs(jsi::Runtime& rt, const jsi::Value& value) { return jsi::dynamicFromValue(rt, value); } - static jsi::Value toJs(jsi::Runtime &rt, const folly::dynamic &value) { + static jsi::Value toJs(jsi::Runtime& rt, const folly::dynamic& value) { return jsi::valueFromDynamic(rt, value); } }; diff --git a/packages/react-native/ReactCommon/react/bridging/Error.h b/packages/react-native/ReactCommon/react/bridging/Error.h index eed77305d70..e8b45973a33 100644 --- a/packages/react-native/ReactCommon/react/bridging/Error.h +++ b/packages/react-native/ReactCommon/react/bridging/Error.h @@ -16,9 +16,9 @@ class Error { // TODO (T114055466): Retain stack trace (at least caller location) Error(std::string message) : message_(std::move(message)) {} - Error(const char *message) : Error(std::string(message)) {} + Error(const char* message) : Error(std::string(message)) {} - const std::string &message() const { + const std::string& message() const { return message_; } @@ -28,22 +28,22 @@ class Error { template <> struct Bridging { - static jsi::JSError fromJs(jsi::Runtime &rt, const jsi::Value &value) { + static jsi::JSError fromJs(jsi::Runtime& rt, const jsi::Value& value) { return jsi::JSError(rt, jsi::Value(rt, value)); } - static jsi::JSError fromJs(jsi::Runtime &rt, jsi::Value &&value) { + static jsi::JSError fromJs(jsi::Runtime& rt, jsi::Value&& value) { return jsi::JSError(rt, std::move(value)); } - static jsi::Value toJs(jsi::Runtime &rt, std::string message) { + static jsi::Value toJs(jsi::Runtime& rt, std::string message) { return jsi::Value(rt, jsi::JSError(rt, std::move(message)).value()); } }; template <> struct Bridging { - static jsi::Value toJs(jsi::Runtime &rt, const Error &error) { + static jsi::Value toJs(jsi::Runtime& rt, const Error& error) { return jsi::Value(rt, jsi::JSError(rt, error.message()).value()); } }; diff --git a/packages/react-native/ReactCommon/react/bridging/Function.h b/packages/react-native/ReactCommon/react/bridging/Function.h index b1ba9520313..f479c509dc4 100644 --- a/packages/react-native/ReactCommon/react/bridging/Function.h +++ b/packages/react-native/ReactCommon/react/bridging/Function.h @@ -21,7 +21,7 @@ template class AsyncCallback { public: AsyncCallback( - jsi::Runtime &runtime, + jsi::Runtime& runtime, jsi::Function function, std::shared_ptr jsInvoker) : callback_(std::make_shared>( @@ -29,8 +29,8 @@ class AsyncCallback { std::move(function), std::move(jsInvoker))) {} - AsyncCallback(const AsyncCallback &) = default; - AsyncCallback &operator=(const AsyncCallback &) = default; + AsyncCallback(const AsyncCallback&) = default; + AsyncCallback& operator=(const AsyncCallback&) = default; void operator()(Args... args) const { call(std::forward(args)...); @@ -73,7 +73,7 @@ template class SyncCallback { public: SyncCallback( - jsi::Runtime &rt, + jsi::Runtime& rt, jsi::Function function, std::shared_ptr jsInvoker) : wrapper_(CallbackWrapper::createWeak( @@ -82,8 +82,8 @@ class SyncCallback { std::move(jsInvoker))) {} // Disallow moving to prevent function from get called on another thread. - SyncCallback(SyncCallback &&) = delete; - SyncCallback &operator=(SyncCallback &&) = delete; + SyncCallback(SyncCallback&&) = delete; + SyncCallback& operator=(SyncCallback&&) = delete; ~SyncCallback() { if (auto wrapper = wrapper_.lock()) { @@ -101,8 +101,8 @@ class SyncCallback { throw std::runtime_error("Failed to call invalidated sync callback"); } - auto &callback = wrapper->callback(); - auto &rt = wrapper->runtime(); + auto& callback = wrapper->callback(); + auto& rt = wrapper->runtime(); auto jsInvoker = wrapper->jsInvokerPtr(); if constexpr (std::is_void_v) { @@ -121,12 +121,12 @@ class SyncCallback { friend AsyncCallback; friend Bridging; - R apply(std::tuple &&args) const { + R apply(std::tuple&& args) const { return apply(std::move(args), std::index_sequence_for{}); } template - R apply(std::tuple &&args, std::index_sequence) const { + R apply(std::tuple&& args, std::index_sequence) const { return call(std::move(std::get(args))...); } @@ -137,15 +137,15 @@ class SyncCallback { template struct Bridging> { static AsyncCallback fromJs( - jsi::Runtime &rt, - jsi::Function &&value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + jsi::Function&& value, + const std::shared_ptr& jsInvoker) { return AsyncCallback(rt, std::move(value), jsInvoker); } static jsi::Function toJs( - jsi::Runtime &rt, - const AsyncCallback &value) { + jsi::Runtime& rt, + const AsyncCallback& value) { return value.callback_->function_.getFunction(rt); } }; @@ -153,15 +153,15 @@ struct Bridging> { template struct Bridging> { static SyncCallback fromJs( - jsi::Runtime &rt, - jsi::Function &&value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + jsi::Function&& value, + const std::shared_ptr& jsInvoker) { return SyncCallback(rt, std::move(value), jsInvoker); } static jsi::Function toJs( - jsi::Runtime &rt, - const SyncCallback &value) { + jsi::Runtime& rt, + const SyncCallback& value) { return value.function_.getFunction(rt); } }; @@ -174,17 +174,17 @@ struct Bridging> { static constexpr size_t kArgumentCount = sizeof...(Args); static jsi::Function toJs( - jsi::Runtime &rt, + jsi::Runtime& rt, Func fn, - const std::shared_ptr &jsInvoker) { + const std::shared_ptr& jsInvoker) { return jsi::Function::createFromHostFunction( rt, jsi::PropNameID::forAscii(rt, "BridgedFunction"), kArgumentCount, [fn = std::make_shared(std::move(fn)), jsInvoker]( - jsi::Runtime &rt, - const jsi::Value &, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value&, + const jsi::Value* args, size_t count) -> jsi::Value { if (count < kArgumentCount) { throw jsi::JSError(rt, "Incorrect number of arguments"); @@ -205,10 +205,10 @@ struct Bridging> { private: template static R callFromJs( - Func &fn, - jsi::Runtime &rt, - const jsi::Value *args, - const std::shared_ptr &jsInvoker, + Func& fn, + jsi::Runtime& rt, + const jsi::Value* args, + const std::shared_ptr& jsInvoker, std::index_sequence) { return fn(bridging::fromJs(rt, args[Index], jsInvoker)...); } diff --git a/packages/react-native/ReactCommon/react/bridging/LongLivedObject.cpp b/packages/react-native/ReactCommon/react/bridging/LongLivedObject.cpp index fb6c9b5783d..410f52d22ea 100644 --- a/packages/react-native/ReactCommon/react/bridging/LongLivedObject.cpp +++ b/packages/react-native/ReactCommon/react/bridging/LongLivedObject.cpp @@ -10,7 +10,7 @@ namespace facebook::react { // LongLivedObjectCollection -LongLivedObjectCollection &LongLivedObjectCollection::get() { +LongLivedObjectCollection& LongLivedObjectCollection::get() { static LongLivedObjectCollection instance; return instance; } @@ -20,7 +20,7 @@ void LongLivedObjectCollection::add(std::shared_ptr so) { collection_.insert(std::move(so)); } -void LongLivedObjectCollection::remove(const LongLivedObject *o) { +void LongLivedObjectCollection::remove(const LongLivedObject* o) { std::scoped_lock lock(collectionMutex_); for (auto p = collection_.begin(); p != collection_.end(); p++) { if (p->get() == o) { diff --git a/packages/react-native/ReactCommon/react/bridging/LongLivedObject.h b/packages/react-native/ReactCommon/react/bridging/LongLivedObject.h index ffca09d9e1e..5b29c42fb90 100644 --- a/packages/react-native/ReactCommon/react/bridging/LongLivedObject.h +++ b/packages/react-native/ReactCommon/react/bridging/LongLivedObject.h @@ -37,13 +37,13 @@ class LongLivedObject { */ class LongLivedObjectCollection { public: - static LongLivedObjectCollection &get(); + static LongLivedObjectCollection& get(); - LongLivedObjectCollection(const LongLivedObjectCollection &) = delete; - void operator=(const LongLivedObjectCollection &) = delete; + LongLivedObjectCollection(const LongLivedObjectCollection&) = delete; + void operator=(const LongLivedObjectCollection&) = delete; void add(std::shared_ptr o); - void remove(const LongLivedObject *o); + void remove(const LongLivedObject* o); void clear(); size_t size() const; diff --git a/packages/react-native/ReactCommon/react/bridging/Number.h b/packages/react-native/ReactCommon/react/bridging/Number.h index fdc39d425d1..6d480ae3364 100644 --- a/packages/react-native/ReactCommon/react/bridging/Number.h +++ b/packages/react-native/ReactCommon/react/bridging/Number.h @@ -13,44 +13,44 @@ namespace facebook::react { template <> struct Bridging { - static double fromJs(jsi::Runtime &, const jsi::Value &value) { + static double fromJs(jsi::Runtime&, const jsi::Value& value) { return value.asNumber(); } - static jsi::Value toJs(jsi::Runtime &, double value) { + static jsi::Value toJs(jsi::Runtime&, double value) { return value; } }; template <> struct Bridging { - static float fromJs(jsi::Runtime &, const jsi::Value &value) { + static float fromJs(jsi::Runtime&, const jsi::Value& value) { return (float)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime &, float value) { + static jsi::Value toJs(jsi::Runtime&, float value) { return (double)value; } }; template <> struct Bridging { - static int32_t fromJs(jsi::Runtime &, const jsi::Value &value) { + static int32_t fromJs(jsi::Runtime&, const jsi::Value& value) { return (int32_t)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime &, int32_t value) { + static jsi::Value toJs(jsi::Runtime&, int32_t value) { return value; } }; template <> struct Bridging { - static uint32_t fromJs(jsi::Runtime &, const jsi::Value &value) { + static uint32_t fromJs(jsi::Runtime&, const jsi::Value& value) { return (uint32_t)value.asNumber(); } - static jsi::Value toJs(jsi::Runtime &, uint32_t value) { + static jsi::Value toJs(jsi::Runtime&, uint32_t value) { return (double)value; } }; diff --git a/packages/react-native/ReactCommon/react/bridging/Object.h b/packages/react-native/ReactCommon/react/bridging/Object.h index aefc375470f..2406c20f27f 100644 --- a/packages/react-native/ReactCommon/react/bridging/Object.h +++ b/packages/react-native/ReactCommon/react/bridging/Object.h @@ -18,11 +18,11 @@ namespace facebook::react { template <> struct Bridging { - static jsi::WeakObject fromJs(jsi::Runtime &rt, const jsi::Object &value) { + static jsi::WeakObject fromJs(jsi::Runtime& rt, const jsi::Object& value) { return jsi::WeakObject(rt, value); } - static jsi::Value toJs(jsi::Runtime &rt, jsi::WeakObject &value) { + static jsi::Value toJs(jsi::Runtime& rt, jsi::WeakObject& value) { return value.lock(rt); } }; @@ -31,11 +31,11 @@ template struct Bridging< std::shared_ptr, std::enable_if_t>> { - static std::shared_ptr fromJs(jsi::Runtime &rt, const jsi::Object &value) { + static std::shared_ptr fromJs(jsi::Runtime& rt, const jsi::Object& value) { return value.asHostObject(rt); } - static jsi::Object toJs(jsi::Runtime &rt, std::shared_ptr value) { + static jsi::Object toJs(jsi::Runtime& rt, std::shared_ptr value) { return jsi::Object::createFromHostObject(rt, std::move(value)); } }; @@ -45,9 +45,9 @@ namespace map_detail { template struct Bridging { static T fromJs( - jsi::Runtime &rt, - const jsi::Object &value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const jsi::Object& value, + const std::shared_ptr& jsInvoker) { T result; auto propertyNames = value.getPropertyNames(rt); auto length = propertyNames.length(rt); @@ -65,12 +65,12 @@ struct Bridging { } static jsi::Object toJs( - jsi::Runtime &rt, - const T &map, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const T& map, + const std::shared_ptr& jsInvoker) { auto resultObject = jsi::Object(rt); - for (const auto &[key, value] : map) { + for (const auto& [key, value] : map) { resultObject.setProperty( rt, jsi::PropNameID::forUtf8(rt, key), diff --git a/packages/react-native/ReactCommon/react/bridging/Promise.h b/packages/react-native/ReactCommon/react/bridging/Promise.h index 00fb0151610..058faea13d1 100644 --- a/packages/react-native/ReactCommon/react/bridging/Promise.h +++ b/packages/react-native/ReactCommon/react/bridging/Promise.h @@ -19,7 +19,7 @@ namespace facebook::react { template class AsyncPromise { public: - AsyncPromise(jsi::Runtime &rt, const std::shared_ptr &jsInvoker) + AsyncPromise(jsi::Runtime& rt, const std::shared_ptr& jsInvoker) : state_(std::make_shared()) { auto constructor = rt.global().getPropertyAsFunction(rt, "Promise"); @@ -61,7 +61,7 @@ class AsyncPromise { } } - jsi::Object get(jsi::Runtime &rt) const { + jsi::Object get(jsi::Runtime& rt) const { if (auto holder = state_->promiseHolder.lock()) { return jsi::Value(rt, holder->promise).asObject(rt); } else { @@ -94,7 +94,7 @@ class AsyncPromise { template struct Bridging> { - static jsi::Object toJs(jsi::Runtime &rt, const AsyncPromise &promise) { + static jsi::Object toJs(jsi::Runtime& rt, const AsyncPromise& promise) { return promise.get(rt); } }; diff --git a/packages/react-native/ReactCommon/react/bridging/Value.h b/packages/react-native/ReactCommon/react/bridging/Value.h index 07d94985839..c2f37f4cbfc 100644 --- a/packages/react-native/ReactCommon/react/bridging/Value.h +++ b/packages/react-native/ReactCommon/react/bridging/Value.h @@ -16,7 +16,7 @@ namespace facebook::react { template <> struct Bridging { - static std::nullptr_t fromJs(jsi::Runtime &rt, const jsi::Value &value) { + static std::nullptr_t fromJs(jsi::Runtime& rt, const jsi::Value& value) { if (value.isNull() || value.isUndefined()) { return nullptr; } else { @@ -24,7 +24,7 @@ struct Bridging { } } - static std::nullptr_t toJs(jsi::Runtime &, std::nullptr_t) { + static std::nullptr_t toJs(jsi::Runtime&, std::nullptr_t) { return nullptr; } }; @@ -32,9 +32,9 @@ struct Bridging { template struct Bridging> { static std::optional fromJs( - jsi::Runtime &rt, - const jsi::Value &value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const jsi::Value& value, + const std::shared_ptr& jsInvoker) { if (value.isNull() || value.isUndefined()) { return {}; } @@ -43,9 +43,9 @@ struct Bridging> { template static std::optional fromJs( - jsi::Runtime &rt, - const std::optional &value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const std::optional& value, + const std::shared_ptr& jsInvoker) { if (value) { return bridging::fromJs(rt, *value, jsInvoker); } @@ -53,9 +53,9 @@ struct Bridging> { } static jsi::Value toJs( - jsi::Runtime &rt, - const std::optional &value, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const std::optional& value, + const std::shared_ptr& jsInvoker) { if (value) { return bridging::toJs(rt, *value, jsInvoker); } @@ -68,9 +68,9 @@ struct Bridging< std::shared_ptr, std::enable_if_t>> { static jsi::Value toJs( - jsi::Runtime &rt, - const std::shared_ptr &ptr, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const std::shared_ptr& ptr, + const std::shared_ptr& jsInvoker) { if (ptr) { return bridging::toJs(rt, *ptr, jsInvoker); } @@ -81,9 +81,9 @@ struct Bridging< template struct Bridging> { static jsi::Value toJs( - jsi::Runtime &rt, - const std::unique_ptr &ptr, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const std::unique_ptr& ptr, + const std::shared_ptr& jsInvoker) { if (ptr) { return bridging::toJs(rt, *ptr, jsInvoker); } @@ -94,9 +94,9 @@ struct Bridging> { template struct Bridging> { static jsi::Value toJs( - jsi::Runtime &rt, - const std::weak_ptr &weakPtr, - const std::shared_ptr &jsInvoker) { + jsi::Runtime& rt, + const std::weak_ptr& weakPtr, + const std::shared_ptr& jsInvoker) { if (auto ptr = weakPtr.lock()) { return bridging::toJs(rt, *ptr, jsInvoker); } diff --git a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp index b1f0e1b8138..a92886ff095 100644 --- a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp +++ b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.cpp @@ -131,7 +131,7 @@ TEST_F(BridgingTest, objectTest) { TEST_F(BridgingTest, hostObjectTest) { struct TestHostObject : public jsi::HostObject { - jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &name) override { + jsi::Value get(jsi::Runtime& rt, const jsi::PropNameID& name) override { if (name.utf8(rt) == "test") { return jsi::Value(1); } @@ -436,74 +436,74 @@ TEST_F(BridgingTest, supportTest) { // trivially converted to JSI values. EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs, jsi::Array>)); - EXPECT_TRUE((bridging::supportsFromJs, jsi::Array &>)); + EXPECT_TRUE((bridging::supportsFromJs, jsi::Array&>)); EXPECT_TRUE((bridging::supportsFromJs, jsi::Array>)); - EXPECT_TRUE((bridging::supportsFromJs, jsi::Array &>)); + EXPECT_TRUE((bridging::supportsFromJs, jsi::Array&>)); EXPECT_TRUE( (bridging::supportsFromJs, jsi::Object>)); EXPECT_TRUE( - (bridging::supportsFromJs, jsi::Object &>)); + (bridging::supportsFromJs, jsi::Object&>)); // Ensure incompatible conversions will fail. EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs, jsi::String>)); - EXPECT_FALSE((bridging::supportsFromJs, jsi::String &>)); + EXPECT_FALSE((bridging::supportsFromJs, jsi::String&>)); EXPECT_FALSE((bridging::supportsFromJs, jsi::String>)); - EXPECT_FALSE((bridging::supportsFromJs, jsi::String &>)); + EXPECT_FALSE((bridging::supportsFromJs, jsi::String&>)); // Ensure copying and down casting JSI values is also supported. EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); EXPECT_TRUE((bridging::supportsFromJs)); - EXPECT_TRUE((bridging::supportsFromJs)); + EXPECT_TRUE((bridging::supportsFromJs)); // Ensure incorrect casts will fail. EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); EXPECT_FALSE((bridging::supportsFromJs)); - EXPECT_FALSE((bridging::supportsFromJs)); + EXPECT_FALSE((bridging::supportsFromJs)); // Ensure we can convert some basic types to JSI values. EXPECT_TRUE((bridging::supportsToJs)); @@ -522,7 +522,7 @@ TEST_F(BridgingTest, supportTest) { EXPECT_TRUE((bridging::supportsToJs)); // Ensure invalid conversions to JSI values are not supported. - EXPECT_FALSE((bridging::supportsToJs)); + EXPECT_FALSE((bridging::supportsToJs)); EXPECT_FALSE((bridging::supportsToJs)); EXPECT_FALSE((bridging::supportsToJs)); EXPECT_FALSE((bridging::supportsToJs)); diff --git a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.h b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.h index aa8ed839da5..9cc7c311958 100644 --- a/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.h +++ b/packages/react-native/ReactCommon/react/bridging/tests/BridgingTest.h @@ -17,11 +17,11 @@ namespace facebook::react { class TestCallInvoker : public CallInvoker { public: - void invokeAsync(std::function &&fn) override { + void invokeAsync(std::function&& fn) override { queue_.push_back(std::move(fn)); } - void invokeSync(std::function &&) override { + void invokeSync(std::function&&) override { FAIL() << "JSCallInvoker does not support invokeSync()"; } @@ -53,11 +53,11 @@ class BridgingTest : public ::testing::Test { EXPECT_EQ(0, LongLivedObjectCollection::get().size()); } - jsi::Value eval(const std::string &js) { + jsi::Value eval(const std::string& js) { return rt.global().getPropertyAsFunction(rt, "eval").call(rt, js); } - jsi::Function function(const std::string &js) { + jsi::Function function(const std::string& js) { return eval(("(" + js + ")").c_str()).getObject(rt).getFunction(rt); } @@ -71,7 +71,7 @@ class BridgingTest : public ::testing::Test { std::shared_ptr invoker; std::unique_ptr runtime; - jsi::Runtime &rt; + jsi::Runtime& rt; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/bridging/tests/ClassTest.cpp b/packages/react-native/ReactCommon/react/bridging/tests/ClassTest.cpp index 06c37820fab..8f03d752cc5 100644 --- a/packages/react-native/ReactCommon/react/bridging/tests/ClassTest.cpp +++ b/packages/react-native/ReactCommon/react/bridging/tests/ClassTest.cpp @@ -14,26 +14,26 @@ using namespace std::literals; struct TestClass { TestClass(std::shared_ptr invoker) : invoker_(invoker) {} - double add(jsi::Runtime &, int a, float b) { + double add(jsi::Runtime&, int a, float b) { return a + b; } - jsi::Object getObject(jsi::Runtime &, jsi::Object obj) { + jsi::Object getObject(jsi::Runtime&, jsi::Object obj) { return obj; } - AsyncPromise getPromise(jsi::Runtime &rt, std::string result) { + AsyncPromise getPromise(jsi::Runtime& rt, std::string result) { auto promise = AsyncPromise(rt, invoker_); promise.resolve(result); return promise; } std::string - callFunc(jsi::Runtime &, SyncCallback func, int num) { + callFunc(jsi::Runtime&, SyncCallback func, int num) { return func(num); } - void callAsync(jsi::Runtime &, AsyncCallback<> callback) { + void callAsync(jsi::Runtime&, AsyncCallback<> callback) { callback(); } diff --git a/packages/react-native/ReactCommon/react/config/ReactNativeConfig.cpp b/packages/react-native/ReactCommon/react/config/ReactNativeConfig.cpp index 9a701c320e5..643c1972970 100644 --- a/packages/react-native/ReactCommon/react/config/ReactNativeConfig.cpp +++ b/packages/react-native/ReactCommon/react/config/ReactNativeConfig.cpp @@ -19,22 +19,22 @@ ReactNativeConfig::~ReactNativeConfig() {} EmptyReactNativeConfig::EmptyReactNativeConfig() {} -bool EmptyReactNativeConfig::getBool(const std::string ¶m) const { +bool EmptyReactNativeConfig::getBool(const std::string& param) const { if (param == "react_fabric:enabled_layout_animations_ios") { return true; } return false; } -std::string EmptyReactNativeConfig::getString(const std::string ¶m) const { +std::string EmptyReactNativeConfig::getString(const std::string& param) const { return ""; } -int64_t EmptyReactNativeConfig::getInt64(const std::string ¶m) const { +int64_t EmptyReactNativeConfig::getInt64(const std::string& param) const { return 0; } -double EmptyReactNativeConfig::getDouble(const std::string ¶m) const { +double EmptyReactNativeConfig::getDouble(const std::string& param) const { return 0.0; } diff --git a/packages/react-native/ReactCommon/react/config/ReactNativeConfig.h b/packages/react-native/ReactCommon/react/config/ReactNativeConfig.h index 84b388715ca..a3e4644c7da 100644 --- a/packages/react-native/ReactCommon/react/config/ReactNativeConfig.h +++ b/packages/react-native/ReactCommon/react/config/ReactNativeConfig.h @@ -20,10 +20,10 @@ class ReactNativeConfig { ReactNativeConfig(); virtual ~ReactNativeConfig(); - virtual bool getBool(const std::string ¶m) const = 0; - virtual std::string getString(const std::string ¶m) const = 0; - virtual int64_t getInt64(const std::string ¶m) const = 0; - virtual double getDouble(const std::string ¶m) const = 0; + virtual bool getBool(const std::string& param) const = 0; + virtual std::string getString(const std::string& param) const = 0; + virtual int64_t getInt64(const std::string& param) const = 0; + virtual double getDouble(const std::string& param) const = 0; }; /** @@ -33,10 +33,10 @@ class EmptyReactNativeConfig : public ReactNativeConfig { public: EmptyReactNativeConfig(); - bool getBool(const std::string ¶m) const override; - std::string getString(const std::string ¶m) const override; - int64_t getInt64(const std::string ¶m) const override; - double getDouble(const std::string ¶m) const override; + bool getBool(const std::string& param) const override; + std::string getString(const std::string& param) const override; + int64_t getInt64(const std::string& param) const override; + double getDouble(const std::string& param) const override; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/debug/react_native_assert.cpp b/packages/react-native/ReactCommon/react/debug/react_native_assert.cpp index abcdc5e8fbc..42ffdf9c7ab 100644 --- a/packages/react-native/ReactCommon/react/debug/react_native_assert.cpp +++ b/packages/react-native/ReactCommon/react/debug/react_native_assert.cpp @@ -12,16 +12,16 @@ // Provide a prototype to silence missing prototype warning in release // mode. extern "C" void react_native_assert_fail( - const char *func, - const char *file, + const char* func, + const char* file, int line, - const char *expr); + const char* expr); extern "C" void react_native_assert_fail( - const char *func, - const char *file, + const char* func, + const char* file, int line, - const char *expr) { + const char* expr) { // Print as an error so it shows up in logcat before crash... __android_log_print( ANDROID_LOG_ERROR, diff --git a/packages/react-native/ReactCommon/react/debug/react_native_assert.h b/packages/react-native/ReactCommon/react/debug/react_native_assert.h index 9ee5ce631c3..5f4036486bd 100644 --- a/packages/react-native/ReactCommon/react/debug/react_native_assert.h +++ b/packages/react-native/ReactCommon/react/debug/react_native_assert.h @@ -36,10 +36,10 @@ extern "C" { #endif // __cplusplus void react_native_assert_fail( - const char *func, - const char *file, + const char* func, + const char* file, int line, - const char *expr); + const char* expr); #ifdef __cplusplus } #endif // __cpusplus diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp index fbe27c1e3c5..d1704b57b9f 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp @@ -20,7 +20,7 @@ namespace facebook::react { namespace { CxxModule::Callback makeTurboCxxModuleCallback( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::weak_ptr weakWrapper) { return [weakWrapper, wrapperWasCalled = false](std::vector args) mutable { @@ -40,13 +40,13 @@ CxxModule::Callback makeTurboCxxModuleCallback( } std::vector innerArgs; - for (auto &a : args) { + for (auto& a : args) { innerArgs.push_back( jsi::valueFromDynamic(strongWrapper2->runtime(), a)); } strongWrapper2->callback().call( strongWrapper2->runtime(), - (const jsi::Value *)innerArgs.data(), + (const jsi::Value*)innerArgs.data(), innerArgs.size()); strongWrapper2->destroy(); @@ -65,8 +65,8 @@ TurboCxxModule::TurboCxxModule( cxxModule_(std::move(cxxModule)) {} jsi::Value TurboCxxModule::get( - jsi::Runtime &runtime, - const jsi::PropNameID &propName) { + jsi::Runtime& runtime, + const jsi::PropNameID& propName) { std::string propNameUtf8 = propName.utf8(runtime); auto result = jsi::Value::undefined(); @@ -79,29 +79,29 @@ jsi::Value TurboCxxModule::get( propName, 0, [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { jsi::Object result(rt); auto constants = cxxModule_->getConstants(); - for (auto &pair : constants) { + for (auto& pair : constants) { result.setProperty( rt, pair.first.c_str(), jsi::valueFromDynamic(rt, pair.second)); } return result; }); } else { - for (auto &method : cxxMethods_) { + for (auto& method : cxxMethods_) { if (method.name == propNameUtf8) { result = jsi::Function::createFromHostFunction( runtime, propName, 0, [this, propNameUtf8]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { return invokeMethod(rt, propNameUtf8, args, count); }); @@ -123,7 +123,7 @@ jsi::Value TurboCxxModule::get( } std::vector TurboCxxModule::getPropertyNames( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { std::vector result; result.reserve(cxxMethods_.size() + 1); result.push_back(jsi::PropNameID::forUtf8(runtime, "getConstants")); @@ -134,9 +134,9 @@ std::vector TurboCxxModule::getPropertyNames( } jsi::Value TurboCxxModule::invokeMethod( - jsi::Runtime &runtime, - const std::string &methodName, - const jsi::Value *args, + jsi::Runtime& runtime, + const std::string& methodName, + const jsi::Value* args, size_t count) { auto it = cxxMethods_.begin(); for (; it != cxxMethods_.end(); it++) { @@ -203,7 +203,7 @@ jsi::Value TurboCxxModule::invokeMethod( return createPromiseAsJSIValue( runtime, [method, args, count, this]( - jsi::Runtime &rt, std::shared_ptr promise) { + jsi::Runtime& rt, std::shared_ptr promise) { auto resolveWrapper = CallbackWrapper::createWeak( promise->resolve_.getFunction(rt), rt, jsInvoker_); auto rejectWrapper = CallbackWrapper::createWeak( diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h index 05460bc0f16..b9f0d4370e5 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h @@ -29,16 +29,16 @@ class JSI_EXPORT TurboCxxModule : public TurboModule { std::shared_ptr jsInvoker); facebook::jsi::Value get( - facebook::jsi::Runtime &runtime, - const facebook::jsi::PropNameID &propName) override; + facebook::jsi::Runtime& runtime, + const facebook::jsi::PropNameID& propName) override; std::vector getPropertyNames( - facebook::jsi::Runtime &runtime) override; + facebook::jsi::Runtime& runtime) override; jsi::Value invokeMethod( - jsi::Runtime &runtime, - const std::string &methodName, - const jsi::Value *args, + jsi::Runtime& runtime, + const std::string& methodName, + const jsi::Value* args, size_t count); private: diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp index 24a328d620b..f3641afcb52 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp @@ -15,8 +15,8 @@ TurboModule::TurboModule( : name_(std::move(name)), jsInvoker_(std::move(jsInvoker)) {} void TurboModule::emitDeviceEvent( - jsi::Runtime &runtime, - const std::string &eventName, + jsi::Runtime& runtime, + const std::string& eventName, ArgFactory argFactory) { jsInvoker_->invokeAsync([&runtime, eventName, argFactory]() { jsi::Value emitter = @@ -33,7 +33,7 @@ void TurboModule::emitDeviceEvent( argFactory(runtime, args); } emitFunction.callWithThis( - runtime, emitterObject, (const jsi::Value *)args.data(), args.size()); + runtime, emitterObject, (const jsi::Value*)args.data(), args.size()); } }); } diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h index b650483f159..4ecfe86f143 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h @@ -44,8 +44,8 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { // Note: keep this method declared inline to avoid conflicts // between RTTI and non-RTTI compilation units facebook::jsi::Value get( - facebook::jsi::Runtime &runtime, - const facebook::jsi::PropNameID &propName) override { + facebook::jsi::Runtime& runtime, + const facebook::jsi::PropNameID& propName) override { { auto prop = create(runtime, propName); // If we have a JS wrapper, cache the result of this lookup @@ -60,7 +60,7 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { } virtual std::vector getPropertyNames( - facebook::jsi::Runtime &runtime) override { + facebook::jsi::Runtime& runtime) override { std::vector result; result.reserve(methodMap_.size()); for (auto it = methodMap_.cbegin(); it != methodMap_.cend(); ++it) { @@ -76,15 +76,15 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { struct MethodMetadata { size_t argCount; facebook::jsi::Value (*invoker)( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count); }; std::unordered_map methodMap_; using ArgFactory = - std::function &args)>; + std::function& args)>; /** * Calls RCTDeviceEventEmitter.emit to JavaScript, with given event name and @@ -99,28 +99,28 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { * }); */ void emitDeviceEvent( - jsi::Runtime &runtime, - const std::string &eventName, + jsi::Runtime& runtime, + const std::string& eventName, ArgFactory argFactory = nullptr); virtual jsi::Value create( - jsi::Runtime &runtime, - const jsi::PropNameID &propName) { + jsi::Runtime& runtime, + const jsi::PropNameID& propName) { std::string propNameUtf8 = propName.utf8(runtime); auto p = methodMap_.find(propNameUtf8); if (p == methodMap_.end()) { // Method was not found, let JS decide what to do. return facebook::jsi::Value::undefined(); } else { - const MethodMetadata &meta = p->second; + const MethodMetadata& meta = p->second; return jsi::Function::createFromHostFunction( runtime, propName, static_cast(meta.argCount), [this, meta]( - jsi::Runtime &rt, - [[maybe_unused]] const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + [[maybe_unused]] const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { return meta.invoker(rt, *this, args, count); }); } } @@ -136,6 +136,6 @@ class JSI_EXPORT TurboModule : public facebook::jsi::HostObject { * given a name. */ using TurboModuleProviderFunctionType = - std::function(const std::string &name)>; + std::function(const std::string& name)>; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp index eb84bf6c6be..b03715f560d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp @@ -24,7 +24,7 @@ class BridgelessNativeModuleProxy : public jsi::HostObject { BridgelessNativeModuleProxy(std::unique_ptr binding) : binding_(std::move(binding)) {} - jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override { + jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override { /** * BatchedBridge/NativeModules.js contains this line: * @@ -54,9 +54,9 @@ class BridgelessNativeModuleProxy : public jsi::HostObject { } void set( - jsi::Runtime &runtime, - const jsi::PropNameID & /*name*/, - const jsi::Value & /*value*/) override { + jsi::Runtime& runtime, + const jsi::PropNameID& /*name*/, + const jsi::Value& /*value*/) override { throw jsi::JSError( runtime, "Tried to insert a NativeModule into the bridge's NativeModule proxy."); @@ -65,9 +65,9 @@ class BridgelessNativeModuleProxy : public jsi::HostObject { // TODO(148359183): Merge this with the Bridgeless defineReadOnlyGlobal util static void defineReadOnlyGlobal( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::string propName, - jsi::Value &&value) { + jsi::Value&& value) { if (runtime.global().hasProperty(runtime, propName.c_str())) { throw jsi::JSError( runtime, @@ -95,13 +95,13 @@ static void defineReadOnlyGlobal( */ TurboModuleBinding::TurboModuleBinding( - TurboModuleProviderFunctionType &&moduleProvider) + TurboModuleProviderFunctionType&& moduleProvider) : moduleProvider_(std::move(moduleProvider)) {} void TurboModuleBinding::install( - jsi::Runtime &runtime, - TurboModuleProviderFunctionType &&moduleProvider, - TurboModuleProviderFunctionType &&legacyModuleProvider) { + jsi::Runtime& runtime, + TurboModuleProviderFunctionType&& moduleProvider, + TurboModuleProviderFunctionType&& legacyModuleProvider) { runtime.global().setProperty( runtime, "__turboModuleProxy", @@ -110,9 +110,9 @@ void TurboModuleBinding::install( jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"), 1, [binding = TurboModuleBinding(std::move(moduleProvider))]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count < 1) { throw std::invalid_argument( @@ -148,8 +148,8 @@ TurboModuleBinding::~TurboModuleBinding() { } jsi::Value TurboModuleBinding::getModule( - jsi::Runtime &runtime, - const std::string &moduleName) const { + jsi::Runtime& runtime, + const std::string& moduleName) const { std::shared_ptr module; { SystraceSection s( @@ -164,7 +164,7 @@ jsi::Value TurboModuleBinding::getModule( // // Note: TurboModules are cached by name in TurboModuleManagers. Hence, // jsRepresentation is also cached by by name by the TurboModuleManager - auto &weakJsRepresentation = module->jsRepresentation_; + auto& weakJsRepresentation = module->jsRepresentation_; if (weakJsRepresentation) { auto jsRepresentation = weakJsRepresentation->lock(runtime); if (!jsRepresentation.isUndefined()) { diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h index 2fc6e17cf4a..385ce24d1a2 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h @@ -26,11 +26,11 @@ class TurboModuleBinding { * Thread synchronization must be enforced externally. */ static void install( - jsi::Runtime &runtime, - TurboModuleProviderFunctionType &&moduleProvider, - TurboModuleProviderFunctionType &&legacyModuleProvider = nullptr); + jsi::Runtime& runtime, + TurboModuleProviderFunctionType&& moduleProvider, + TurboModuleProviderFunctionType&& legacyModuleProvider = nullptr); - TurboModuleBinding(TurboModuleProviderFunctionType &&moduleProvider); + TurboModuleBinding(TurboModuleProviderFunctionType&& moduleProvider); virtual ~TurboModuleBinding(); private: @@ -40,7 +40,7 @@ class TurboModuleBinding { * A lookup function exposed to JS to get an instance of a TurboModule * for the given name. */ - jsi::Value getModule(jsi::Runtime &runtime, const std::string &moduleName) + jsi::Value getModule(jsi::Runtime& runtime, const std::string& moduleName) const; TurboModuleProviderFunctionType moduleProvider_; diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp index bc4510c542c..978f3c37f0d 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp @@ -12,7 +12,7 @@ namespace TurboModulePerfLogger { std::unique_ptr g_perfLogger = nullptr; -void enableLogging(std::unique_ptr &&newPerfLogger) { +void enableLogging(std::unique_ptr&& newPerfLogger) { g_perfLogger = std::move(newPerfLogger); } @@ -20,274 +20,274 @@ void disableLogging() { g_perfLogger = nullptr; } -void moduleDataCreateStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleDataCreateStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleDataCreateStart(moduleName, id); } } -void moduleDataCreateEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleDataCreateEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleDataCreateEnd(moduleName, id); } } -void moduleCreateStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateStart(moduleName, id); } } -void moduleCreateCacheHit(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateCacheHit(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateCacheHit(moduleName, id); } } -void moduleCreateConstructStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateConstructStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateConstructStart(moduleName, id); } } -void moduleCreateConstructEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateConstructEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateConstructEnd(moduleName, id); } } -void moduleCreateSetUpStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateSetUpStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateSetUpStart(moduleName, id); } } -void moduleCreateSetUpEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateSetUpEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateSetUpEnd(moduleName, id); } } -void moduleCreateEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateEnd(moduleName, id); } } -void moduleCreateFail(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateFail(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateFail(moduleName, id); } } -void moduleJSRequireBeginningStart(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningStart(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningStart(moduleName); } } -void moduleJSRequireBeginningCacheHit(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningCacheHit(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningCacheHit(moduleName); } } -void moduleJSRequireBeginningEnd(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningEnd(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningEnd(moduleName); } } -void moduleJSRequireBeginningFail(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningFail(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningFail(moduleName); } } -void moduleJSRequireEndingStart(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingStart(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingStart(moduleName); } } -void moduleJSRequireEndingEnd(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingEnd(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingEnd(moduleName); } } -void moduleJSRequireEndingFail(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingFail(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingFail(moduleName); } } -void syncMethodCallStart(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallStart(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallStart(moduleName, methodName); } } void syncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallArgConversionStart(moduleName, methodName); } } void syncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallArgConversionEnd(moduleName, methodName); } } void syncMethodCallExecutionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallExecutionStart(moduleName, methodName); } } void syncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallExecutionEnd(moduleName, methodName); } } void syncMethodCallReturnConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallReturnConversionStart(moduleName, methodName); } } void syncMethodCallReturnConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallReturnConversionEnd(moduleName, methodName); } } -void syncMethodCallEnd(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallEnd(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallEnd(moduleName, methodName); } } -void syncMethodCallFail(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallFail(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallFail(moduleName, methodName); } } -void asyncMethodCallStart(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallStart(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallStart(moduleName, methodName); } } void asyncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallArgConversionStart(moduleName, methodName); } } void asyncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallArgConversionEnd(moduleName, methodName); } } -void asyncMethodCallDispatch(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallDispatch(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallDispatch(moduleName, methodName); } } -void asyncMethodCallEnd(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallEnd(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallEnd(moduleName, methodName); } } -void asyncMethodCallFail(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallFail(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallFail(moduleName, methodName); } } void asyncMethodCallBatchPreprocessStart() { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallBatchPreprocessStart(); } } void asyncMethodCallBatchPreprocessEnd(int batchSize) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallBatchPreprocessEnd(batchSize); } } void asyncMethodCallExecutionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionStart(moduleName, methodName, id); } } void asyncMethodCallExecutionArgConversionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionArgConversionStart( moduleName, methodName, id); @@ -295,10 +295,10 @@ void asyncMethodCallExecutionArgConversionStart( } void asyncMethodCallExecutionArgConversionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionArgConversionEnd( moduleName, methodName, id); @@ -306,20 +306,20 @@ void asyncMethodCallExecutionArgConversionEnd( } void asyncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionEnd(moduleName, methodName, id); } } void asyncMethodCallExecutionFail( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionFail(moduleName, methodName, id); } diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h index b9ab37475b7..172a7f491e7 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h @@ -12,71 +12,71 @@ namespace facebook::react { namespace TurboModulePerfLogger { -void enableLogging(std::unique_ptr &&logger); +void enableLogging(std::unique_ptr&& logger); void disableLogging(); -void moduleDataCreateStart(const char *moduleName, int32_t id); -void moduleDataCreateEnd(const char *moduleName, int32_t id); +void moduleDataCreateStart(const char* moduleName, int32_t id); +void moduleDataCreateEnd(const char* moduleName, int32_t id); /** * Create NativeModule platform object */ -void moduleCreateStart(const char *moduleName, int32_t id); -void moduleCreateCacheHit(const char *moduleName, int32_t id); -void moduleCreateConstructStart(const char *moduleName, int32_t id); -void moduleCreateConstructEnd(const char *moduleName, int32_t id); -void moduleCreateSetUpStart(const char *moduleName, int32_t id); -void moduleCreateSetUpEnd(const char *moduleName, int32_t id); -void moduleCreateEnd(const char *moduleName, int32_t id); -void moduleCreateFail(const char *moduleName, int32_t id); +void moduleCreateStart(const char* moduleName, int32_t id); +void moduleCreateCacheHit(const char* moduleName, int32_t id); +void moduleCreateConstructStart(const char* moduleName, int32_t id); +void moduleCreateConstructEnd(const char* moduleName, int32_t id); +void moduleCreateSetUpStart(const char* moduleName, int32_t id); +void moduleCreateSetUpEnd(const char* moduleName, int32_t id); +void moduleCreateEnd(const char* moduleName, int32_t id); +void moduleCreateFail(const char* moduleName, int32_t id); /** * JS require beginning */ -void moduleJSRequireBeginningStart(const char *moduleName); -void moduleJSRequireBeginningCacheHit(const char *moduleName); -void moduleJSRequireBeginningEnd(const char *moduleName); -void moduleJSRequireBeginningFail(const char *moduleName); +void moduleJSRequireBeginningStart(const char* moduleName); +void moduleJSRequireBeginningCacheHit(const char* moduleName); +void moduleJSRequireBeginningEnd(const char* moduleName); +void moduleJSRequireBeginningFail(const char* moduleName); /** * JS require ending */ -void moduleJSRequireEndingStart(const char *moduleName); -void moduleJSRequireEndingEnd(const char *moduleName); -void moduleJSRequireEndingFail(const char *moduleName); +void moduleJSRequireEndingStart(const char* moduleName); +void moduleJSRequireEndingEnd(const char* moduleName); +void moduleJSRequireEndingFail(const char* moduleName); // Sync method calls -void syncMethodCallStart(const char *moduleName, const char *methodName); +void syncMethodCallStart(const char* moduleName, const char* methodName); void syncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallExecutionStart( - const char *moduleName, - const char *methodName); -void syncMethodCallExecutionEnd(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void syncMethodCallExecutionEnd(const char* moduleName, const char* methodName); void syncMethodCallReturnConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallReturnConversionEnd( - const char *moduleName, - const char *methodName); -void syncMethodCallEnd(const char *moduleName, const char *methodName); -void syncMethodCallFail(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void syncMethodCallEnd(const char* moduleName, const char* methodName); +void syncMethodCallFail(const char* moduleName, const char* methodName); // Async method calls -void asyncMethodCallStart(const char *moduleName, const char *methodName); +void asyncMethodCallStart(const char* moduleName, const char* methodName); void asyncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void asyncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName); -void asyncMethodCallDispatch(const char *moduleName, const char *methodName); -void asyncMethodCallEnd(const char *moduleName, const char *methodName); -void asyncMethodCallFail(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void asyncMethodCallDispatch(const char* moduleName, const char* methodName); +void asyncMethodCallEnd(const char* moduleName, const char* methodName); +void asyncMethodCallFail(const char* moduleName, const char* methodName); /** * Pre-processing async method call batch @@ -86,24 +86,24 @@ void asyncMethodCallBatchPreprocessEnd(int batchSize); // Async method call execution void asyncMethodCallExecutionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionArgConversionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionArgConversionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionFail( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); } // namespace TurboModulePerfLogger diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp index 2e9fcf25ada..328c3f71a58 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp @@ -9,7 +9,7 @@ namespace facebook::react { -static jsi::Value deepCopyJSIValue(jsi::Runtime &rt, const jsi::Value &value) { +static jsi::Value deepCopyJSIValue(jsi::Runtime& rt, const jsi::Value& value) { if (value.isNull()) { return jsi::Value::null(); } @@ -40,7 +40,7 @@ static jsi::Value deepCopyJSIValue(jsi::Runtime &rt, const jsi::Value &value) { return jsi::Value::undefined(); } -jsi::Object deepCopyJSIObject(jsi::Runtime &rt, const jsi::Object &obj) { +jsi::Object deepCopyJSIObject(jsi::Runtime& rt, const jsi::Object& obj) { jsi::Object copy(rt); jsi::Array propertyNames = obj.getPropertyNames(rt); size_t size = propertyNames.size(rt); @@ -52,7 +52,7 @@ jsi::Object deepCopyJSIObject(jsi::Runtime &rt, const jsi::Object &obj) { return copy; } -jsi::Array deepCopyJSIArray(jsi::Runtime &rt, const jsi::Array &arr) { +jsi::Array deepCopyJSIArray(jsi::Runtime& rt, const jsi::Array& arr) { size_t size = arr.size(rt); jsi::Array copy(rt, size); for (size_t i = 0; i < size; i++) { @@ -62,14 +62,14 @@ jsi::Array deepCopyJSIArray(jsi::Runtime &rt, const jsi::Array &arr) { return copy; } -Promise::Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject) +Promise::Promise(jsi::Runtime& rt, jsi::Function resolve, jsi::Function reject) : runtime_(rt), resolve_(std::move(resolve)), reject_(std::move(reject)) {} -void Promise::resolve(const jsi::Value &result) { +void Promise::resolve(const jsi::Value& result) { resolve_.call(runtime_, result); } -void Promise::reject(const std::string &message) { +void Promise::reject(const std::string& message) { jsi::Object error(runtime_); error.setProperty( runtime_, "message", jsi::String::createFromUtf8(runtime_, message)); @@ -77,17 +77,17 @@ void Promise::reject(const std::string &message) { } jsi::Value createPromiseAsJSIValue( - jsi::Runtime &rt, - PromiseSetupFunctionType &&func) { + jsi::Runtime& rt, + PromiseSetupFunctionType&& func) { jsi::Function JSPromise = rt.global().getPropertyAsFunction(rt, "Promise"); jsi::Function fn = jsi::Function::createFromHostFunction( rt, jsi::PropNameID::forAscii(rt, "fn"), 2, [func = std::move(func)]( - jsi::Runtime &rt2, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt2, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { jsi::Function resolve = args[0].getObject(rt2).getFunction(rt2); jsi::Function reject = args[1].getObject(rt2).getFunction(rt2); diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h index e79af7d32cf..d2558250876 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h @@ -17,25 +17,25 @@ namespace facebook::react { -jsi::Object deepCopyJSIObject(jsi::Runtime &rt, const jsi::Object &obj); -jsi::Array deepCopyJSIArray(jsi::Runtime &rt, const jsi::Array &arr); +jsi::Object deepCopyJSIObject(jsi::Runtime& rt, const jsi::Object& obj); +jsi::Array deepCopyJSIArray(jsi::Runtime& rt, const jsi::Array& arr); struct Promise : public LongLivedObject { - Promise(jsi::Runtime &rt, jsi::Function resolve, jsi::Function reject); + Promise(jsi::Runtime& rt, jsi::Function resolve, jsi::Function reject); - void resolve(const jsi::Value &result); - void reject(const std::string &error); + void resolve(const jsi::Value& result); + void reject(const std::string& error); - jsi::Runtime &runtime_; + jsi::Runtime& runtime_; jsi::Function resolve_; jsi::Function reject_; }; using PromiseSetupFunctionType = - std::function)>; + std::function)>; jsi::Value createPromiseAsJSIValue( - jsi::Runtime &rt, - PromiseSetupFunctionType &&func); + jsi::Runtime& rt, + PromiseSetupFunctionType&& func); class RAIICallbackWrapperDestroyer { public: diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.cpp index d9d2befdd1b..20111b6281b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.cpp @@ -12,7 +12,7 @@ namespace facebook::react { namespace { // This is used for generating short exception strings. -std::string getType(jsi::Runtime &rt, const jsi::Value &v) { +std::string getType(jsi::Runtime& rt, const jsi::Value& v) { if (v.isUndefined()) { return "undefined"; } else if (v.isNull()) { @@ -36,21 +36,21 @@ std::string getType(jsi::Runtime &rt, const jsi::Value &v) { } // namespace JavaInteropTurboModule::JavaInteropTurboModule( - const JavaTurboModule::InitParams ¶ms, + const JavaTurboModule::InitParams& params, std::vector methodDescriptors) : JavaTurboModule(params), methodDescriptors_(methodDescriptors), methodIDs_(methodDescriptors.size()), constantsCache_(jsi::Value::undefined()) { - for (const auto &methodDescriptor : methodDescriptors) { + for (const auto& methodDescriptor : methodDescriptors) { methodMap_[methodDescriptor.methodName] = MethodMetadata{ static_cast(methodDescriptor.jsArgCount), nullptr}; } } jsi::Value JavaInteropTurboModule::create( - jsi::Runtime &runtime, - const jsi::PropNameID &propName) { + jsi::Runtime& runtime, + const jsi::PropNameID& propName) { for (size_t i = 0; i < methodDescriptors_.size(); i += 1) { if (methodDescriptors_[i].methodName == propName.utf8(runtime)) { if (propName.utf8(runtime) == "getConstants") { @@ -59,9 +59,9 @@ jsi::Value JavaInteropTurboModule::create( propName, static_cast(methodDescriptors_[i].jsArgCount), [this, i]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) mutable { if (!this->constantsCache_.isUndefined()) { return jsi::Value(rt, this->constantsCache_); @@ -102,9 +102,9 @@ jsi::Value JavaInteropTurboModule::create( propName, static_cast(methodDescriptors_[i].jsArgCount), [this, i]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { return this->invokeJavaMethod( rt, @@ -139,7 +139,7 @@ bool JavaInteropTurboModule::exportsConstants() { return false; } -const jsi::Value &JavaInteropTurboModule::getConstants(jsi::Runtime &runtime) { +const jsi::Value& JavaInteropTurboModule::getConstants(jsi::Runtime& runtime) { if (!constantsCache_.isUndefined()) { return constantsCache_; } @@ -169,7 +169,7 @@ const jsi::Value &JavaInteropTurboModule::getConstants(jsi::Runtime &runtime) { } std::vector JavaInteropTurboModule::getPropertyNames( - facebook::jsi::Runtime &runtime) { + facebook::jsi::Runtime& runtime) { std::vector propNames = JavaTurboModule::getPropertyNames(runtime); diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h index dc198917a58..5a08724aba2 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaInteropTurboModule.h @@ -28,14 +28,14 @@ class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule { }; JavaInteropTurboModule( - const JavaTurboModule::InitParams ¶ms, + const JavaTurboModule::InitParams& params, std::vector methodDescriptors); std::vector getPropertyNames( - facebook::jsi::Runtime &runtime) override; + facebook::jsi::Runtime& runtime) override; protected: - jsi::Value create(jsi::Runtime &runtime, const jsi::PropNameID &propName) + jsi::Value create(jsi::Runtime& runtime, const jsi::PropNameID& propName) override; private: @@ -43,7 +43,7 @@ class JSI_EXPORT JavaInteropTurboModule : public JavaTurboModule { std::vector methodIDs_; jsi::Value constantsCache_; - const jsi::Value &getConstants(jsi::Runtime &runtime); + const jsi::Value& getConstants(jsi::Runtime& runtime); bool exportsConstants(); }; diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp index 138e1d817ab..8d5a6f94d51 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp @@ -28,7 +28,7 @@ namespace facebook::react { namespace TMPL = TurboModulePerfLogger; -JavaTurboModule::JavaTurboModule(const InitParams ¶ms) +JavaTurboModule::JavaTurboModule(const InitParams& params) : TurboModule(params.moduleName, params.jsInvoker), instance_(jni::make_global(params.instance)), nativeMethodCallInvoker_(params.nativeMethodCallInvoker) {} @@ -63,9 +63,9 @@ struct JNIArgs { }; jni::local_ref createJavaCallbackFromJSIFunction( - jsi::Function &&function, - jsi::Runtime &rt, - const std::shared_ptr &jsInvoker) { + jsi::Function&& function, + jsi::Runtime& rt, + const std::shared_ptr& jsInvoker) { auto weakWrapper = CallbackWrapper::createWeak(std::move(function), rt, jsInvoker); @@ -102,14 +102,14 @@ jni::local_ref createJavaCallbackFromJSIFunction( std::vector args; args.reserve(responses.size()); - for (const auto &val : responses) { + for (const auto& val : responses) { args.emplace_back( jsi::valueFromDynamic(strongWrapper2->runtime(), val)); } strongWrapper2->callback().call( strongWrapper2->runtime(), - (const jsi::Value *)args.data(), + (const jsi::Value*)args.data(), args.size()); }); @@ -118,7 +118,7 @@ jni::local_ref createJavaCallbackFromJSIFunction( } // This is used for generating short exception strings. -std::string stringifyJSIValue(const jsi::Value &v, jsi::Runtime *rt = nullptr) { +std::string stringifyJSIValue(const jsi::Value& v, jsi::Runtime* rt = nullptr) { if (v.isUndefined()) { return "undefined"; } @@ -147,11 +147,11 @@ std::string stringifyJSIValue(const jsi::Value &v, jsi::Runtime *rt = nullptr) { class JavaTurboModuleArgumentConversionException : public std::runtime_error { public: JavaTurboModuleArgumentConversionException( - const std::string &expectedType, + const std::string& expectedType, int index, - const std::string &methodName, - const jsi::Value *arg, - jsi::Runtime *rt) + const std::string& methodName, + const jsi::Value* arg, + jsi::Runtime* rt) : std::runtime_error( "Expected argument " + std::to_string(index) + " of method \"" + methodName + "\" to be a " + expectedType + ", but got " + @@ -161,9 +161,9 @@ class JavaTurboModuleArgumentConversionException : public std::runtime_error { class JavaTurboModuleInvalidArgumentTypeException : public std::runtime_error { public: JavaTurboModuleInvalidArgumentTypeException( - const std::string &actualType, + const std::string& actualType, int argIndex, - const std::string &methodName) + const std::string& methodName) : std::runtime_error( "Called method \"" + methodName + "\" with unsupported type " + actualType + " at argument " + std::to_string(argIndex)) {} @@ -172,7 +172,7 @@ class JavaTurboModuleInvalidArgumentTypeException : public std::runtime_error { class JavaTurboModuleInvalidArgumentCountException : public std::runtime_error { public: JavaTurboModuleInvalidArgumentCountException( - const std::string &methodName, + const std::string& methodName, int actualArgCount, int expectedArgCount) : std::runtime_error( @@ -188,7 +188,7 @@ class JavaTurboModuleInvalidArgumentCountException : public std::runtime_error { * for a description of Java method signature structure. */ std::vector getMethodArgTypesFromSignature( - const std::string &methodSignature) { + const std::string& methodSignature) { std::vector methodArgs; for (auto it = methodSignature.begin(); it != methodSignature.end(); @@ -236,13 +236,13 @@ int32_t getUniqueId() { // TODO (axe) Reuse existing implementation as needed - the exist in // MethodInvoker.cpp JNIArgs convertJSIArgsToJNIArgs( - JNIEnv *env, - jsi::Runtime &rt, - const std::string &methodName, - const std::vector &methodArgTypes, - const jsi::Value *args, + JNIEnv* env, + jsi::Runtime& rt, + const std::string& methodName, + const std::vector& methodArgTypes, + const jsi::Value* args, size_t count, - const std::shared_ptr &jsInvoker, + const std::shared_ptr& jsInvoker, TurboModuleMethodValueKind valueKind) { unsigned int expectedArgumentCount = valueKind == PromiseKind ? methodArgTypes.size() - 1 @@ -254,8 +254,8 @@ JNIArgs convertJSIArgsToJNIArgs( } JNIArgs jniArgs(valueKind == PromiseKind ? count + 1 : count); - auto &jargs = jniArgs.args_; - auto &globalRefs = jniArgs.globalRefs_; + auto& jargs = jniArgs.args_; + auto& globalRefs = jniArgs.globalRefs_; auto makeGlobalIfNecessary = [&globalRefs, env, valueKind](jobject obj) -> jobject { @@ -270,10 +270,10 @@ JNIArgs convertJSIArgsToJNIArgs( }; for (unsigned int argIndex = 0; argIndex < count; argIndex += 1) { - const std::string &type = methodArgTypes.at(argIndex); + const std::string& type = methodArgTypes.at(argIndex); - const jsi::Value *arg = &args[argIndex]; - jvalue *jarg = &jargs[argIndex]; + const jsi::Value* arg = &args[argIndex]; + jvalue* jarg = &jargs[argIndex]; if (type == "D") { if (!arg->isNumber()) { @@ -384,7 +384,7 @@ JNIArgs convertJSIArgsToJNIArgs( return jniArgs; } -jsi::Value convertFromJMapToValue(JNIEnv *env, jsi::Runtime &rt, jobject arg) { +jsi::Value convertFromJMapToValue(JNIEnv* env, jsi::Runtime& rt, jobject arg) { // We currently use Java Argument.makeNativeMap() method to do this conversion // This could also be done purely in C++, but iterative over map methods // but those may end up calling reflection methods anyway @@ -401,8 +401,8 @@ jsi::Value convertFromJMapToValue(JNIEnv *env, jsi::Runtime &rt, jobject arg) { } jsi::Value createJSRuntimeError( - jsi::Runtime &runtime, - const std::string &message) { + jsi::Runtime& runtime, + const std::string& message) { return runtime.global() .getPropertyAsFunction(runtime, "Error") .call(runtime, message); @@ -412,7 +412,7 @@ jsi::Value createJSRuntimeError( * Creates JSError with current JS runtime stack and Throwable stack trace. */ jsi::JSError convertThrowableToJSError( - jsi::Runtime &runtime, + jsi::Runtime& runtime, jni::local_ref throwable) { auto stackTrace = throwable->getStackTrace(); @@ -444,15 +444,15 @@ jsi::JSError convertThrowableToJSError( } // namespace jsi::Value JavaTurboModule::invokeJavaMethod( - jsi::Runtime &runtime, + jsi::Runtime& runtime, TurboModuleMethodValueKind valueKind, - const std::string &methodNameStr, - const std::string &methodSignature, - const jsi::Value *args, + const std::string& methodNameStr, + const std::string& methodSignature, + const jsi::Value* args, size_t argCount, - jmethodID &methodID) { - const char *methodName = methodNameStr.c_str(); - const char *moduleName = name_.c_str(); + jmethodID& methodID) { + const char* methodName = methodNameStr.c_str(); + const char* moduleName = name_.c_str(); bool isMethodSync = !(valueKind == VoidKind || valueKind == PromiseKind); @@ -464,7 +464,7 @@ jsi::Value JavaTurboModule::invokeJavaMethod( TMPL::asyncMethodCallArgConversionStart(moduleName, methodName); } - JNIEnv *env = jni::Environment::current(); + JNIEnv* env = jni::Environment::current(); auto instance = instance_.get(); /** @@ -561,8 +561,8 @@ jsi::Value JavaTurboModule::invokeJavaMethod( TMPL::syncMethodCallExecutionStart(moduleName, methodName); } - auto &jargs = jniArgs.args_; - auto &globalRefs = jniArgs.globalRefs_; + auto& jargs = jniArgs.args_; + auto& globalRefs = jniArgs.globalRefs_; switch (valueKind) { case BooleanKind: { @@ -681,7 +681,7 @@ jsi::Value JavaTurboModule::invokeJavaMethod( jsi::Value returnValue = jsi::Value::null(); if (returnString != nullptr) { - const char *js = env->GetStringUTFChars(returnString, nullptr); + const char* js = env->GetStringUTFChars(returnString, nullptr); std::string result = js; env->ReleaseStringUTFChars(returnString, js); returnValue = @@ -754,9 +754,9 @@ jsi::Value JavaTurboModule::invokeJavaMethod( * again? Why does JNI crash when we use the env from the upper * scope? */ - JNIEnv *env = jni::Environment::current(); - const char *moduleName = moduleNameStr.c_str(); - const char *methodName = methodNameStr.c_str(); + JNIEnv* env = jni::Environment::current(); + const char* moduleName = moduleNameStr.c_str(); + const char* methodName = methodNameStr.c_str(); TMPL::asyncMethodCallExecutionStart(moduleName, methodName, id); env->CallVoidMethodA(instance.get(), methodID, jargs.data()); @@ -792,9 +792,9 @@ jsi::Value JavaTurboModule::invokeJavaMethod( moduleNameStr = name_, methodNameStr, env]( - jsi::Runtime &runtime, - const jsi::Value &thisVal, - const jsi::Value *promiseConstructorArgs, + jsi::Runtime& runtime, + const jsi::Value& thisVal, + const jsi::Value* promiseConstructorArgs, size_t promiseConstructorArgCount) { if (promiseConstructorArgCount != 2) { throw std::invalid_argument("Promise fn arg count must be 2"); @@ -824,8 +824,8 @@ jsi::Value JavaTurboModule::invokeJavaMethod( jobject promise = env->NewObject( jPromiseImpl, jPromiseImplConstructor, resolve, reject); - const char *moduleName = moduleNameStr.c_str(); - const char *methodName = methodNameStr.c_str(); + const char* moduleName = moduleNameStr.c_str(); + const char* methodName = methodNameStr.c_str(); jobject globalPromise = env->NewGlobalRef(promise); @@ -855,9 +855,9 @@ jsi::Value JavaTurboModule::invokeJavaMethod( * environment again? Why does JNI crash when we use the env * from the upper scope? */ - JNIEnv *env = jni::Environment::current(); - const char *moduleName = moduleNameStr.c_str(); - const char *methodName = methodNameStr.c_str(); + JNIEnv* env = jni::Environment::current(); + const char* moduleName = moduleNameStr.c_str(); + const char* methodName = methodNameStr.c_str(); TMPL::asyncMethodCallExecutionStart( moduleName, methodName, id); diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h index 63f7d456df1..bbfc4522d10 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h @@ -34,17 +34,17 @@ class JSI_EXPORT JavaTurboModule : public TurboModule { std::shared_ptr nativeMethodCallInvoker; }; - JavaTurboModule(const InitParams ¶ms); + JavaTurboModule(const InitParams& params); virtual ~JavaTurboModule(); jsi::Value invokeJavaMethod( - jsi::Runtime &runtime, + jsi::Runtime& runtime, TurboModuleMethodValueKind valueKind, - const std::string &methodName, - const std::string &methodSignature, - const jsi::Value *args, + const std::string& methodName, + const std::string& methodSignature, + const jsi::Value* args, size_t argCount, - jmethodID &cachedMethodID); + jmethodID& cachedMethodID); private: // instance_ can be of type JTurboModule, or JNativeModule diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp index 4429c8c9b99..adbbe2c5775 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp @@ -12,77 +12,77 @@ namespace facebook::react { static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_voidFunc( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - static_cast(&turboModule)->voidFunc(rt); + static_cast(&turboModule)->voidFunc(rt); return jsi::Value::undefined(); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getBool( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { return jsi::Value( - static_cast(&turboModule) + static_cast(&turboModule) ->getBool(rt, args[0].getBool())); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getEnum( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { return jsi::Value( - static_cast(&turboModule) + static_cast(&turboModule) ->getEnum(rt, args[0].getNumber())); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getNumber( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { return jsi::Value( - static_cast(&turboModule) + static_cast(&turboModule) ->getNumber(rt, args[0].getNumber())); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getString( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getString(rt, args[0].getString(rt)); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getArray( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getArray(rt, args[0].getObject(rt).getArray(rt)); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getObject( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getObject(rt, args[0].getObject(rt)); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getValue( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getValue( rt, args[0].getNumber(), @@ -92,11 +92,11 @@ static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getValue( static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getValueWithCallback( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - static_cast(&turboModule) + static_cast(&turboModule) ->getValueWithCallback( rt, std::move(args[0].getObject(rt).getFunction(rt))); return jsi::Value::undefined(); @@ -104,20 +104,20 @@ __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getValueWithCallback( static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getValueWithPromise( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getValueWithPromise(rt, args[0].getBool()); } static jsi::Value __hostFunction_NativeSampleTurboCxxModuleSpecJSI_getConstants( - jsi::Runtime &rt, - TurboModule &turboModule, - const jsi::Value *args, + jsi::Runtime& rt, + TurboModule& turboModule, + const jsi::Value* args, size_t count) { - return static_cast(&turboModule) + return static_cast(&turboModule) ->getConstants(rt); } diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h index a551ff4b166..ad602b0425a 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h @@ -20,23 +20,23 @@ class JSI_EXPORT NativeSampleTurboCxxModuleSpecJSI : public TurboModule { NativeSampleTurboCxxModuleSpecJSI(std::shared_ptr jsInvoker); public: - virtual void voidFunc(jsi::Runtime &rt) = 0; - virtual bool getBool(jsi::Runtime &rt, bool arg) = 0; - virtual double getEnum(jsi::Runtime &rt, double arg) = 0; - virtual double getNumber(jsi::Runtime &rt, double arg) = 0; - virtual jsi::String getString(jsi::Runtime &rt, const jsi::String &arg) = 0; - virtual jsi::Array getArray(jsi::Runtime &rt, const jsi::Array &arg) = 0; - virtual jsi::Object getObject(jsi::Runtime &rt, const jsi::Object &arg) = 0; + virtual void voidFunc(jsi::Runtime& rt) = 0; + virtual bool getBool(jsi::Runtime& rt, bool arg) = 0; + virtual double getEnum(jsi::Runtime& rt, double arg) = 0; + virtual double getNumber(jsi::Runtime& rt, double arg) = 0; + virtual jsi::String getString(jsi::Runtime& rt, const jsi::String& arg) = 0; + virtual jsi::Array getArray(jsi::Runtime& rt, const jsi::Array& arg) = 0; + virtual jsi::Object getObject(jsi::Runtime& rt, const jsi::Object& arg) = 0; virtual jsi::Object getValue( - jsi::Runtime &rt, + jsi::Runtime& rt, double x, - const jsi::String &y, - const jsi::Object &z) = 0; + const jsi::String& y, + const jsi::Object& z) = 0; virtual void getValueWithCallback( - jsi::Runtime &rt, - const jsi::Function &callback) = 0; - virtual jsi::Value getValueWithPromise(jsi::Runtime &rt, bool error) = 0; - virtual jsi::Object getConstants(jsi::Runtime &rt) = 0; + jsi::Runtime& rt, + const jsi::Function& callback) = 0; + virtual jsi::Value getValueWithPromise(jsi::Runtime& rt, bool error) = 0; + virtual jsi::Object getConstants(jsi::Runtime& rt) = 0; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp index 34c54283d17..bb8181592ed 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp @@ -17,45 +17,45 @@ SampleTurboCxxModule::SampleTurboCxxModule( std::shared_ptr jsInvoker) : NativeSampleTurboCxxModuleSpecJSI(jsInvoker) {} -void SampleTurboCxxModule::voidFunc(jsi::Runtime &rt) { +void SampleTurboCxxModule::voidFunc(jsi::Runtime& rt) { // Nothing to do } -bool SampleTurboCxxModule::getBool(jsi::Runtime &rt, bool arg) { +bool SampleTurboCxxModule::getBool(jsi::Runtime& rt, bool arg) { return arg; } -double SampleTurboCxxModule::getEnum(jsi::Runtime &rt, double arg) { +double SampleTurboCxxModule::getEnum(jsi::Runtime& rt, double arg) { return arg; } -double SampleTurboCxxModule::getNumber(jsi::Runtime &rt, double arg) { +double SampleTurboCxxModule::getNumber(jsi::Runtime& rt, double arg) { return arg; } jsi::String SampleTurboCxxModule::getString( - jsi::Runtime &rt, - const jsi::String &arg) { + jsi::Runtime& rt, + const jsi::String& arg) { return jsi::String::createFromUtf8(rt, arg.utf8(rt)); } jsi::Array SampleTurboCxxModule::getArray( - jsi::Runtime &rt, - const jsi::Array &arg) { + jsi::Runtime& rt, + const jsi::Array& arg) { return deepCopyJSIArray(rt, arg); } jsi::Object SampleTurboCxxModule::getObject( - jsi::Runtime &rt, - const jsi::Object &arg) { + jsi::Runtime& rt, + const jsi::Object& arg) { return deepCopyJSIObject(rt, arg); } jsi::Object SampleTurboCxxModule::getValue( - jsi::Runtime &rt, + jsi::Runtime& rt, double x, - const jsi::String &y, - const jsi::Object &z) { + const jsi::String& y, + const jsi::Object& z) { // Note: return type isn't type-safe. jsi::Object result(rt); result.setProperty(rt, "x", jsi::Value(x)); @@ -65,16 +65,16 @@ jsi::Object SampleTurboCxxModule::getValue( } void SampleTurboCxxModule::getValueWithCallback( - jsi::Runtime &rt, - const jsi::Function &callback) { + jsi::Runtime& rt, + const jsi::Function& callback) { callback.call(rt, jsi::String::createFromUtf8(rt, "value from callback!")); } jsi::Value SampleTurboCxxModule::getValueWithPromise( - jsi::Runtime &rt, + jsi::Runtime& rt, bool error) { return createPromiseAsJSIValue( - rt, [error](jsi::Runtime &rt2, std::shared_ptr promise) { + rt, [error](jsi::Runtime& rt2, std::shared_ptr promise) { if (error) { promise->reject("intentional promise rejection"); } else { @@ -83,7 +83,7 @@ jsi::Value SampleTurboCxxModule::getValueWithPromise( }); } -jsi::Object SampleTurboCxxModule::getConstants(jsi::Runtime &rt) { +jsi::Object SampleTurboCxxModule::getConstants(jsi::Runtime& rt) { // Note: return type isn't type-safe. jsi::Object result(rt); result.setProperty(rt, "const1", jsi::Value(true)); diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h index 923adb597af..5e2d7e66980 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h @@ -22,22 +22,22 @@ class SampleTurboCxxModule : public NativeSampleTurboCxxModuleSpecJSI { public: SampleTurboCxxModule(std::shared_ptr jsInvoker); - void voidFunc(jsi::Runtime &rt) override; - bool getBool(jsi::Runtime &rt, bool arg) override; - double getEnum(jsi::Runtime &rt, double arg) override; - double getNumber(jsi::Runtime &rt, double arg) override; - jsi::String getString(jsi::Runtime &rt, const jsi::String &arg) override; - jsi::Array getArray(jsi::Runtime &rt, const jsi::Array &arg) override; - jsi::Object getObject(jsi::Runtime &rt, const jsi::Object &arg) override; + void voidFunc(jsi::Runtime& rt) override; + bool getBool(jsi::Runtime& rt, bool arg) override; + double getEnum(jsi::Runtime& rt, double arg) override; + double getNumber(jsi::Runtime& rt, double arg) override; + jsi::String getString(jsi::Runtime& rt, const jsi::String& arg) override; + jsi::Array getArray(jsi::Runtime& rt, const jsi::Array& arg) override; + jsi::Object getObject(jsi::Runtime& rt, const jsi::Object& arg) override; jsi::Object getValue( - jsi::Runtime &rt, + jsi::Runtime& rt, double x, - const jsi::String &y, - const jsi::Object &z) override; - void getValueWithCallback(jsi::Runtime &rt, const jsi::Function &callback) + const jsi::String& y, + const jsi::Object& z) override; + void getValueWithCallback(jsi::Runtime& rt, const jsi::Function& callback) override; - jsi::Value getValueWithPromise(jsi::Runtime &rt, bool error) override; - jsi::Object getConstants(jsi::Runtime &rt) override; + jsi::Value getValueWithPromise(jsi::Runtime& rt, bool error) override; + jsi::Object getConstants(jsi::Runtime& rt) override; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp index 355daaa0179..e0212c1a21b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp @@ -13,60 +13,60 @@ namespace facebook::react { static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, VoidKind, "voidFunc", "()V", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, BooleanKind, "getBool", "(Z)Z", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getEnum( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, NumberKind, "getEnum", "(D)D", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, NumberKind, "getNumber", "(D)D", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, StringKind, @@ -79,12 +79,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getString( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ArrayKind, @@ -97,12 +97,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getArray( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ObjectKind, @@ -115,24 +115,24 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getObject( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, NumberKind, "getRootTag", "(D)D", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ObjectKind, @@ -145,12 +145,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValue( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, VoidKind, @@ -163,12 +163,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, PromiseKind, @@ -181,24 +181,24 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncThrows( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, VoidKind, "voidFuncThrows", "()V", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ObjectKind, @@ -211,12 +211,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectThrows( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, PromiseKind, @@ -229,24 +229,24 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_promiseThrows( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFuncAssert( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, VoidKind, "voidFuncAssert", "()V", args, count, cachedMethodId); } static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ObjectKind, @@ -259,12 +259,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectAssert( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, PromiseKind, @@ -277,12 +277,12 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_promiseAssert( static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants( - facebook::jsi::Runtime &rt, - TurboModule &turboModule, - const facebook::jsi::Value *args, + facebook::jsi::Runtime& rt, + TurboModule& turboModule, + const facebook::jsi::Value* args, size_t count) { static jmethodID cachedMethodId = nullptr; - return static_cast(turboModule) + return static_cast(turboModule) .invokeJavaMethod( rt, ObjectKind, @@ -294,7 +294,7 @@ __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants( } NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI( - const JavaTurboModule::InitParams ¶ms) + const JavaTurboModule::InitParams& params) : JavaTurboModule(params) { methodMap_["voidFunc"] = MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc}; @@ -352,8 +352,8 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI( } std::shared_ptr SampleTurboModuleSpec_ModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms) { + const std::string& moduleName, + const JavaTurboModule::InitParams& params) { if (moduleName == "SampleTurboModule") { return std::make_shared(params); } diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h index 82f79006ee1..96e9980cf7b 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h @@ -20,11 +20,11 @@ namespace facebook::react { */ class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public JavaTurboModule { public: - NativeSampleTurboModuleSpecJSI(const JavaTurboModule::InitParams ¶ms); + NativeSampleTurboModuleSpecJSI(const JavaTurboModule::InitParams& params); }; std::shared_ptr SampleTurboModuleSpec_ModuleProvider( - const std::string &moduleName, - const JavaTurboModule::InitParams ¶ms); + const std::string& moduleName, + const JavaTurboModule::InitParams& params); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp index 29ae0f7d205..3603efa9361 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.cpp @@ -127,22 +127,22 @@ double SampleTurboCxxModuleLegacyImpl::getNumber(double arg) { return arg; } -std::string SampleTurboCxxModuleLegacyImpl::getString(const std::string &arg) { +std::string SampleTurboCxxModuleLegacyImpl::getString(const std::string& arg) { return arg; } folly::dynamic SampleTurboCxxModuleLegacyImpl::getArray( - const folly::dynamic &arg) { + const folly::dynamic& arg) { return arg; } folly::dynamic SampleTurboCxxModuleLegacyImpl::getObject( - const folly::dynamic &arg) { + const folly::dynamic& arg) { return arg; } folly::dynamic SampleTurboCxxModuleLegacyImpl::getUnsafeObject( - const folly::dynamic &arg) { + const folly::dynamic& arg) { return arg; } @@ -152,20 +152,20 @@ double SampleTurboCxxModuleLegacyImpl::getRootTag(double arg) { folly::dynamic SampleTurboCxxModuleLegacyImpl::getValue( double x, - const std::string &y, - const folly::dynamic &z) { + const std::string& y, + const folly::dynamic& z) { return folly::dynamic::object("x", x)("y", y)("z", z); } void SampleTurboCxxModuleLegacyImpl::getValueWithCallback( - const CxxModule::Callback &callback) { + const CxxModule::Callback& callback) { callback({"value from callback!"}); } void SampleTurboCxxModuleLegacyImpl::getValueWithPromise( bool error, - const CxxModule::Callback &resolve, - const CxxModule::Callback &reject) { + const CxxModule::Callback& resolve, + const CxxModule::Callback& reject) { if (!error) { resolve({"result!"}); } else { diff --git a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h index 7b3cbc90ca6..9f1a4494e32 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h +++ b/packages/react-native/ReactCommon/react/nativemodule/samples/platform/ios/ReactCommon/SampleTurboCxxModuleLegacyImpl.h @@ -28,19 +28,19 @@ class SampleTurboCxxModuleLegacyImpl bool getBool(bool arg); double getEnum(double arg); double getNumber(double arg); - std::string getString(const std::string &arg); - folly::dynamic getArray(const folly::dynamic &arg); - folly::dynamic getObject(const folly::dynamic &arg); - folly::dynamic getUnsafeObject(const folly::dynamic &arg); + std::string getString(const std::string& arg); + folly::dynamic getArray(const folly::dynamic& arg); + folly::dynamic getObject(const folly::dynamic& arg); + folly::dynamic getUnsafeObject(const folly::dynamic& arg); double getRootTag(double arg); folly::dynamic - getValue(double x, const std::string &y, const folly::dynamic &z); + getValue(double x, const std::string& y, const folly::dynamic& z); void getValueWithCallback( - const facebook::xplat::module::CxxModule::Callback &callback); + const facebook::xplat::module::CxxModule::Callback& callback); void getValueWithPromise( bool error, - const facebook::xplat::module::CxxModule::Callback &resolve, - const facebook::xplat::module::CxxModule::Callback &reject); + const facebook::xplat::module::CxxModule::Callback& resolve, + const facebook::xplat::module::CxxModule::Callback& reject); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h index eef642690fd..64c52d42615 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h +++ b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationCallbackWrapper.h @@ -14,11 +14,11 @@ namespace facebook::react { class LayoutAnimationCallbackWrapper { public: - LayoutAnimationCallbackWrapper(jsi::Function &&callback) + LayoutAnimationCallbackWrapper(jsi::Function&& callback) : callback_(std::make_shared(std::move(callback))) {} LayoutAnimationCallbackWrapper() : callback_(nullptr) {} - void call(jsi::Runtime &runtime) const { + void call(jsi::Runtime& runtime) const { if (callback_) { callback_->call(runtime); callback_.reset(); diff --git a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp index 2fca43601ee..c086784e0ba 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp @@ -16,9 +16,9 @@ namespace facebook::react { void LayoutAnimationDriver::animationMutationsForFrame( SurfaceId surfaceId, - ShadowViewMutation::List &mutationsList, + ShadowViewMutation::List& mutationsList, uint64_t now) const { - for (auto &animation : inflightAnimations_) { + for (auto& animation : inflightAnimations_) { if (animation.surfaceId != surfaceId) { continue; } @@ -27,18 +27,18 @@ void LayoutAnimationDriver::animationMutationsForFrame( } int incompleteAnimations = 0; - for (auto &keyframe : animation.keyFrames) { + for (auto& keyframe : animation.keyFrames) { if (keyframe.invalidated) { continue; } - const auto &baselineShadowView = keyframe.viewStart; - const auto &finalShadowView = keyframe.viewEnd; + const auto& baselineShadowView = keyframe.viewStart; + const auto& finalShadowView = keyframe.viewEnd; // The contract with the "keyframes generation" phase is that any animated // node will have a valid configuration. const auto layoutAnimationConfig = animation.layoutAnimationConfig; - const auto &mutationConfig = + const auto& mutationConfig = (keyframe.type == AnimationConfigurationType::Delete ? layoutAnimationConfig.deleteConfig : (keyframe.type == AnimationConfigurationType::Create @@ -76,12 +76,12 @@ void LayoutAnimationDriver::animationMutationsForFrame( // Clear out finished animations for (auto it = inflightAnimations_.begin(); it != inflightAnimations_.end();) { - const auto &animation = *it; + const auto& animation = *it; if (animation.completed) { callCallback(animation.successCallback); // Queue up "final" mutations for all keyframes in the completed animation - for (const auto &keyframe : animation.keyFrames) { + for (const auto& keyframe : animation.keyFrames) { if (keyframe.invalidated) { continue; } diff --git a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h index 43179f038f0..8b2d13b3eee 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h +++ b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationDriver.h @@ -17,8 +17,8 @@ class LayoutAnimationDriver : public LayoutAnimationKeyFrameManager { public: LayoutAnimationDriver( RuntimeExecutor runtimeExecutor, - ContextContainer::Shared &contextContainer, - LayoutAnimationStatusDelegate *delegate) + ContextContainer::Shared& contextContainer, + LayoutAnimationStatusDelegate* delegate) : LayoutAnimationKeyFrameManager( runtimeExecutor, contextContainer, @@ -27,7 +27,7 @@ class LayoutAnimationDriver : public LayoutAnimationKeyFrameManager { protected: virtual void animationMutationsForFrame( SurfaceId surfaceId, - ShadowViewMutation::List &mutationsList, + ShadowViewMutation::List& mutationsList, uint64_t now) const override; }; diff --git a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp index 10c54a2d61e..6339d62de0e 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp @@ -35,7 +35,7 @@ namespace facebook::react { #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING static std::string GetMutationInstructionString( - const ShadowViewMutation &mutation) { + const ShadowViewMutation& mutation) { Tag tag = mutation.type == ShadowViewMutation::Type::Insert || mutation.type == ShadowViewMutation::Type::Create ? mutation.newChildShadowView.tag @@ -47,8 +47,8 @@ static std::string GetMutationInstructionString( void PrintMutationInstruction( std::string message, - const ShadowViewMutation &mutation) { - [&](std::ostream &stream) -> std::ostream & { + const ShadowViewMutation& mutation) { + [&](std::ostream& stream) -> std::ostream& { stream << message << " Mutation: " << GetMutationInstructionString(mutation); if (mutation.oldChildShadowView.tag != 0) { @@ -65,8 +65,8 @@ void PrintMutationInstruction( void PrintMutationInstructionRelative( std::string message, - const ShadowViewMutation &mutation, - const ShadowViewMutation &relativeMutation) { + const ShadowViewMutation& mutation, + const ShadowViewMutation& relativeMutation) { LOG(ERROR) << message << " Mutation: " << GetMutationInstructionString(mutation) << " RelativeMutation: " @@ -83,8 +83,8 @@ interpolateFloats(Float coefficient, Float oldValue, Float newValue) { LayoutAnimationKeyFrameManager::LayoutAnimationKeyFrameManager( RuntimeExecutor runtimeExecutor, - ContextContainer::Shared &contextContainer, - LayoutAnimationStatusDelegate *delegate) + ContextContainer::Shared& contextContainer, + LayoutAnimationStatusDelegate* delegate) : runtimeExecutor_(std::move(runtimeExecutor)), contextContainer_(contextContainer), layoutAnimationStatusDelegate_(delegate), @@ -101,10 +101,10 @@ LayoutAnimationKeyFrameManager::LayoutAnimationKeyFrameManager( * This is guaranteed to be called only on the JS thread. */ void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation( - jsi::Runtime &runtime, - const RawValue &config, - const jsi::Value &successCallbackValue, - const jsi::Value &failureCallbackValue) const { + jsi::Runtime& runtime, + const RawValue& config, + const jsi::Value& successCallbackValue, + const jsi::Value& failureCallbackValue) const { bool hasSuccessCallback = successCallbackValue.isObject() && successCallbackValue.getObject(runtime).isFunction(runtime); bool hasFailureCallback = failureCallbackValue.isObject() && @@ -141,7 +141,7 @@ void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation( } void LayoutAnimationKeyFrameManager::setComponentDescriptorRegistry( - const SharedComponentDescriptorRegistry &componentDescriptorRegistry) { + const SharedComponentDescriptorRegistry& componentDescriptorRegistry) { componentDescriptorRegistry_ = componentDescriptorRegistry; } @@ -170,7 +170,7 @@ std::optional LayoutAnimationKeyFrameManager::pullTransaction( SurfaceId surfaceId, MountingTransaction::Number transactionNumber, - const TransactionTelemetry &telemetry, + const TransactionTelemetry& telemetry, ShadowViewMutationList mutations) const { // Current time in milliseconds uint64_t now = now_(); @@ -196,18 +196,18 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "BEGINNING DISPLAYING ONGOING inflightAnimations_!"; int i = 0; int j = 0; - for (const auto &inflightAnimation : inflightAnimations_) { + for (const auto& inflightAnimation : inflightAnimations_) { i++; j = 0; if (inflightAnimation.completed) { continue; } - for (auto &keyframe : inflightAnimation.keyFrames) { + for (auto& keyframe : inflightAnimation.keyFrames) { j++; if (keyframe.invalidated) { continue; } - for (const auto &finalMutationForKeyFrame : + for (const auto& finalMutationForKeyFrame : keyframe.finalMutationsForKeyFrame) { if (finalMutationForKeyFrame.mutatedViewIsVirtual()) { std::string msg = "Animation " + std::to_string(i) + " keyframe " + @@ -268,7 +268,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( butter::set deletedTags; butter::set reparentedTags; // tags that are deleted and recreated std::unordered_map movedTags; - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Insert) { insertedTags.insert(mutation.newChildShadowView.tag); } @@ -295,7 +295,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( // immediately and animated as an update. std::vector keyFramesToAnimate; const auto layoutAnimationConfig = animation.layoutAnimationConfig; - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::RemoveDeleteTree) { continue; } @@ -351,7 +351,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( wasInsertedTagRemoved = movedIt != movedTags.end(); } - const auto &mutationConfig = + const auto& mutationConfig = (mutation.type == ShadowViewMutation::Type::Delete || (mutation.type == ShadowViewMutation::Type::Remove && !wasInsertedTagRemoved) @@ -383,7 +383,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( // any UPDATE animations already queued up for this tag, we adjust the // "previous" ShadowView. if (mutation.type == ShadowViewMutation::Type::Insert) { - for (auto &keyframe : keyFramesToAnimate) { + for (auto& keyframe : keyFramesToAnimate) { if (keyframe.tag == baselineShadowView.tag) { // If there's already an animation queued up, followed by this // Insert, it *must* be an Update mutation animation. Other @@ -405,7 +405,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( } } } else if (mutation.type == ShadowViewMutation::Type::Remove) { - for (auto &keyframe : keyFramesToAnimate) { + for (auto& keyframe : keyFramesToAnimate) { if (keyframe.tag == baselineShadowView.tag) { // If there's already an animation queued up, followed by this // Insert, it *must* be an Update mutation animation. Other @@ -468,8 +468,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( if (baselineShadowView.traits.check( ShadowNodeTraits::Trait::ViewKind)) { - const auto &viewProps = static_cast(*props); - const_cast(viewProps).opacity = 0; + const auto& viewProps = static_cast(*props); + const_cast(viewProps).opacity = 0; } react_native_assert(props != nullptr); @@ -489,8 +489,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( .cloneProps(propsParserContext, viewStart.props, {}); if (baselineShadowView.traits.check( ShadowNodeTraits::Trait::ViewKind)) { - const auto &viewProps = static_cast(*props); - const_cast(viewProps).transform = + const auto& viewProps = static_cast(*props); + const_cast(viewProps).transform = Transform::Scale(isScaleX ? 0 : 1, isScaleY ? 0 : 1, 1); } @@ -562,7 +562,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( auto correspondingInsertIt = std::find_if( mutations.begin(), mutations.end(), - [&removeTag](auto &mutation) { + [&removeTag](auto& mutation) { return mutation.type == ShadowViewMutation::Type::Insert && mutation.newChildShadowView.tag == removeTag; }); @@ -572,7 +572,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( auto correspondingDeleteIt = std::find_if( mutations.begin(), mutations.end(), - [&removeTag](auto &mutation) { + [&removeTag](auto& mutation) { return mutation.type == ShadowViewMutation::Type::Delete && mutation.oldChildShadowView.tag == removeTag; }); @@ -589,9 +589,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( if (baselineShadowView.traits.check( ShadowNodeTraits::Trait::ViewKind)) { - const auto &viewProps = - static_cast(*props); - const_cast(viewProps).opacity = 0; + const auto& viewProps = static_cast(*props); + const_cast(viewProps).opacity = 0; } react_native_assert(props != nullptr); @@ -614,9 +613,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( if (baselineShadowView.traits.check( ShadowNodeTraits::Trait::ViewKind)) { - const auto &viewProps = - static_cast(*props); - const_cast(viewProps).transform = + const auto& viewProps = static_cast(*props); + const_cast(viewProps).transform = Transform::Scale(isScaleX ? 0 : 1, isScaleY ? 0 : 1, 1); } @@ -649,8 +647,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( } // Handle conflicting animations - for (auto &conflictingKeyFrame : conflictingAnimations) { - const auto &conflictingMutationBaselineShadowView = + for (auto& conflictingKeyFrame : conflictingAnimations) { + const auto& conflictingMutationBaselineShadowView = conflictingKeyFrame.viewStart; // We've found a conflict. @@ -708,7 +706,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING { int idx = 0; - for (auto &mutation : immediateMutations) { + for (auto& mutation : immediateMutations) { PrintMutationInstruction( std::string("IMMEDIATE list: ") + std::to_string(idx) + "/" + std::to_string(immediateMutations.size()), @@ -719,8 +717,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( { int idx = 0; - for (const auto &keyframe : keyFramesToAnimate) { - for (const auto &finalMutationForKeyFrame : + for (const auto& keyframe : keyFramesToAnimate) { + for (const auto& finalMutationForKeyFrame : keyframe.finalMutationsForKeyFrame) { PrintMutationInstruction( std::string("FINAL list: ") + std::to_string(idx) + "/" + @@ -734,7 +732,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( #endif auto finalConflictingMutations = ShadowViewMutationList{}; - for (auto &keyFrame : conflictingAnimations) { + for (auto& keyFrame : conflictingAnimations) { // Special-case: if the next conflicting animation contain "delete", // while the final mutation has the same tag with "create", we should // remove both the delete and create as they have no effect when @@ -743,13 +741,13 @@ LayoutAnimationKeyFrameManager::pullTransaction( if (reduceDeleteCreateMutation_) { for (auto itMutation = immediateMutations.begin(); itMutation != immediateMutations.end();) { - auto &mutation = *itMutation; + auto& mutation = *itMutation; bool hasCreateMutationDeletedWithSameTag = false; if (mutation.newChildShadowView.tag == keyFrame.tag && mutation.type == ShadowViewMutation::Create) { for (auto itKeyFrame = keyFrame.finalMutationsForKeyFrame.begin(); itKeyFrame != keyFrame.finalMutationsForKeyFrame.end();) { - auto &conflictFinalMutation = *itKeyFrame; + auto& conflictFinalMutation = *itKeyFrame; if (conflictFinalMutation.type == ShadowViewMutation::Delete) { itKeyFrame = keyFrame.finalMutationsForKeyFrame.erase(itKeyFrame); @@ -779,7 +777,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( auto newKeyFrameForUpdate = std::find_if( keyFramesToAnimate.begin(), keyFramesToAnimate.end(), - [&](const auto &newKeyFrame) { + [&](const auto& newKeyFrame) { return newKeyFrame.type == AnimationConfigurationType::Update && newKeyFrame.tag == keyFrame.tag; @@ -792,7 +790,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( keyFrame.viewStart = keyFrame.viewPrev; // Find the insert mutation that conflicted with this update - for (auto &mutation : immediateMutations) { + for (auto& mutation : immediateMutations) { if (mutation.newChildShadowView.tag == keyFrame.tag && (mutation.type == ShadowViewMutation::Insert || mutation.type == ShadowViewMutation::Create)) { @@ -863,7 +861,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING LOG(ERROR) << "Adjust [Delayed] based on [FinalConflicting]"; #endif - for (auto &mutation : finalConflictingMutations) { + for (auto& mutation : finalConflictingMutations) { if (mutation.type == ShadowViewMutation::Type::Insert || mutation.type == ShadowViewMutation::Type::Remove) { adjustDelayedMutationIndicesForMutation(surfaceId, mutation, true); @@ -881,8 +879,8 @@ LayoutAnimationKeyFrameManager::pullTransaction( #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING LOG(ERROR) << "Adjust [FrameDelayed] based on [Delayed]"; #endif - for (auto &keyframe : inflightAnimations_.back().keyFrames) { - for (auto &finalMutation : keyframe.finalMutationsForKeyFrame) { + for (auto& keyframe : inflightAnimations_.back().keyFrames) { + for (auto& finalMutation : keyframe.finalMutationsForKeyFrame) { if (finalMutation.type == ShadowViewMutation::Type::Insert || finalMutation.type == ShadowViewMutation::Type::Remove) { // When adjusting, skip adjusting against last animation - because @@ -920,7 +918,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "Adjust each [ImmediateExecution] based on [Delayed] and [Delayed] based on each [ImmediateExecution]"; #endif - for (auto &mutation : immediateMutations) { + for (auto& mutation : immediateMutations) { // Note: when adjusting [ImmediateExecutions] based on [FrameDelayed], // we need only adjust Inserts. Since inserts are executed // highest-index-first, lower indices being delayed does not impact @@ -963,7 +961,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "No Animation: Queue up final conflicting animations"; #endif ShadowViewMutationList finalMutationsForConflictingAnimations{}; - for (const auto &keyFrame : conflictingAnimations) { + for (const auto& keyFrame : conflictingAnimations) { queueFinalMutationsForCompletedKeyFrame( keyFrame, finalMutationsForConflictingAnimations, @@ -982,7 +980,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "No Animation: Adjust delayed mutations based on all finalMutationsForConflictingAnimations"; #endif - for (const auto &mutation : finalMutationsForConflictingAnimations) { + for (const auto& mutation : finalMutationsForConflictingAnimations) { if (mutation.type == ShadowViewMutation::Type::Remove || mutation.type == ShadowViewMutation::Type::Insert) { adjustDelayedMutationIndicesForMutation(surfaceId, mutation); @@ -997,7 +995,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "No Animation: Adjust mutations based on remaining delayed mutations / adjust delayed, based on each"; #endif - for (auto &mutation : mutations) { + for (auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Remove || mutation.type == ShadowViewMutation::Type::Insert) { adjustImmediateMutationIndicesForDelayedMutations( @@ -1030,7 +1028,7 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "Adjust all delayed mutations based on final mutations generated by animation driver"; #endif - for (const auto &mutation : mutationsForAnimation) { + for (const auto& mutation : mutationsForAnimation) { if (mutation.type == ShadowViewMutation::Type::Remove) { adjustDelayedMutationIndicesForMutation(surfaceId, mutation); } @@ -1046,18 +1044,18 @@ LayoutAnimationKeyFrameManager::pullTransaction( LOG(ERROR) << "FINISHING DISPLAYING ONGOING inflightAnimations_!"; int i = 0; int j = 0; - for (const auto &inflightAnimation : inflightAnimations_) { + for (const auto& inflightAnimation : inflightAnimations_) { i++; j = 0; if (inflightAnimation.completed) { continue; } - for (auto &keyframe : inflightAnimation.keyFrames) { + for (auto& keyframe : inflightAnimation.keyFrames) { j++; if (keyframe.invalidated) { continue; } - for (const auto &finalMutation : keyframe.finalMutationsForKeyFrame) { + for (const auto& finalMutation : keyframe.finalMutationsForKeyFrame) { if (!finalMutation.mutatedViewIsVirtual()) { std::string msg = "Animation " + std::to_string(i) + " keyframe " + std::to_string(j) + ": Final Animation"; @@ -1094,7 +1092,7 @@ void LayoutAnimationKeyFrameManager::uiManagerDidConfigureNextLayoutAnimation( } void LayoutAnimationKeyFrameManager::setLayoutAnimationStatusDelegate( - LayoutAnimationStatusDelegate *delegate) const { + LayoutAnimationStatusDelegate* delegate) const { std::scoped_lock lock(layoutAnimationStatusDelegateMutex_); layoutAnimationStatusDelegate_ = delegate; } @@ -1107,21 +1105,21 @@ void LayoutAnimationKeyFrameManager::setClockNow( #pragma mark - Protected bool LayoutAnimationKeyFrameManager::hasComponentDescriptorForShadowView( - const ShadowView &shadowView) const { + const ShadowView& shadowView) const { return componentDescriptorRegistry_->hasComponentDescriptorAt( shadowView.componentHandle); } -const ComponentDescriptor & +const ComponentDescriptor& LayoutAnimationKeyFrameManager::getComponentDescriptorForShadowView( - const ShadowView &shadowView) const { + const ShadowView& shadowView) const { return componentDescriptorRegistry_->at(shadowView.componentHandle); } ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView( Float progress, - const ShadowView &startingView, - const ShadowView &finalView) const { + const ShadowView& startingView, + const ShadowView& finalView) const { react_native_assert(startingView.tag > 0); react_native_assert(finalView.tag > 0); if (!hasComponentDescriptorForShadowView(startingView)) { @@ -1131,7 +1129,7 @@ ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView( return finalView; } - const ComponentDescriptor &componentDescriptor = + const ComponentDescriptor& componentDescriptor = getComponentDescriptorForShadowView(startingView); // Base the mutated view on the finalView, so that the following stay @@ -1166,8 +1164,8 @@ ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView( } // Interpolate LayoutMetrics - const LayoutMetrics &finalLayoutMetrics = finalView.layoutMetrics; - const LayoutMetrics &baselineLayoutMetrics = startingView.layoutMetrics; + const LayoutMetrics& finalLayoutMetrics = finalView.layoutMetrics; + const LayoutMetrics& baselineLayoutMetrics = startingView.layoutMetrics; LayoutMetrics interpolatedLayoutMetrics = finalLayoutMetrics; interpolatedLayoutMetrics.frame.origin.x = interpolateFloats( progress, @@ -1191,21 +1189,21 @@ ShadowView LayoutAnimationKeyFrameManager::createInterpolatedShadowView( } void LayoutAnimationKeyFrameManager::callCallback( - const LayoutAnimationCallbackWrapper &callback) const { + const LayoutAnimationCallbackWrapper& callback) const { runtimeExecutor_( - [callback](jsi::Runtime &runtime) { callback.call(runtime); }); + [callback](jsi::Runtime& runtime) { callback.call(runtime); }); } void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame( - const AnimationKeyFrame &keyframe, - ShadowViewMutation::List &mutationsList, + const AnimationKeyFrame& keyframe, + ShadowViewMutation::List& mutationsList, bool interrupted, - const std::string & /*logPrefix*/) const { + const std::string& /*logPrefix*/) const { if (!keyframe.finalMutationsForKeyFrame.empty()) { // TODO: modularize this segment, it is repeated 2x in KeyFrameManager // as well. ShadowView prev = keyframe.viewPrev; - for (const auto &finalMutation : keyframe.finalMutationsForKeyFrame) { + for (const auto& finalMutation : keyframe.finalMutationsForKeyFrame) { PrintMutationInstruction( logPrefix + ": Queuing up Final Mutation:", finalMutation); // Copy so that if something else mutates the inflight animations, @@ -1306,7 +1304,7 @@ void LayoutAnimationKeyFrameManager::queueFinalMutationsForCompletedKeyFrame( void LayoutAnimationKeyFrameManager:: adjustImmediateMutationIndicesForDelayedMutations( SurfaceId surfaceId, - ShadowViewMutation &mutation, + ShadowViewMutation& mutation, bool skipLastAnimation, bool lastAnimationOnly) const { bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove; @@ -1327,13 +1325,13 @@ void LayoutAnimationKeyFrameManager:: // First, collect all final mutations that could impact this immediate // mutation. - std::vector candidateMutations{}; + std::vector candidateMutations{}; for (auto inflightAnimationIt = inflightAnimations_.rbegin() + (skipLastAnimation ? 1 : 0); inflightAnimationIt != inflightAnimations_.rend(); inflightAnimationIt++) { - auto &inflightAnimation = *inflightAnimationIt; + auto& inflightAnimation = *inflightAnimationIt; if (inflightAnimation.surfaceId != surfaceId) { continue; } @@ -1341,7 +1339,7 @@ void LayoutAnimationKeyFrameManager:: continue; } - for (const auto &animatedKeyFrame : inflightAnimation.keyFrames) { + for (const auto& animatedKeyFrame : inflightAnimation.keyFrames) { if (animatedKeyFrame.invalidated) { continue; } @@ -1352,7 +1350,7 @@ void LayoutAnimationKeyFrameManager:: continue; } - for (const auto &delayedMutation : + for (const auto& delayedMutation : animatedKeyFrame.finalMutationsForKeyFrame) { if (delayedMutation.type != ShadowViewMutation::Type::Remove) { continue; @@ -1391,7 +1389,7 @@ void LayoutAnimationKeyFrameManager:: candidateMutations.begin(), candidateMutations.end(), [&changed, &mutation, &adjustedDelta, &isRemoveMutation]( - const ShadowViewMutation *candidateMutation) { + const ShadowViewMutation* candidateMutation) { bool indexConflicts = (candidateMutation->index < mutation.index || (isRemoveMutation && @@ -1414,7 +1412,7 @@ void LayoutAnimationKeyFrameManager:: void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( SurfaceId surfaceId, - const ShadowViewMutation &mutation, + const ShadowViewMutation& mutation, bool skipLastAnimation) const { bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove; bool isInsertMutation = mutation.type == ShadowViewMutation::Type::Insert; @@ -1431,13 +1429,13 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( // First, collect all final mutations that could impact this immediate // mutation. - std::vector candidateMutations{}; + std::vector candidateMutations{}; for (auto inflightAnimationIt = inflightAnimations_.rbegin() + (skipLastAnimation ? 1 : 0); inflightAnimationIt != inflightAnimations_.rend(); inflightAnimationIt++) { - auto &inflightAnimation = *inflightAnimationIt; + auto& inflightAnimation = *inflightAnimationIt; if (inflightAnimation.surfaceId != surfaceId) { continue; @@ -1446,7 +1444,7 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( continue; } - for (auto &animatedKeyFrame : inflightAnimation.keyFrames) { + for (auto& animatedKeyFrame : inflightAnimation.keyFrames) { if (animatedKeyFrame.invalidated) { continue; } @@ -1457,7 +1455,7 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( continue; } - for (auto &finalAnimationMutation : + for (auto& finalAnimationMutation : animatedKeyFrame.finalMutationsForKeyFrame) { if (finalAnimationMutation.oldChildShadowView.tag == tag) { continue; @@ -1498,7 +1496,7 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( candidateMutations.begin(), candidateMutations.end(), [&mutation, &isRemoveMutation, &isInsertMutation, &changed]( - ShadowViewMutation *candidateMutation) { + ShadowViewMutation* candidateMutation) { if (isRemoveMutation && mutation.index <= candidateMutation->index) { candidateMutation->index--; @@ -1527,10 +1525,10 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation( void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations( SurfaceId surfaceId, - const ShadowViewMutationList &mutations, - std::vector &conflictingAnimations) const { + const ShadowViewMutationList& mutations, + std::vector& conflictingAnimations) const { ShadowViewMutationList localConflictingMutations{}; - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::RemoveDeleteTree) { continue; } @@ -1538,14 +1536,14 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations( bool mutationIsCreateOrDelete = mutation.type == ShadowViewMutation::Type::Create || mutation.type == ShadowViewMutation::Type::Delete; - const auto &baselineShadowView = + const auto& baselineShadowView = (mutation.type == ShadowViewMutation::Type::Insert || mutation.type == ShadowViewMutation::Type::Create) ? mutation.newChildShadowView : mutation.oldChildShadowView; auto baselineTag = baselineShadowView.tag; - for (auto &inflightAnimation : inflightAnimations_) { + for (auto& inflightAnimation : inflightAnimations_) { if (inflightAnimation.surfaceId != surfaceId) { continue; } @@ -1555,7 +1553,7 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations( for (auto it = inflightAnimation.keyFrames.begin(); it != inflightAnimation.keyFrames.end();) { - auto &animatedKeyFrame = *it; + auto& animatedKeyFrame = *it; if (animatedKeyFrame.invalidated) { continue; @@ -1586,7 +1584,7 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations( // opacity to "1", even if there's no final ShadowNode update. // TODO: don't animate virtual views in the first place? bool isVirtual = false; - for (const auto &finalMutationForKeyFrame : + for (const auto& finalMutationForKeyFrame : animatedKeyFrame.finalMutationsForKeyFrame) { isVirtual = isVirtual || finalMutationForKeyFrame.mutatedViewIsVirtual(); @@ -1600,7 +1598,7 @@ void LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations( } conflictingAnimations.push_back(animatedKeyFrame); - for (const auto &finalMutationForKeyFrame : + for (const auto& finalMutationForKeyFrame : animatedKeyFrame.finalMutationsForKeyFrame) { if (!isVirtual || finalMutationForKeyFrame.type == @@ -1651,7 +1649,7 @@ void LayoutAnimationKeyFrameManager::deleteAnimationsForStoppedSurfaces() for (auto it = inflightAnimations_.begin(); it != inflightAnimations_.end();) { - const auto &animation = *it; + const auto& animation = *it; if (surfaceIdsToStop.find(animation.surfaceId) != surfaceIdsToStop.end()) { it = inflightAnimations_.erase(it); @@ -1663,11 +1661,11 @@ void LayoutAnimationKeyFrameManager::deleteAnimationsForStoppedSurfaces() } Props::Shared LayoutAnimationKeyFrameManager::interpolateProps( - const ComponentDescriptor &componentDescriptor, - const PropsParserContext &context, + const ComponentDescriptor& componentDescriptor, + const PropsParserContext& context, Float animationProgress, - const Props::Shared &props, - const Props::Shared &newProps) const { + const Props::Shared& props, + const Props::Shared& newProps) const { #ifdef ANDROID // On Android only, the merged props should have the same RawProps as the // final props struct diff --git a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h index 6b8dc63f8ae..d1eeb7351a8 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h +++ b/packages/react-native/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h @@ -26,11 +26,11 @@ namespace facebook::react { #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING void PrintMutationInstruction( std::string message, - const ShadowViewMutation &mutation); + const ShadowViewMutation& mutation); void PrintMutationInstructionRelative( std::string message, - const ShadowViewMutation &mutation, - const ShadowViewMutation &relativeMutation); + const ShadowViewMutation& mutation, + const ShadowViewMutation& relativeMutation); #else #define PrintMutationInstruction(a, b) #define PrintMutationInstructionRelative(a, b, c) @@ -41,18 +41,18 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, public: LayoutAnimationKeyFrameManager( RuntimeExecutor runtimeExecutor, - ContextContainer::Shared &contextContainer, - LayoutAnimationStatusDelegate *delegate); + ContextContainer::Shared& contextContainer, + LayoutAnimationStatusDelegate* delegate); #pragma mark - UIManagerAnimationDelegate methods void uiManagerDidConfigureNextLayoutAnimation( - jsi::Runtime &runtime, - const RawValue &config, - const jsi::Value &successCallbackValue, - const jsi::Value &failureCallbackValue) const override; + jsi::Runtime& runtime, + const RawValue& config, + const jsi::Value& successCallbackValue, + const jsi::Value& failureCallbackValue) const override; - void setComponentDescriptorRegistry(const SharedComponentDescriptorRegistry & + void setComponentDescriptorRegistry(const SharedComponentDescriptorRegistry& componentDescriptorRegistry) override; void setReduceDeleteCreateMutation(bool reduceDeleteCreateMutation) override; @@ -72,7 +72,7 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, std::optional pullTransaction( SurfaceId surfaceId, MountingTransaction::Number number, - const TransactionTelemetry &telemetry, + const TransactionTelemetry& telemetry, ShadowViewMutationList mutations) const override; // Exposed for testing. @@ -85,7 +85,7 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, // also protected by the mutex! The only way to set this without a mutex is // via a constructor. void setLayoutAnimationStatusDelegate( - LayoutAnimationStatusDelegate *delegate) const; + LayoutAnimationStatusDelegate* delegate) const; void setClockNow(std::function now); @@ -102,9 +102,9 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, */ mutable std::vector inflightAnimations_{}; - bool hasComponentDescriptorForShadowView(const ShadowView &shadowView) const; - const ComponentDescriptor &getComponentDescriptorForShadowView( - const ShadowView &shadowView) const; + bool hasComponentDescriptorForShadowView(const ShadowView& shadowView) const; + const ComponentDescriptor& getComponentDescriptorForShadowView( + const ShadowView& shadowView) const; /** * Given a `progress` between 0 and 1, a mutation and LayoutAnimation config, @@ -117,14 +117,14 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, */ ShadowView createInterpolatedShadowView( Float progress, - const ShadowView &startingView, - const ShadowView &finalView) const; + const ShadowView& startingView, + const ShadowView& finalView) const; - void callCallback(const LayoutAnimationCallbackWrapper &callback) const; + void callCallback(const LayoutAnimationCallbackWrapper& callback) const; virtual void animationMutationsForFrame( SurfaceId surfaceId, - ShadowViewMutation::List &mutationsList, + ShadowViewMutation::List& mutationsList, uint64_t now) const = 0; /** @@ -132,17 +132,17 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, * Keyframe animation may have timed-out, or be canceled due to a conflict. */ void queueFinalMutationsForCompletedKeyFrame( - const AnimationKeyFrame &keyframe, - ShadowViewMutation::List &mutationsList, + const AnimationKeyFrame& keyframe, + ShadowViewMutation::List& mutationsList, bool interrupted, - const std::string &logPrefix) const; + const std::string& logPrefix) const; private: RuntimeExecutor runtimeExecutor_; ContextContainer::Shared contextContainer_; mutable std::mutex layoutAnimationStatusDelegateMutex_; - mutable LayoutAnimationStatusDelegate *layoutAnimationStatusDelegate_{}; + mutable LayoutAnimationStatusDelegate* layoutAnimationStatusDelegate_{}; mutable std::mutex surfaceIdsToStopMutex_; mutable butter::set surfaceIdsToStop_{}; bool reduceDeleteCreateMutation_{false}; @@ -152,19 +152,19 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, void adjustImmediateMutationIndicesForDelayedMutations( SurfaceId surfaceId, - ShadowViewMutation &mutation, + ShadowViewMutation& mutation, bool skipLastAnimation = false, bool lastAnimationOnly = false) const; void adjustDelayedMutationIndicesForMutation( SurfaceId surfaceId, - const ShadowViewMutation &mutation, + const ShadowViewMutation& mutation, bool skipLastAnimation = false) const; void getAndEraseConflictingAnimations( SurfaceId surfaceId, - const ShadowViewMutationList &mutations, - std::vector &conflictingAnimations) const; + const ShadowViewMutationList& mutations, + std::vector& conflictingAnimations) const; /* * Removes animations from `inflightAnimations_` for stopped surfaces. @@ -172,17 +172,17 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate, void deleteAnimationsForStoppedSurfaces() const; void simulateImagePropsMemoryAccess( - const ShadowViewMutationList &mutations) const; + const ShadowViewMutationList& mutations) const; /** * Interpolates the props values. */ Props::Shared interpolateProps( - const ComponentDescriptor &componentDescriptor, - const PropsParserContext &context, + const ComponentDescriptor& componentDescriptor, + const PropsParserContext& context, Float animationProgress, - const Props::Shared &props, - const Props::Shared &newProps) const; + const Props::Shared& props, + const Props::Shared& newProps) const; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/animations/conversions.h b/packages/react-native/ReactCommon/react/renderer/animations/conversions.h index d453b1080f3..70f24860403 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/animations/conversions.h @@ -57,7 +57,7 @@ static inline std::optional parseAnimationProperty( } static inline std::optional parseAnimationConfig( - const folly::dynamic &config, + const folly::dynamic& config, double defaultDuration, bool parsePropertyType) { if (config.empty() || !config.isObject()) { @@ -173,7 +173,7 @@ static inline std::optional parseAnimationConfig( // Parse animation config from JS static inline std::optional parseLayoutAnimationConfig( - const folly::dynamic &config) { + const folly::dynamic& config) { if (config.empty() || !config.isObject()) { return {}; } diff --git a/packages/react-native/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp b/packages/react-native/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp index f5de7ef5a63..d196ff2054b 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animations/tests/LayoutAnimationTest.cpp @@ -61,7 +61,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations( // Create a RuntimeExecutor RuntimeExecutor runtimeExecutor = - [](const std::function & /*unused*/) {}; + [](const std::function& /*unused*/) {}; // Create component descriptor registry for animation driver auto providerRegistry = @@ -138,7 +138,7 @@ static void testShadowNodeTreeLifeCycleLayoutAnimations( &messWithLayoutableOnlyFlag, }); - std::vector affectedLayoutableNodes{}; + std::vector affectedLayoutableNodes{}; affectedLayoutableNodes.reserve(1024); // Laying out the tree. diff --git a/packages/react-native/ReactCommon/react/renderer/animations/utils.cpp b/packages/react-native/ReactCommon/react/renderer/animations/utils.cpp index 8ee817054ef..b4dc6b5b1aa 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/utils.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animations/utils.cpp @@ -12,8 +12,8 @@ namespace facebook::react { std::pair calculateAnimationProgress( uint64_t now, - const LayoutAnimation &animation, - const AnimationConfig &mutationConfig) { + const LayoutAnimation& animation, + const AnimationConfig& mutationConfig) { if (mutationConfig.animationType == AnimationType::None) { return {1, 1}; } diff --git a/packages/react-native/ReactCommon/react/renderer/animations/utils.h b/packages/react-native/ReactCommon/react/renderer/animations/utils.h index 343c8c48a7e..5ddd226a71e 100644 --- a/packages/react-native/ReactCommon/react/renderer/animations/utils.h +++ b/packages/react-native/ReactCommon/react/renderer/animations/utils.h @@ -14,8 +14,8 @@ namespace facebook::react { static inline bool shouldFirstComeBeforeSecondRemovesOnly( - const ShadowViewMutation &lhs, - const ShadowViewMutation &rhs) noexcept { + const ShadowViewMutation& lhs, + const ShadowViewMutation& rhs) noexcept { // Make sure that removes on the same level are sorted - highest indices must // come first. return (lhs.type == ShadowViewMutation::Type::Remove && @@ -25,8 +25,8 @@ static inline bool shouldFirstComeBeforeSecondRemovesOnly( } static inline bool shouldFirstComeBeforeSecondMutation( - const ShadowViewMutation &lhs, - const ShadowViewMutation &rhs) noexcept { + const ShadowViewMutation& lhs, + const ShadowViewMutation& rhs) noexcept { if (lhs.type != rhs.type) { // Deletes always come last if (lhs.type == ShadowViewMutation::Type::Delete) { @@ -73,7 +73,7 @@ static inline bool shouldFirstComeBeforeSecondMutation( std::pair calculateAnimationProgress( uint64_t now, - const LayoutAnimation &animation, - const AnimationConfig &mutationConfig); + const LayoutAnimation& animation, + const AnimationConfig& mutationConfig); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.cpp b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.cpp index 45300350bea..d90407738aa 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.cpp +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.cpp @@ -21,7 +21,7 @@ std::string Fragment::AttachmentCharacter() { // consist of char8_t instead of char, which in turn requires std::u8string, // etc. Here we were assuming char was UTF-8 anyway, so just cast to that // (which is valid because char* is allowed to alias anything). - return reinterpret_cast( + return reinterpret_cast( u8"\uFFFC"); // Unicode `OBJECT REPLACEMENT CHARACTER` } @@ -29,7 +29,7 @@ bool Fragment::isAttachment() const { return string == AttachmentCharacter(); } -bool Fragment::operator==(const Fragment &rhs) const { +bool Fragment::operator==(const Fragment& rhs) const { return std::tie( string, textAttributes, @@ -42,18 +42,18 @@ bool Fragment::operator==(const Fragment &rhs) const { rhs.parentShadowView.layoutMetrics); } -bool Fragment::isContentEqual(const Fragment &rhs) const { +bool Fragment::isContentEqual(const Fragment& rhs) const { return std::tie(string, textAttributes) == std::tie(rhs.string, rhs.textAttributes); } -bool Fragment::operator!=(const Fragment &rhs) const { +bool Fragment::operator!=(const Fragment& rhs) const { return !(*this == rhs); } #pragma mark - AttributedString -void AttributedString::appendFragment(const Fragment &fragment) { +void AttributedString::appendFragment(const Fragment& fragment) { ensureUnsealed(); if (fragment.string.empty()) { @@ -63,7 +63,7 @@ void AttributedString::appendFragment(const Fragment &fragment) { fragments_.push_back(fragment); } -void AttributedString::prependFragment(const Fragment &fragment) { +void AttributedString::prependFragment(const Fragment& fragment) { ensureUnsealed(); if (fragment.string.empty()) { @@ -74,7 +74,7 @@ void AttributedString::prependFragment(const Fragment &fragment) { } void AttributedString::appendAttributedString( - const AttributedString &attributedString) { + const AttributedString& attributedString) { ensureUnsealed(); fragments_.insert( fragments_.end(), @@ -83,7 +83,7 @@ void AttributedString::appendAttributedString( } void AttributedString::prependAttributedString( - const AttributedString &attributedString) { + const AttributedString& attributedString) { ensureUnsealed(); fragments_.insert( fragments_.begin(), @@ -91,17 +91,17 @@ void AttributedString::prependAttributedString( attributedString.fragments_.end()); } -const Fragments &AttributedString::getFragments() const { +const Fragments& AttributedString::getFragments() const { return fragments_; } -Fragments &AttributedString::getFragments() { +Fragments& AttributedString::getFragments() { return fragments_; } std::string AttributedString::getString() const { auto string = std::string{}; - for (const auto &fragment : fragments_) { + for (const auto& fragment : fragments_) { string += fragment.string; } return string; @@ -112,7 +112,7 @@ bool AttributedString::isEmpty() const { } bool AttributedString::compareTextAttributesWithoutFrame( - const AttributedString &rhs) const { + const AttributedString& rhs) const { if (fragments_.size() != rhs.fragments_.size()) { return false; } @@ -127,15 +127,15 @@ bool AttributedString::compareTextAttributesWithoutFrame( return true; } -bool AttributedString::operator==(const AttributedString &rhs) const { +bool AttributedString::operator==(const AttributedString& rhs) const { return fragments_ == rhs.fragments_; } -bool AttributedString::operator!=(const AttributedString &rhs) const { +bool AttributedString::operator!=(const AttributedString& rhs) const { return !(*this == rhs); } -bool AttributedString::isContentEqual(const AttributedString &rhs) const { +bool AttributedString::isContentEqual(const AttributedString& rhs) const { if (fragments_.size() != rhs.fragments_.size()) { return false; } @@ -155,7 +155,7 @@ bool AttributedString::isContentEqual(const AttributedString &rhs) const { SharedDebugStringConvertibleList AttributedString::getDebugChildren() const { auto list = SharedDebugStringConvertibleList{}; - for (auto &&fragment : fragments_) { + for (auto&& fragment : fragments_) { auto propsList = fragment.textAttributes.DebugStringConvertible::getDebugProps(); diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h index 0930e658d80..dbfc8b667d7 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedString.h @@ -49,10 +49,10 @@ class AttributedString : public Sealable, public DebugStringConvertible { * Returns whether the underlying text and attributes are equal, * disregarding layout or other information. */ - bool isContentEqual(const Fragment &rhs) const; + bool isContentEqual(const Fragment& rhs) const; - bool operator==(const Fragment &rhs) const; - bool operator!=(const Fragment &rhs) const; + bool operator==(const Fragment& rhs) const; + bool operator!=(const Fragment& rhs) const; }; class Range { @@ -66,25 +66,25 @@ class AttributedString : public Sealable, public DebugStringConvertible { /* * Appends and prepends a `fragment` to the string. */ - void appendFragment(const Fragment &fragment); - void prependFragment(const Fragment &fragment); + void appendFragment(const Fragment& fragment); + void prependFragment(const Fragment& fragment); /* * Appends and prepends an `attributedString` (all its fragments) to * the string. */ - void appendAttributedString(const AttributedString &attributedString); - void prependAttributedString(const AttributedString &attributedString); + void appendAttributedString(const AttributedString& attributedString); + void prependAttributedString(const AttributedString& attributedString); /* * Returns a read-only reference to a list of fragments. */ - const Fragments &getFragments() const; + const Fragments& getFragments() const; /* * Returns a reference to a list of fragments. */ - Fragments &getFragments(); + Fragments& getFragments(); /* * Returns a string constructed from all strings in all fragments. @@ -99,12 +99,12 @@ class AttributedString : public Sealable, public DebugStringConvertible { /** * Compares equality of TextAttributes of all Fragments on both sides. */ - bool compareTextAttributesWithoutFrame(const AttributedString &rhs) const; + bool compareTextAttributesWithoutFrame(const AttributedString& rhs) const; - bool isContentEqual(const AttributedString &rhs) const; + bool isContentEqual(const AttributedString& rhs) const; - bool operator==(const AttributedString &rhs) const; - bool operator!=(const AttributedString &rhs) const; + bool operator==(const AttributedString& rhs) const; + bool operator!=(const AttributedString& rhs) const; #pragma mark - DebugStringConvertible @@ -122,7 +122,7 @@ namespace std { template <> struct hash { size_t operator()( - const facebook::react::AttributedString::Fragment &fragment) const { + const facebook::react::AttributedString::Fragment& fragment) const { return folly::hash::hash_combine( 0, fragment.string, @@ -135,10 +135,10 @@ struct hash { template <> struct hash { size_t operator()( - const facebook::react::AttributedString &attributedString) const { + const facebook::react::AttributedString& attributedString) const { auto seed = size_t{0}; - for (const auto &fragment : attributedString.getFragments()) { + for (const auto& fragment : attributedString.getFragments()) { seed = folly::hash::hash_combine(seed, fragment); } diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp index 1d2373da91f..be3552ff66d 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.cpp @@ -18,7 +18,7 @@ AttributedStringBox::AttributedStringBox() value_(std::make_shared(AttributedString{})), opaquePointer_({}){}; -AttributedStringBox::AttributedStringBox(const AttributedString &value) +AttributedStringBox::AttributedStringBox(const AttributedString& value) : mode_(Mode::Value), value_(std::make_shared(value)), opaquePointer_({}){}; @@ -28,7 +28,7 @@ AttributedStringBox::AttributedStringBox(std::shared_ptr opaquePointer) value_({}), opaquePointer_(std::move(opaquePointer)) {} -AttributedStringBox::AttributedStringBox(AttributedStringBox &&other) noexcept +AttributedStringBox::AttributedStringBox(AttributedStringBox&& other) noexcept : mode_(other.mode_), value_(std::move(other.value_)), opaquePointer_(std::move(other.opaquePointer_)) { @@ -40,7 +40,7 @@ AttributedStringBox::Mode AttributedStringBox::getMode() const { return mode_; } -const AttributedString &AttributedStringBox::getValue() const { +const AttributedString& AttributedStringBox::getValue() const { react_native_assert(mode_ == AttributedStringBox::Mode::Value); react_native_assert(value_); return *value_; @@ -52,8 +52,8 @@ std::shared_ptr AttributedStringBox::getOpaquePointer() const { return opaquePointer_; } -AttributedStringBox &AttributedStringBox::operator=( - AttributedStringBox &&other) noexcept { +AttributedStringBox& AttributedStringBox::operator=( + AttributedStringBox&& other) noexcept { if (this != &other) { mode_ = other.mode_; value_ = std::move(other.value_); @@ -65,8 +65,8 @@ AttributedStringBox &AttributedStringBox::operator=( } bool operator==( - const AttributedStringBox &lhs, - const AttributedStringBox &rhs) { + const AttributedStringBox& lhs, + const AttributedStringBox& rhs) { if (lhs.getMode() != rhs.getMode()) { return false; } @@ -80,8 +80,8 @@ bool operator==( } bool operator!=( - const AttributedStringBox &lhs, - const AttributedStringBox &rhs) { + const AttributedStringBox& lhs, + const AttributedStringBox& rhs) { return !(lhs == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h index 7701e385e10..026ff61ec07 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/AttributedStringBox.h @@ -33,22 +33,22 @@ class AttributedStringBox final { /* * Custom explicit constructors. */ - explicit AttributedStringBox(const AttributedString &value); + explicit AttributedStringBox(const AttributedString& value); explicit AttributedStringBox(std::shared_ptr opaquePointer); /* * Movable, Copyable, Assignable. */ - AttributedStringBox(const AttributedStringBox &other) = default; - AttributedStringBox(AttributedStringBox &&other) noexcept; - AttributedStringBox &operator=(const AttributedStringBox &other) = default; - AttributedStringBox &operator=(AttributedStringBox &&other) noexcept; + AttributedStringBox(const AttributedStringBox& other) = default; + AttributedStringBox(AttributedStringBox&& other) noexcept; + AttributedStringBox& operator=(const AttributedStringBox& other) = default; + AttributedStringBox& operator=(AttributedStringBox&& other) noexcept; /* * Getters. */ Mode getMode() const; - const AttributedString &getValue() const; + const AttributedString& getValue() const; std::shared_ptr getOpaquePointer() const; private: @@ -57,15 +57,15 @@ class AttributedStringBox final { std::shared_ptr opaquePointer_; }; -bool operator==(const AttributedStringBox &lhs, const AttributedStringBox &rhs); -bool operator!=(const AttributedStringBox &lhs, const AttributedStringBox &rhs); +bool operator==(const AttributedStringBox& lhs, const AttributedStringBox& rhs); +bool operator!=(const AttributedStringBox& lhs, const AttributedStringBox& rhs); } // namespace facebook::react template <> struct std::hash { size_t operator()( - const facebook::react::AttributedStringBox &attributedStringBox) const { + const facebook::react::AttributedStringBox& attributedStringBox) const { switch (attributedStringBox.getMode()) { case facebook::react::AttributedStringBox::Mode::Value: return std::hash()( diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp index 2994acac612..f2317ba080f 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.cpp @@ -14,7 +14,7 @@ namespace facebook::react { -bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const { +bool ParagraphAttributes::operator==(const ParagraphAttributes& rhs) const { return std::tie( maximumNumberOfLines, ellipsizeMode, @@ -33,7 +33,7 @@ bool ParagraphAttributes::operator==(const ParagraphAttributes &rhs) const { floatEquality(maximumFontSize, rhs.maximumFontSize); } -bool ParagraphAttributes::operator!=(const ParagraphAttributes &rhs) const { +bool ParagraphAttributes::operator!=(const ParagraphAttributes& rhs) const { return !(*this == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h index 510454d366e..591e15b3787 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/ParagraphAttributes.h @@ -70,8 +70,8 @@ class ParagraphAttributes : public DebugStringConvertible { Float minimumFontSize{std::numeric_limits::quiet_NaN()}; Float maximumFontSize{std::numeric_limits::quiet_NaN()}; - bool operator==(const ParagraphAttributes &) const; - bool operator!=(const ParagraphAttributes &) const; + bool operator==(const ParagraphAttributes&) const; + bool operator!=(const ParagraphAttributes&) const; #pragma mark - DebugStringConvertible @@ -87,7 +87,7 @@ namespace std { template <> struct hash { size_t operator()( - const facebook::react::ParagraphAttributes &attributes) const { + const facebook::react::ParagraphAttributes& attributes) const { return folly::hash::hash_combine( 0, attributes.maximumNumberOfLines, diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp index dfeaafef0d2..a6d2f1edf24 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp @@ -106,7 +106,7 @@ void TextAttributes::apply(TextAttributes textAttributes) { #pragma mark - Operators -bool TextAttributes::operator==(const TextAttributes &rhs) const { +bool TextAttributes::operator==(const TextAttributes& rhs) const { return std::tie( foregroundColor, backgroundColor, @@ -159,7 +159,7 @@ bool TextAttributes::operator==(const TextAttributes &rhs) const { floatEquality(textShadowRadius, rhs.textShadowRadius); } -bool TextAttributes::operator!=(const TextAttributes &rhs) const { +bool TextAttributes::operator!=(const TextAttributes& rhs) const { return !(*this == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h index a681e9b4837..4550db55974 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.h @@ -89,8 +89,8 @@ class TextAttributes : public DebugStringConvertible { #pragma mark - Operators - bool operator==(const TextAttributes &rhs) const; - bool operator!=(const TextAttributes &rhs) const; + bool operator==(const TextAttributes& rhs) const; + bool operator!=(const TextAttributes& rhs) const; #pragma mark - DebugStringConvertible @@ -106,7 +106,7 @@ namespace std { template <> struct hash { size_t operator()( - const facebook::react::TextAttributes &textAttributes) const { + const facebook::react::TextAttributes& textAttributes) const { return folly::hash::hash_combine( 0, textAttributes.foregroundColor, diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h index e7b617dd044..e6097339051 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/conversions.h @@ -33,7 +33,7 @@ namespace facebook::react { -inline std::string toString(const DynamicTypeRamp &dynamicTypeRamp) { +inline std::string toString(const DynamicTypeRamp& dynamicTypeRamp) { switch (dynamicTypeRamp) { case DynamicTypeRamp::Caption2: return "caption2"; @@ -67,9 +67,9 @@ inline std::string toString(const DynamicTypeRamp &dynamicTypeRamp) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - DynamicTypeRamp &result) { + const PropsParserContext& context, + const RawValue& value, + DynamicTypeRamp& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -111,7 +111,7 @@ inline void fromRawValue( result = DynamicTypeRamp::Body; } -inline std::string toString(const EllipsizeMode &ellipsisMode) { +inline std::string toString(const EllipsizeMode& ellipsisMode) { switch (ellipsisMode) { case EllipsizeMode::Clip: return "clip"; @@ -131,9 +131,9 @@ inline std::string toString(const EllipsizeMode &ellipsisMode) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - EllipsizeMode &result) { + const PropsParserContext& context, + const RawValue& value, + EllipsizeMode& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -161,7 +161,7 @@ inline void fromRawValue( result = EllipsizeMode::Tail; } -inline std::string toString(const TextBreakStrategy &textBreakStrategy) { +inline std::string toString(const TextBreakStrategy& textBreakStrategy) { switch (textBreakStrategy) { case TextBreakStrategy::Simple: return "simple"; @@ -177,9 +177,9 @@ inline std::string toString(const TextBreakStrategy &textBreakStrategy) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextBreakStrategy &result) { + const PropsParserContext& context, + const RawValue& value, + TextBreakStrategy& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -204,9 +204,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - FontWeight &result) { + const PropsParserContext& context, + const RawValue& value, + FontWeight& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -248,14 +248,14 @@ inline void fromRawValue( result = FontWeight::Regular; } -inline std::string toString(const FontWeight &fontWeight) { +inline std::string toString(const FontWeight& fontWeight) { return folly::to((int)fontWeight); } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - FontStyle &result) { + const PropsParserContext& context, + const RawValue& value, + FontStyle& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -280,7 +280,7 @@ inline void fromRawValue( result = FontStyle::Normal; } -inline std::string toString(const FontStyle &fontStyle) { +inline std::string toString(const FontStyle& fontStyle) { switch (fontStyle) { case FontStyle::Normal: return "normal"; @@ -297,14 +297,14 @@ inline std::string toString(const FontStyle &fontStyle) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - FontVariant &result) { + const PropsParserContext& context, + const RawValue& value, + FontVariant& result) { result = FontVariant::Default; react_native_expect(value.hasType>()); if (value.hasType>()) { auto items = std::vector{value}; - for (const auto &item : items) { + for (const auto& item : items) { if (item == "small-caps") { result = (FontVariant)((int)result | (int)FontVariant::SmallCaps); } else if (item == "oldstyle-nums") { @@ -327,7 +327,7 @@ inline void fromRawValue( } } -inline std::string toString(const FontVariant &fontVariant) { +inline std::string toString(const FontVariant& fontVariant) { auto result = std::string{}; auto separator = std::string{", "}; if ((int)fontVariant & (int)FontVariant::SmallCaps) { @@ -354,9 +354,9 @@ inline std::string toString(const FontVariant &fontVariant) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextTransform &result) { + const PropsParserContext& context, + const RawValue& value, + TextTransform& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -385,7 +385,7 @@ inline void fromRawValue( result = TextTransform::None; } -inline std::string toString(const TextTransform &textTransform) { +inline std::string toString(const TextTransform& textTransform) { switch (textTransform) { case TextTransform::None: return "none"; @@ -406,9 +406,9 @@ inline std::string toString(const TextTransform &textTransform) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextAlignment &result) { + const PropsParserContext& context, + const RawValue& value, + TextAlignment& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -436,7 +436,7 @@ inline void fromRawValue( result = TextAlignment::Natural; } -inline std::string toString(const TextAlignment &textAlignment) { +inline std::string toString(const TextAlignment& textAlignment) { switch (textAlignment) { case TextAlignment::Natural: return "auto"; @@ -456,9 +456,9 @@ inline std::string toString(const TextAlignment &textAlignment) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - WritingDirection &result) { + const PropsParserContext& context, + const RawValue& value, + WritingDirection& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -482,7 +482,7 @@ inline void fromRawValue( result = WritingDirection::Natural; } -inline std::string toString(const WritingDirection &writingDirection) { +inline std::string toString(const WritingDirection& writingDirection) { switch (writingDirection) { case WritingDirection::Natural: return "auto"; @@ -498,9 +498,9 @@ inline std::string toString(const WritingDirection &writingDirection) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - LineBreakStrategy &result) { + const PropsParserContext& context, + const RawValue& value, + LineBreakStrategy& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -526,7 +526,7 @@ inline void fromRawValue( result = LineBreakStrategy::None; } -inline std::string toString(const LineBreakStrategy &lineBreakStrategy) { +inline std::string toString(const LineBreakStrategy& lineBreakStrategy) { switch (lineBreakStrategy) { case LineBreakStrategy::None: return "none"; @@ -544,9 +544,9 @@ inline std::string toString(const LineBreakStrategy &lineBreakStrategy) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextDecorationLineType &result) { + const PropsParserContext& context, + const RawValue& value, + TextDecorationLineType& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -577,7 +577,7 @@ inline void fromRawValue( } inline std::string toString( - const TextDecorationLineType &textDecorationLineType) { + const TextDecorationLineType& textDecorationLineType) { switch (textDecorationLineType) { case TextDecorationLineType::None: return "none"; @@ -596,9 +596,9 @@ inline std::string toString( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextDecorationStyle &result) { + const PropsParserContext& context, + const RawValue& value, + TextDecorationStyle& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -624,7 +624,7 @@ inline void fromRawValue( result = TextDecorationStyle::Solid; } -inline std::string toString(const TextDecorationStyle &textDecorationStyle) { +inline std::string toString(const TextDecorationStyle& textDecorationStyle) { switch (textDecorationStyle) { case TextDecorationStyle::Solid: return "solid"; @@ -642,7 +642,7 @@ inline std::string toString(const TextDecorationStyle &textDecorationStyle) { return "solid"; } -inline std::string toString(const HyphenationFrequency &hyphenationFrequency) { +inline std::string toString(const HyphenationFrequency& hyphenationFrequency) { switch (hyphenationFrequency) { case HyphenationFrequency::None: return "none"; @@ -658,9 +658,9 @@ inline std::string toString(const HyphenationFrequency &hyphenationFrequency) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - HyphenationFrequency &result) { + const PropsParserContext& context, + const RawValue& value, + HyphenationFrequency& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -685,10 +685,10 @@ inline void fromRawValue( } inline ParagraphAttributes convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const ParagraphAttributes &sourceParagraphAttributes, - const ParagraphAttributes &defaultParagraphAttributes) { + const PropsParserContext& context, + const RawProps& rawProps, + const ParagraphAttributes& sourceParagraphAttributes, + const ParagraphAttributes& defaultParagraphAttributes) { auto paragraphAttributes = ParagraphAttributes{}; paragraphAttributes.maximumNumberOfLines = convertRawProp( @@ -744,9 +744,9 @@ inline ParagraphAttributes convertRawProp( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AttributedString::Range &result) { + const PropsParserContext& context, + const RawValue& value, + AttributedString::Range& result) { auto map = (butter::map)value; auto start = map.find("start"); @@ -759,7 +759,7 @@ inline void fromRawValue( } } -inline std::string toString(const AttributedString::Range &range) { +inline std::string toString(const AttributedString::Range& range) { return "{location: " + folly::to(range.location) + ", length: " + folly::to(range.length) + "}"; } @@ -767,7 +767,7 @@ inline std::string toString(const AttributedString::Range &range) { #ifdef ANDROID inline folly::dynamic toDynamic( - const ParagraphAttributes ¶graphAttributes) { + const ParagraphAttributes& paragraphAttributes) { auto values = folly::dynamic::object(); values("maximumNumberOfLines", paragraphAttributes.maximumNumberOfLines); values("ellipsizeMode", toString(paragraphAttributes.ellipsizeMode)); @@ -781,7 +781,7 @@ inline folly::dynamic toDynamic( return values; } -inline folly::dynamic toDynamic(const FontVariant &fontVariant) { +inline folly::dynamic toDynamic(const FontVariant& fontVariant) { auto result = folly::dynamic::array(); if ((int)fontVariant & (int)FontVariant::SmallCaps) { result.push_back("small-caps"); @@ -802,7 +802,7 @@ inline folly::dynamic toDynamic(const FontVariant &fontVariant) { return result; } -inline folly::dynamic toDynamic(const TextAttributes &textAttributes) { +inline folly::dynamic toDynamic(const TextAttributes& textAttributes) { auto _textAttributes = folly::dynamic::object(); if (textAttributes.foregroundColor) { _textAttributes( @@ -895,7 +895,7 @@ inline folly::dynamic toDynamic(const TextAttributes &textAttributes) { return _textAttributes; } -inline folly::dynamic toDynamic(const AttributedString &attributedString) { +inline folly::dynamic toDynamic(const AttributedString& attributedString) { auto value = folly::dynamic::object(); auto fragments = folly::dynamic::array(); for (auto fragment : attributedString.getFragments()) { @@ -921,7 +921,7 @@ inline folly::dynamic toDynamic(const AttributedString &attributedString) { return value; } -inline folly::dynamic toDynamic(const AttributedString::Range &range) { +inline folly::dynamic toDynamic(const AttributedString::Range& range) { folly::dynamic dynamicValue = folly::dynamic::object(); dynamicValue["location"] = range.location; dynamicValue["length"] = range.length; @@ -978,7 +978,7 @@ constexpr static MapBuffer::Key PA_KEY_ADJUST_FONT_SIZE_TO_FIT = 3; constexpr static MapBuffer::Key PA_KEY_INCLUDE_FONT_PADDING = 4; constexpr static MapBuffer::Key PA_KEY_HYPHENATION_FREQUENCY = 5; -inline MapBuffer toMapBuffer(const ParagraphAttributes ¶graphAttributes) { +inline MapBuffer toMapBuffer(const ParagraphAttributes& paragraphAttributes) { auto builder = MapBufferBuilder(); builder.putInt( PA_KEY_MAX_NUMBER_OF_LINES, paragraphAttributes.maximumNumberOfLines); @@ -998,7 +998,7 @@ inline MapBuffer toMapBuffer(const ParagraphAttributes ¶graphAttributes) { return builder.build(); } -inline MapBuffer toMapBuffer(const FontVariant &fontVariant) { +inline MapBuffer toMapBuffer(const FontVariant& fontVariant) { auto builder = MapBufferBuilder(); int index = 0; if ((int)fontVariant & (int)FontVariant::SmallCaps) { @@ -1020,7 +1020,7 @@ inline MapBuffer toMapBuffer(const FontVariant &fontVariant) { return builder.build(); } -inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) { +inline MapBuffer toMapBuffer(const TextAttributes& textAttributes) { auto builder = MapBufferBuilder(); if (textAttributes.foregroundColor) { builder.putInt( @@ -1127,7 +1127,7 @@ inline MapBuffer toMapBuffer(const TextAttributes &textAttributes) { return builder.build(); } -inline MapBuffer toMapBuffer(const AttributedString &attributedString) { +inline MapBuffer toMapBuffer(const AttributedString& attributedString) { auto fragmentsBuilder = MapBufferBuilder(); int index = 0; diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/primitives.h b/packages/react-native/ReactCommon/react/renderer/attributedstring/primitives.h index 30a6e002daf..e528eabd9f1 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/primitives.h @@ -124,84 +124,84 @@ enum class HyphenationFrequency { namespace std { template <> struct hash { - size_t operator()(const facebook::react::FontVariant &v) const { + size_t operator()(const facebook::react::FontVariant& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::TextAlignment &v) const { + size_t operator()(const facebook::react::TextAlignment& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::FontStyle &v) const { + size_t operator()(const facebook::react::FontStyle& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::TextDecorationLineType &v) const { + size_t operator()(const facebook::react::TextDecorationLineType& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::WritingDirection &v) const { + size_t operator()(const facebook::react::WritingDirection& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::TextDecorationStyle &v) const { + size_t operator()(const facebook::react::TextDecorationStyle& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::FontWeight &v) const { + size_t operator()(const facebook::react::FontWeight& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::DynamicTypeRamp &v) const { + size_t operator()(const facebook::react::DynamicTypeRamp& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::EllipsizeMode &v) const { + size_t operator()(const facebook::react::EllipsizeMode& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::TextBreakStrategy &v) const { + size_t operator()(const facebook::react::TextBreakStrategy& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::TextTransform &v) const { + size_t operator()(const facebook::react::TextTransform& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::HyphenationFrequency &v) const { + size_t operator()(const facebook::react::HyphenationFrequency& v) const { return hash()(static_cast(v)); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h index 26b625002f8..0cea35b8d43 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorFactory.h @@ -24,8 +24,8 @@ namespace facebook::react { */ using ComponentRegistryFactory = std::function; + const EventDispatcher::Weak& eventDispatcher, + const ContextContainer::Shared& contextContainer)>; ComponentRegistryFactory getDefaultComponentRegistryFactory(); diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h index 7ce6f38f98a..175d9bd6e7d 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProvider.h @@ -19,7 +19,7 @@ namespace facebook::react { * abstract type and ownership of the newly created object. */ using ComponentDescriptorConstructor = ComponentDescriptor::Unique( - const ComponentDescriptorParameters ¶meters); + const ComponentDescriptorParameters& parameters); /* * Represents a unified way to construct an instance of a particular stored @@ -36,7 +36,7 @@ class ComponentDescriptorProvider final { ComponentHandle handle; ComponentName name; ComponentDescriptor::Flavor flavor; - ComponentDescriptorConstructor *constructor; + ComponentDescriptorConstructor* constructor; }; /* @@ -44,7 +44,7 @@ class ComponentDescriptorProvider final { */ template ComponentDescriptor::Unique concreteComponentDescriptorConstructor( - const ComponentDescriptorParameters ¶meters) { + const ComponentDescriptorParameters& parameters) { static_assert( std::is_base_of::value, "ComponentDescriptorT must be a descendant of ComponentDescriptor"); diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp index c15aa5ca803..0a949f0fb08 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.cpp @@ -10,7 +10,7 @@ namespace facebook::react { void ComponentDescriptorProviderRegistry::add( - const ComponentDescriptorProvider &provider) const { + const ComponentDescriptorProvider& provider) const { std::unique_lock lock(mutex_); /* @@ -31,7 +31,7 @@ void ComponentDescriptorProviderRegistry::add( componentDescriptorProviders_.insert({provider.handle, provider}); - for (const auto &weakRegistry : componentDescriptorRegistries_) { + for (const auto& weakRegistry : componentDescriptorRegistries_) { auto registry = weakRegistry.lock(); if (!registry) { continue; @@ -65,13 +65,13 @@ void ComponentDescriptorProviderRegistry::request( ComponentDescriptorRegistry::Shared ComponentDescriptorProviderRegistry::createComponentDescriptorRegistry( - const ComponentDescriptorParameters ¶meters) const { + const ComponentDescriptorParameters& parameters) const { std::shared_lock lock(mutex_); auto registry = std::make_shared( parameters, *this, parameters.contextContainer); - for (const auto &pair : componentDescriptorProviders_) { + for (const auto& pair : componentDescriptorProviders_) { registry->add(pair.second); } diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h index 5fc52c5cf8e..cdc87b4f9a7 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h @@ -31,7 +31,7 @@ class ComponentDescriptorProviderRegistry final { * `ComponentDescriptorRegistry`s accordingly. * The methods can be called on any thread. */ - void add(const ComponentDescriptorProvider &provider) const; + void add(const ComponentDescriptorProvider& provider) const; /* * ComponenDescriptorRegistry will call the `request` in case if a component @@ -50,7 +50,7 @@ class ComponentDescriptorProviderRegistry final { * The methods can be called on any thread. */ ComponentDescriptorRegistry::Shared createComponentDescriptorRegistry( - const ComponentDescriptorParameters ¶meters) const; + const ComponentDescriptorParameters& parameters) const; private: friend class ComponentDescriptorRegistry; diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp index 08b90bc711c..d7b4e6eb0de 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.cpp @@ -20,7 +20,7 @@ namespace facebook::react { ComponentDescriptorRegistry::ComponentDescriptorRegistry( ComponentDescriptorParameters parameters, - const ComponentDescriptorProviderRegistry &providerRegistry, + const ComponentDescriptorProviderRegistry& providerRegistry, ContextContainer::Shared contextContainer) : parameters_(std::move(parameters)), providerRegistry_(providerRegistry), @@ -49,7 +49,7 @@ void ComponentDescriptorRegistry::add( } void ComponentDescriptorRegistry::registerComponentDescriptor( - const SharedComponentDescriptor &componentDescriptor) const { + const SharedComponentDescriptor& componentDescriptor) const { ComponentHandle componentHandle = componentDescriptor->getComponentHandle(); _registryByHandle[componentHandle] = componentDescriptor; @@ -57,8 +57,8 @@ void ComponentDescriptorRegistry::registerComponentDescriptor( _registryByName[componentName] = componentDescriptor; } -const ComponentDescriptor &ComponentDescriptorRegistry::at( - const std::string &componentName) const { +const ComponentDescriptor& ComponentDescriptorRegistry::at( + const std::string& componentName) const { std::shared_lock lock(mutex_); auto unifiedComponentName = componentNameByReactViewName(componentName); @@ -93,7 +93,7 @@ const ComponentDescriptor &ComponentDescriptorRegistry::at( return *it->second; } -const ComponentDescriptor *ComponentDescriptorRegistry:: +const ComponentDescriptor* ComponentDescriptorRegistry:: findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN( ComponentHandle componentHandle) const { std::shared_lock lock(mutex_); @@ -106,7 +106,7 @@ const ComponentDescriptor *ComponentDescriptorRegistry:: return iterator->second.get(); } -const ComponentDescriptor &ComponentDescriptorRegistry::at( +const ComponentDescriptor& ComponentDescriptorRegistry::at( ComponentHandle componentHandle) const { std::shared_lock lock(mutex_); @@ -123,12 +123,12 @@ bool ComponentDescriptorRegistry::hasComponentDescriptorAt( ShadowNode::Shared ComponentDescriptorRegistry::createNode( Tag tag, - const std::string &viewName, + const std::string& viewName, SurfaceId surfaceId, - const folly::dynamic &propsDynamic, - const InstanceHandle::Shared &instanceHandle) const { + const folly::dynamic& propsDynamic, + const InstanceHandle::Shared& instanceHandle) const { auto unifiedComponentName = componentNameByReactViewName(viewName); - const auto &componentDescriptor = this->at(unifiedComponentName); + const auto& componentDescriptor = this->at(unifiedComponentName); const auto fragment = ShadowNodeFamilyFragment{tag, surfaceId, instanceHandle}; @@ -149,7 +149,7 @@ ShadowNode::Shared ComponentDescriptorRegistry::createNode( } void ComponentDescriptorRegistry::setFallbackComponentDescriptor( - const SharedComponentDescriptor &descriptor) { + const SharedComponentDescriptor& descriptor) { _fallbackComponentDescriptor = descriptor; registerComponentDescriptor(descriptor); } diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h index 36e089737a0..8fe4f18cefa 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/ComponentDescriptorRegistry.h @@ -38,7 +38,7 @@ class ComponentDescriptorRegistry { */ ComponentDescriptorRegistry( ComponentDescriptorParameters parameters, - const ComponentDescriptorProviderRegistry &providerRegistry, + const ComponentDescriptorProviderRegistry& providerRegistry, ContextContainer::Shared contextContainer); /* @@ -46,31 +46,31 @@ class ComponentDescriptorRegistry { * If you requesting a ComponentDescriptor and unsure that it's there, you are * doing something wrong. */ - const ComponentDescriptor * + const ComponentDescriptor* findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN( ComponentHandle componentHandle) const; - const ComponentDescriptor &at(const std::string &componentName) const; - const ComponentDescriptor &at(ComponentHandle componentHandle) const; + const ComponentDescriptor& at(const std::string& componentName) const; + const ComponentDescriptor& at(ComponentHandle componentHandle) const; bool hasComponentDescriptorAt(ComponentHandle componentHandle) const; ShadowNode::Shared createNode( Tag tag, - const std::string &viewName, + const std::string& viewName, SurfaceId surfaceId, - const folly::dynamic &props, - const InstanceHandle::Shared &instanceHandle) const; + const folly::dynamic& props, + const InstanceHandle::Shared& instanceHandle) const; void setFallbackComponentDescriptor( - const SharedComponentDescriptor &descriptor); + const SharedComponentDescriptor& descriptor); ComponentDescriptor::Shared getFallbackComponentDescriptor() const; private: friend class ComponentDescriptorProviderRegistry; void registerComponentDescriptor( - const SharedComponentDescriptor &componentDescriptor) const; + const SharedComponentDescriptor& componentDescriptor) const; /* * Creates a `ComponentDescriptor` using specified @@ -87,7 +87,7 @@ class ComponentDescriptorRegistry { mutable butter::map _registryByName; ComponentDescriptor::Shared _fallbackComponentDescriptor; ComponentDescriptorParameters parameters_{}; - const ComponentDescriptorProviderRegistry &providerRegistry_; + const ComponentDescriptorProviderRegistry& providerRegistry_; ContextContainer::Shared contextContainer_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp index 17c8a78ef0a..60ca55f4aee 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.cpp @@ -17,8 +17,8 @@ namespace facebook::react { * Public API to install the Native Component Registry bindings. */ void bindHasComponentProvider( - jsi::Runtime &runtime, - HasComponentProviderFunctionType &&provider) { + jsi::Runtime& runtime, + HasComponentProviderFunctionType&& provider) { runtime.global().setProperty( runtime, "__nativeComponentRegistry__hasComponent", diff --git a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h index de5ce1cd9c0..e0c9d23463e 100644 --- a/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h +++ b/packages/react-native/ReactCommon/react/renderer/componentregistry/native/NativeComponentRegistryBinding.h @@ -18,14 +18,14 @@ namespace facebook::react { * is registered in the native platform. */ using HasComponentProviderFunctionType = - std::function; + std::function; /* * Installs HasComponentProviderFunction into JavaScript runtime. * Thread synchronization must be enforced externally. */ void bindHasComponentProvider( - jsi::Runtime &runtime, - HasComponentProviderFunctionType &&provider); + jsi::Runtime& runtime, + HasComponentProviderFunctionType&& provider); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h index 6323dfb1a96..49ed3461425 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageComponentDescriptor.h @@ -20,14 +20,14 @@ namespace facebook::react { class ImageComponentDescriptor final : public ConcreteComponentDescriptor { public: - ImageComponentDescriptor(const ComponentDescriptorParameters ¶meters) + ImageComponentDescriptor(const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters), imageManager_(std::make_shared(contextContainer_)){}; - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - auto &imageShadowNode = static_cast(*shadowNode); + auto& imageShadowNode = static_cast(*shadowNode); // `ImageShadowNode` uses `ImageManager` to initiate image loading and // communicate the loading state and results to mounting layer. diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp index 9ebf3a3d23d..d399b429e75 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageEventEmitter.cpp @@ -22,7 +22,7 @@ void ImageEventEmitter::onLoadEnd() const { } void ImageEventEmitter::onProgress(double progress) const { - dispatchEvent("progress", [=](jsi::Runtime &runtime) { + dispatchEvent("progress", [=](jsi::Runtime& runtime) { auto payload = jsi::Object(runtime); payload.setProperty(runtime, "progress", progress); return payload; diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp index 60fe66e5955..7f660904ae8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.cpp @@ -13,9 +13,9 @@ namespace facebook::react { ImageProps::ImageProps( - const PropsParserContext &context, - const ImageProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const ImageProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps), sources( CoreFeatures::enablePropIteratorSetter ? sourceProps.sources @@ -78,10 +78,10 @@ ImageProps::ImageProps( {})) {} void ImageProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h index 9f8ed39a21c..0909b49bff2 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageProps.h @@ -17,15 +17,15 @@ class ImageProps final : public ViewProps { public: ImageProps() = default; ImageProps( - const PropsParserContext &context, - const ImageProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const ImageProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp index 79686030df4..5eb90ac2e4a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.cpp @@ -16,7 +16,7 @@ namespace facebook::react { const char ImageComponentName[] = "Image"; -void ImageShadowNode::setImageManager(const SharedImageManager &imageManager) { +void ImageShadowNode::setImageManager(const SharedImageManager& imageManager) { ensureUnsealed(); imageManager_ = imageManager; } @@ -25,7 +25,7 @@ void ImageShadowNode::updateStateIfNeeded() { ensureUnsealed(); auto imageSource = getImageSource(); - const auto ¤tState = getStateData(); + const auto& currentState = getStateData(); bool hasSameRadius = getConcreteProps().blurRadius == currentState.getBlurRadius(); bool hasSameImageSource = currentState.getImageSource() == imageSource; @@ -66,7 +66,7 @@ ImageSource ImageShadowNode::getImageSource() const { auto bestSource = ImageSource{}; - for (const auto &source : sources) { + for (const auto& source : sources) { auto sourceSize = source.size; auto sourceScale = source.scale == 0 ? scale : source.scale; auto sourceArea = diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h index c4304ebad1f..66a8983867c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageShadowNode.h @@ -39,12 +39,12 @@ class ImageShadowNode final : public ConcreteViewShadowNode< /* * Associates a shared `ImageManager` with the node. */ - void setImageManager(const SharedImageManager &imageManager); + void setImageManager(const SharedImageManager& imageManager); static ImageState initialStateData( - const Props::Shared &props, - const ShadowNodeFamily::Shared & /*family*/, - const ComponentDescriptor &componentDescriptor) { + const Props::Shared& props, + const ShadowNodeFamily::Shared& /*family*/, + const ComponentDescriptor& componentDescriptor) { auto imageSource = ImageSource{ImageSource::Type::Invalid}; return {imageSource, {imageSource, nullptr, {}}, 0}; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.cpp b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.cpp index d4a0520d63d..67e4cdd76cc 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.cpp @@ -13,7 +13,7 @@ ImageSource ImageState::getImageSource() const { return imageSource_; } -const ImageRequest &ImageState::getImageRequest() const { +const ImageRequest& ImageState::getImageRequest() const { return *imageRequest_; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h index a420061fdf7..b8b14a6f3f6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/ImageState.h @@ -23,7 +23,7 @@ namespace facebook::react { class ImageState final { public: ImageState( - const ImageSource &imageSource, + const ImageSource& imageSource, ImageRequest imageRequest, const Float blurRadius) : imageSource_(imageSource), @@ -39,12 +39,12 @@ class ImageState final { * Exposes for reading stored `ImageRequest` object. * `ImageRequest` object cannot be copied or moved from `ImageLocalData`. */ - const ImageRequest &getImageRequest() const; + const ImageRequest& getImageRequest() const; Float getBlurRadius() const; #ifdef ANDROID - ImageState(const ImageState &previousState, folly::dynamic data) + ImageState(const ImageState& previousState, folly::dynamic data) : blurRadius_{0} {}; /* diff --git a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h index 8075e59d1eb..a6fac428a8d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/image/conversions.h @@ -18,9 +18,9 @@ namespace facebook::react { inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ImageSource &result) { + const PropsParserContext& context, + const RawValue& value, + ImageSource& result) { if (value.hasType()) { result = { /* .type = */ ImageSource::Type::Remote, @@ -88,14 +88,14 @@ inline void fromRawValue( result.type = ImageSource::Type::Invalid; } -inline std::string toString(const ImageSource &value) { +inline std::string toString(const ImageSource& value) { return "{uri: " + value.uri + "}"; } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ImageResizeMode &result) { + const PropsParserContext& context, + const RawValue& value, + ImageResizeMode& result) { react_native_expect(value.hasType()); if (!value.hasType()) { LOG(ERROR) << "Unsupported ImageResizeMode type"; @@ -123,7 +123,7 @@ inline void fromRawValue( } } -inline std::string toString(const ImageResizeMode &value) { +inline std::string toString(const ImageResizeMode& value) { switch (value) { case ImageResizeMode::Cover: return "cover"; diff --git a/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h index 17951c6c343..088629ad06a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/inputaccessory/InputAccessoryComponentDescriptor.h @@ -21,12 +21,12 @@ class InputAccessoryComponentDescriptor final public: using ConcreteComponentDescriptor::ConcreteComponentDescriptor; - void adopt(const ShadowNode::Unshared &shadowNode) const override { - auto &layoutableShadowNode = - static_cast(*shadowNode); + void adopt(const ShadowNode::Unshared& shadowNode) const override { + auto& layoutableShadowNode = + static_cast(*shadowNode); - auto &stateData = - static_cast( + auto& stateData = + static_cast( *shadowNode->getState()) .getData(); diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h index bdc1f06c4b5..2c310efbf3e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h @@ -18,7 +18,7 @@ class LegacyViewManagerInteropComponentDescriptor final using ConcreteComponentDescriptor::ConcreteComponentDescriptor; LegacyViewManagerInteropComponentDescriptor( - const ComponentDescriptorParameters ¶meters); + const ComponentDescriptorParameters& parameters); /* * Returns `name` and `handle` based on a `flavor`, not on static data from * `LegacyViewManagerInteropShadowNode`. @@ -27,7 +27,7 @@ class LegacyViewManagerInteropComponentDescriptor final ComponentName getComponentName() const override; protected: - void adopt(const ShadowNode::Unshared &shadowNode) const override; + void adopt(const ShadowNode::Unshared& shadowNode) const override; private: const std::shared_ptr _coordinator; diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp index 6a7e3342861..1e5dd6ca366 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.cpp @@ -10,8 +10,8 @@ namespace facebook::react { void LegacyViewManagerInteropViewEventEmitter::dispatchEvent( - const std::string &type, - const folly::dynamic &payload) const { + const std::string& type, + const folly::dynamic& payload) const { EventEmitter::dispatchEvent(type, payload); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h index cac63c94aab..eff9ce45d22 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewEventEmitter.h @@ -24,7 +24,7 @@ class LegacyViewManagerInteropViewEventEmitter : public ViewEventEmitter { public: using ViewEventEmitter::ViewEventEmitter; - void dispatchEvent(const std::string &type, const folly::dynamic &payload) + void dispatchEvent(const std::string& type, const folly::dynamic& payload) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp index 3832ce5901c..fe97911c680 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.cpp @@ -11,9 +11,9 @@ namespace facebook::react { LegacyViewManagerInteropViewProps::LegacyViewManagerInteropViewProps( - const PropsParserContext &context, - const LegacyViewManagerInteropViewProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const LegacyViewManagerInteropViewProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps), otherProps( mergeDynamicProps(sourceProps.otherProps, (folly::dynamic)rawProps)) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h index 84fcbfc809d..a490bad78b6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h @@ -16,9 +16,9 @@ class LegacyViewManagerInteropViewProps final : public ViewProps { public: LegacyViewManagerInteropViewProps() = default; LegacyViewManagerInteropViewProps( - const PropsParserContext &context, - const LegacyViewManagerInteropViewProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const LegacyViewManagerInteropViewProps& sourceProps, + const RawProps& rawProps); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerInteropComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerInteropComponentDescriptor.h index 9759ce106ff..6f7ed1a5ba4 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerInteropComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/legacyviewmanagerinterop/UnstableLegacyViewManagerInteropComponentDescriptor.h @@ -19,13 +19,13 @@ namespace facebook::react { * This component is part of the Fabric Interop Layer and is subject to future * changes (hence the "Unstable" prefix). */ -template +template class UnstableLegacyViewManagerInteropComponentDescriptor : public ConcreteComponentDescriptor< ConcreteViewShadowNode> { public: UnstableLegacyViewManagerInteropComponentDescriptor( - const ComponentDescriptorParameters ¶meters) + const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor< ConcreteViewShadowNode>( parameters) {} diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h index 1d9f30feada..de9ac5814a0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h @@ -22,11 +22,11 @@ class ModalHostViewComponentDescriptor final public: using ConcreteComponentDescriptor::ConcreteComponentDescriptor; - void adopt(const ShadowNode::Unshared &shadowNode) const override { - auto &layoutableShadowNode = - static_cast(*shadowNode); - auto &stateData = - static_cast( + void adopt(const ShadowNode::Unshared& shadowNode) const override { + auto& layoutableShadowNode = + static_cast(*shadowNode); + auto& stateData = + static_cast( *shadowNode->getState()) .getData(); diff --git a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h index 96ae32198f7..8c00478313a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/modal/ModalHostViewState.h @@ -30,7 +30,7 @@ class ModalHostViewState final { #ifdef ANDROID ModalHostViewState( - const ModalHostViewState &previousState, + const ModalHostViewState& previousState, folly::dynamic data) : screenSize(Size{ (Float)data["screenWidth"].getDouble(), diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h index ae27db804c6..b5d5431370b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarComponentDescriptor.h @@ -20,17 +20,17 @@ class AndroidProgressBarComponentDescriptor final : public ConcreteComponentDescriptor { public: AndroidProgressBarComponentDescriptor( - const ComponentDescriptorParameters ¶meters) + const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters), measurementsManager_( std::make_shared( contextContainer_)) {} - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - auto &androidProgressBarShadowNode = - static_cast(*shadowNode); + auto& androidProgressBarShadowNode = + static_cast(*shadowNode); // `AndroidProgressBarShadowNode` uses // `AndroidProgressBarMeasurementsManager` to provide measurements to Yoga. diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp index fdbc389b19c..740b43750e1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp @@ -17,7 +17,7 @@ namespace facebook::react { Size AndroidProgressBarMeasurementsManager::measure( SurfaceId surfaceId, - const AndroidProgressBarProps &props, + const AndroidProgressBarProps& props, LayoutConstraints layoutConstraints) const { { std::scoped_lock lock(mutex_); @@ -26,7 +26,7 @@ Size AndroidProgressBarMeasurementsManager::measure( } } - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer_->at>("FabricUIManager"); static auto measure = facebook::jni::findClassStatic( diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h index 8853cb8250a..383a9f36ef8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.h @@ -18,12 +18,12 @@ namespace facebook::react { class AndroidProgressBarMeasurementsManager { public: AndroidProgressBarMeasurementsManager( - const ContextContainer::Shared &contextContainer) + const ContextContainer::Shared& contextContainer) : contextContainer_(contextContainer) {} Size measure( SurfaceId surfaceId, - const AndroidProgressBarProps &props, + const AndroidProgressBarProps& props, LayoutConstraints layoutConstraints) const; private: diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp index b537a1e613b..a9f911db948 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.cpp @@ -15,8 +15,8 @@ namespace facebook::react { extern const char AndroidProgressBarComponentName[] = "AndroidProgressBar"; void AndroidProgressBarShadowNode::setAndroidProgressBarMeasurementsManager( - const std::shared_ptr - &measurementsManager) { + const std::shared_ptr& + measurementsManager) { ensureUnsealed(); measurementsManager_ = measurementsManager; } @@ -24,8 +24,8 @@ void AndroidProgressBarShadowNode::setAndroidProgressBarMeasurementsManager( #pragma mark - LayoutableShadowNode Size AndroidProgressBarShadowNode::measureContent( - const LayoutContext & /*layoutContext*/, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& /*layoutContext*/, + const LayoutConstraints& layoutConstraints) const { return measurementsManager_->measure( getSurfaceId(), getConcreteProps(), layoutConstraints); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h index a7a4433f382..384fa23608c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarShadowNode.h @@ -28,14 +28,14 @@ class AndroidProgressBarShadowNode final : public ConcreteViewShadowNode< // Associates a shared `AndroidProgressBarMeasurementsManager` with the node. void setAndroidProgressBarMeasurementsManager( - const std::shared_ptr - &measurementsManager); + const std::shared_ptr& + measurementsManager); #pragma mark - LayoutableShadowNode Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const override; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const override; private: std::shared_ptr measurementsManager_; diff --git a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h index 5a10d5c9889..fdfbe9fc523 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h @@ -12,7 +12,7 @@ namespace facebook::react { #ifdef ANDROID -inline folly::dynamic toDynamic(const AndroidProgressBarProps &props) { +inline folly::dynamic toDynamic(const AndroidProgressBarProps& props) { folly::dynamic serializedProps = folly::dynamic::object(); serializedProps["styleAttr"] = props.styleAttr; serializedProps["typeAttr"] = props.typeAttr; diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.cpp index b716efed973..d1ef9a0b154 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.cpp @@ -16,19 +16,19 @@ namespace facebook::react { // If that's a problem and the context is necessary here, refactor // RootShadowNode first. RootProps::RootProps( - const PropsParserContext &context, - const RootProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const RootProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps) {} // Note that a default/empty context may be passed here from RootShadowNode. // If that's a problem and the context is necessary here, refactor // RootShadowNode first. RootProps::RootProps( - const PropsParserContext & /*context*/, - const RootProps & /*sourceProps*/, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) + const PropsParserContext& /*context*/, + const RootProps& /*sourceProps*/, + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) : ViewProps(), layoutConstraints(layoutConstraints), layoutContext(layoutContext){}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h index cbb4a62a04e..57423128c5f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootProps.h @@ -20,14 +20,14 @@ class RootProps final : public ViewProps { public: RootProps() = default; RootProps( - const PropsParserContext &context, - const RootProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const RootProps& sourceProps, + const RawProps& rawProps); RootProps( - const PropsParserContext &context, - const RootProps &sourceProps, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext); + const PropsParserContext& context, + const RootProps& sourceProps, + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp index 93d771d69ce..e9f4ff45227 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.cpp @@ -15,7 +15,7 @@ namespace facebook::react { const char RootComponentName[] = "RootView"; bool RootShadowNode::layoutIfNeeded( - std::vector *affectedNodes) { + std::vector* affectedNodes) { SystraceSection s("RootShadowNode::layout"); if (getIsLayoutClean()) { @@ -38,9 +38,9 @@ Transform RootShadowNode::getTransform() const { } RootShadowNode::Unshared RootShadowNode::clone( - const PropsParserContext &propsParserContext, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const { + const PropsParserContext& propsParserContext, + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const { auto props = std::make_shared( propsParserContext, getConcreteProps(), layoutConstraints, layoutContext); auto newRootShadowNode = std::make_shared( diff --git a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h index 452628f9f0f..321ea590d4c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/root/RootShadowNode.h @@ -45,15 +45,15 @@ class RootShadowNode final * Returns `false` if the three is already laid out. */ bool layoutIfNeeded( - std::vector *affectedNodes = {}); + std::vector* affectedNodes = {}); /* * Clones the node with given `layoutConstraints` and `layoutContext`. */ RootShadowNode::Unshared clone( - const PropsParserContext &propsParserContext, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const; + const PropsParserContext& propsParserContext, + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const; Transform getTransform() const override; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h index c333b66cc2b..941696023a3 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/safeareaview/SafeAreaViewComponentDescriptor.h @@ -19,15 +19,14 @@ namespace facebook::react { class SafeAreaViewComponentDescriptor final : public ConcreteComponentDescriptor { using ConcreteComponentDescriptor::ConcreteComponentDescriptor; - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { react_native_assert( std::dynamic_pointer_cast(shadowNode)); - auto &layoutableShadowNode = - static_cast(*shadowNode); - auto &stateData = - static_cast( - *shadowNode->getState()) - .getData(); + auto& layoutableShadowNode = + static_cast(*shadowNode); + auto& stateData = static_cast( + *shadowNode->getState()) + .getData(); layoutableShadowNode.setPadding(stateData.padding); ConcreteComponentDescriptor::adopt(shadowNode); diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp index 3aaeb4c6f13..6fc866fab60 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp @@ -10,8 +10,8 @@ namespace facebook::react { static jsi::Value scrollViewMetricsPayload( - jsi::Runtime &runtime, - const ScrollViewMetrics &scrollViewMetrics) { + jsi::Runtime& runtime, + const ScrollViewMetrics& scrollViewMetrics) { auto payload = jsi::Object(runtime); { @@ -58,39 +58,39 @@ static jsi::Value scrollViewMetricsPayload( } void ScrollViewEventEmitter::onScroll( - const ScrollViewMetrics &scrollViewMetrics) const { - dispatchUniqueEvent("scroll", [scrollViewMetrics](jsi::Runtime &runtime) { + const ScrollViewMetrics& scrollViewMetrics) const { + dispatchUniqueEvent("scroll", [scrollViewMetrics](jsi::Runtime& runtime) { return scrollViewMetricsPayload(runtime, scrollViewMetrics); }); } void ScrollViewEventEmitter::onScrollBeginDrag( - const ScrollViewMetrics &scrollViewMetrics) const { + const ScrollViewMetrics& scrollViewMetrics) const { dispatchScrollViewEvent("scrollBeginDrag", scrollViewMetrics); } void ScrollViewEventEmitter::onScrollEndDrag( - const ScrollViewMetrics &scrollViewMetrics) const { + const ScrollViewMetrics& scrollViewMetrics) const { dispatchScrollViewEvent("scrollEndDrag", scrollViewMetrics); } void ScrollViewEventEmitter::onMomentumScrollBegin( - const ScrollViewMetrics &scrollViewMetrics) const { + const ScrollViewMetrics& scrollViewMetrics) const { dispatchScrollViewEvent("momentumScrollBegin", scrollViewMetrics); } void ScrollViewEventEmitter::onMomentumScrollEnd( - const ScrollViewMetrics &scrollViewMetrics) const { + const ScrollViewMetrics& scrollViewMetrics) const { dispatchScrollViewEvent("momentumScrollEnd", scrollViewMetrics); } void ScrollViewEventEmitter::dispatchScrollViewEvent( std::string name, - const ScrollViewMetrics &scrollViewMetrics, + const ScrollViewMetrics& scrollViewMetrics, EventPriority priority) const { dispatchEvent( std::move(name), - [scrollViewMetrics](jsi::Runtime &runtime) { + [scrollViewMetrics](jsi::Runtime& runtime) { return scrollViewMetricsPayload(runtime, scrollViewMetrics); }, priority); diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h index 09e81622b99..50bff3465fd 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h @@ -28,16 +28,16 @@ class ScrollViewEventEmitter : public ViewEventEmitter { public: using ViewEventEmitter::ViewEventEmitter; - void onScroll(const ScrollViewMetrics &scrollViewMetrics) const; - void onScrollBeginDrag(const ScrollViewMetrics &scrollViewMetrics) const; - void onScrollEndDrag(const ScrollViewMetrics &scrollViewMetrics) const; - void onMomentumScrollBegin(const ScrollViewMetrics &scrollViewMetrics) const; - void onMomentumScrollEnd(const ScrollViewMetrics &scrollViewMetrics) const; + void onScroll(const ScrollViewMetrics& scrollViewMetrics) const; + void onScrollBeginDrag(const ScrollViewMetrics& scrollViewMetrics) const; + void onScrollEndDrag(const ScrollViewMetrics& scrollViewMetrics) const; + void onMomentumScrollBegin(const ScrollViewMetrics& scrollViewMetrics) const; + void onMomentumScrollEnd(const ScrollViewMetrics& scrollViewMetrics) const; private: void dispatchScrollViewEvent( std::string name, - const ScrollViewMetrics &scrollViewMetrics, + const ScrollViewMetrics& scrollViewMetrics, EventPriority priority = EventPriority::AsynchronousBatched) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp index 7313e874748..4bf5b3c038c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.cpp @@ -17,9 +17,9 @@ namespace facebook::react { ScrollViewProps::ScrollViewProps( - const PropsParserContext &context, - const ScrollViewProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const ScrollViewProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps), alwaysBounceHorizontal( CoreFeatures::enablePropIteratorSetter @@ -331,10 +331,10 @@ ScrollViewProps::ScrollViewProps( {})) {} void ScrollViewProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h index 327c71eb07e..18bd59d6d12 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewProps.h @@ -20,15 +20,15 @@ class ScrollViewProps final : public ViewProps { public: ScrollViewProps() = default; ScrollViewProps( - const PropsParserContext &context, - const ScrollViewProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const ScrollViewProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp index 37b5bc24bf9..a8ecce51c48 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp @@ -18,7 +18,7 @@ void ScrollViewShadowNode::updateStateIfNeeded() { ensureUnsealed(); auto contentBoundingRect = Rect{}; - for (const auto &childNode : getLayoutableChildNodes()) { + for (const auto& childNode : getLayoutableChildNodes()) { contentBoundingRect.unionInPlace(childNode->getLayoutMetrics().frame); } @@ -49,10 +49,10 @@ void ScrollViewShadowNode::updateScrollContentOffsetIfNeeded() { } ScrollViewState ScrollViewShadowNode::initialStateData( - const Props::Shared &props, - const ShadowNodeFamily::Shared & /*family*/, - const ComponentDescriptor & /*componentDescriptor*/) { - return {static_cast(*props).contentOffset, {}, 0}; + const Props::Shared& props, + const ShadowNodeFamily::Shared& /*family*/, + const ComponentDescriptor& /*componentDescriptor*/) { + return {static_cast(*props).contentOffset, {}, 0}; } #pragma mark - LayoutableShadowNode diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h index ed1aadf7d88..cc4d7e119cc 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.h @@ -30,9 +30,9 @@ class ScrollViewShadowNode final : public ConcreteViewShadowNode< using ConcreteViewShadowNode::ConcreteViewShadowNode; static ScrollViewState initialStateData( - const Props::Shared &props, - const ShadowNodeFamily::Shared &family, - const ComponentDescriptor &componentDescriptor); + const Props::Shared& props, + const ShadowNodeFamily::Shared& family, + const ComponentDescriptor& componentDescriptor); #pragma mark - LayoutableShadowNode diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h index c64f49964b3..de8e81bb63f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewState.h @@ -41,7 +41,7 @@ class ScrollViewState final { Size getContentSize() const; #ifdef ANDROID - ScrollViewState(const ScrollViewState &previousState, folly::dynamic data) + ScrollViewState(const ScrollViewState& previousState, folly::dynamic data) : contentOffset( {(Float)data["contentOffsetLeft"].getDouble(), (Float)data["contentOffsetTop"].getDouble()}), diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h index c8740c37776..f1b344f68ad 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/conversions.h @@ -15,9 +15,9 @@ namespace facebook::react { inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ScrollViewSnapToAlignment &result) { + const PropsParserContext& context, + const RawValue& value, + ScrollViewSnapToAlignment& result) { auto string = (std::string)value; if (string == "start") { result = ScrollViewSnapToAlignment::Start; @@ -35,9 +35,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ScrollViewIndicatorStyle &result) { + const PropsParserContext& context, + const RawValue& value, + ScrollViewIndicatorStyle& result) { auto string = (std::string)value; if (string == "default") { result = ScrollViewIndicatorStyle::Default; @@ -55,9 +55,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ScrollViewKeyboardDismissMode &result) { + const PropsParserContext& context, + const RawValue& value, + ScrollViewKeyboardDismissMode& result) { auto string = (std::string)value; if (string == "none") { result = ScrollViewKeyboardDismissMode::None; @@ -75,9 +75,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ContentInsetAdjustmentBehavior &result) { + const PropsParserContext& context, + const RawValue& value, + ContentInsetAdjustmentBehavior& result) { auto string = (std::string)value; if (string == "never") { result = ContentInsetAdjustmentBehavior::Never; @@ -99,9 +99,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ScrollViewMaintainVisibleContentPosition &result) { + const PropsParserContext& context, + const RawValue& value, + ScrollViewMaintainVisibleContentPosition& result) { auto map = (butter::map)value; auto minIndexForVisible = map.find("minIndexForVisible"); @@ -118,7 +118,7 @@ inline void fromRawValue( } } -inline std::string toString(const ScrollViewSnapToAlignment &value) { +inline std::string toString(const ScrollViewSnapToAlignment& value) { switch (value) { case ScrollViewSnapToAlignment::Start: return "start"; @@ -131,7 +131,7 @@ inline std::string toString(const ScrollViewSnapToAlignment &value) { #if RN_DEBUG_STRING_CONVERTIBLE -inline std::string toString(const ScrollViewIndicatorStyle &value) { +inline std::string toString(const ScrollViewIndicatorStyle& value) { switch (value) { case ScrollViewIndicatorStyle::Default: return "default"; @@ -142,7 +142,7 @@ inline std::string toString(const ScrollViewIndicatorStyle &value) { } } -inline std::string toString(const ScrollViewKeyboardDismissMode &value) { +inline std::string toString(const ScrollViewKeyboardDismissMode& value) { switch (value) { case ScrollViewKeyboardDismissMode::None: return "none"; @@ -153,7 +153,7 @@ inline std::string toString(const ScrollViewKeyboardDismissMode &value) { } } -inline std::string toString(const ContentInsetAdjustmentBehavior &value) { +inline std::string toString(const ContentInsetAdjustmentBehavior& value) { switch (value) { case ContentInsetAdjustmentBehavior::Never: return "never"; @@ -167,7 +167,7 @@ inline std::string toString(const ContentInsetAdjustmentBehavior &value) { } inline std::string toString( - const std::optional &value) { + const std::optional& value) { if (!value) { return "null"; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h b/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h index 5a5f8b1a0c3..bb3f4f1a559 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/components/scrollview/primitives.h @@ -30,12 +30,12 @@ class ScrollViewMaintainVisibleContentPosition final { int minIndexForVisible{0}; std::optional autoscrollToTopThreshold{}; - bool operator==(const ScrollViewMaintainVisibleContentPosition &rhs) const { + bool operator==(const ScrollViewMaintainVisibleContentPosition& rhs) const { return std::tie(this->minIndexForVisible, this->autoscrollToTopThreshold) == std::tie(rhs.minIndexForVisible, rhs.autoscrollToTopThreshold); } - bool operator!=(const ScrollViewMaintainVisibleContentPosition &rhs) const { + bool operator!=(const ScrollViewMaintainVisibleContentPosition& rhs) const { return !(*this == rhs); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h index d22e6419c12..696415ebd7d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchComponentDescriptor.h @@ -21,16 +21,16 @@ class AndroidSwitchComponentDescriptor final : public ConcreteComponentDescriptor { public: AndroidSwitchComponentDescriptor( - const ComponentDescriptorParameters ¶meters) + const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters), measurementsManager_(std::make_shared( contextContainer_)) {} - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - auto &androidSwitchShadowNode = - static_cast(*shadowNode); + auto& androidSwitchShadowNode = + static_cast(*shadowNode); // `AndroidSwitchShadowNode` uses `AndroidSwitchMeasurementsManager` to // provide measurements to Yoga. diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp index 89a67a3f432..ae14634f093 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp @@ -25,7 +25,7 @@ Size AndroidSwitchMeasurementsManager::measure( } } - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer_->at>("FabricUIManager"); static auto measure = diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h index 555ed4de5f0..63b75f5fadb 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.h @@ -16,7 +16,7 @@ namespace facebook::react { class AndroidSwitchMeasurementsManager { public: AndroidSwitchMeasurementsManager( - const ContextContainer::Shared &contextContainer) + const ContextContainer::Shared& contextContainer) : contextContainer_(contextContainer) {} Size measure(SurfaceId surfaceId, LayoutConstraints layoutConstraints) const; diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp index becbe879efa..85524746f69 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.cpp @@ -12,8 +12,8 @@ namespace facebook::react { extern const char AndroidSwitchComponentName[] = "AndroidSwitch"; void AndroidSwitchShadowNode::setAndroidSwitchMeasurementsManager( - const std::shared_ptr - &measurementsManager) { + const std::shared_ptr& + measurementsManager) { ensureUnsealed(); measurementsManager_ = measurementsManager; } @@ -21,8 +21,8 @@ void AndroidSwitchShadowNode::setAndroidSwitchMeasurementsManager( #pragma mark - LayoutableShadowNode Size AndroidSwitchShadowNode::measureContent( - const LayoutContext & /*layoutContext*/, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& /*layoutContext*/, + const LayoutConstraints& layoutConstraints) const { return measurementsManager_->measure(getSurfaceId(), layoutConstraints); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h index 3a0946a5b8f..85803aa09ad 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchShadowNode.h @@ -29,14 +29,14 @@ class AndroidSwitchShadowNode final : public ConcreteViewShadowNode< // Associates a shared `AndroidSwitchMeasurementsManager` with the node. void setAndroidSwitchMeasurementsManager( - const std::shared_ptr - &measurementsManager); + const std::shared_ptr& + measurementsManager); #pragma mark - LayoutableShadowNode Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const override; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const override; private: std::shared_ptr measurementsManager_; diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp index 2917b8f4449..2e6347a7510 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.cpp @@ -16,10 +16,10 @@ namespace facebook::react { static TextAttributes convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const TextAttributes &sourceTextAttributes, - const TextAttributes &defaultTextAttributes) { + const PropsParserContext& context, + const RawProps& rawProps, + const TextAttributes& sourceTextAttributes, + const TextAttributes& defaultTextAttributes) { auto textAttributes = TextAttributes{}; // Color (not accessed by ViewProps) @@ -208,9 +208,9 @@ static TextAttributes convertRawProp( } BaseTextProps::BaseTextProps( - const PropsParserContext &context, - const BaseTextProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const BaseTextProps& sourceProps, + const RawProps& rawProps) : textAttributes( CoreFeatures::enablePropIteratorSetter ? sourceProps.textAttributes @@ -221,10 +221,10 @@ BaseTextProps::BaseTextProps( TextAttributes{})){}; void BaseTextProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char * /*propName*/, - const RawValue &value) { + const char* /*propName*/, + const RawValue& value) { static auto defaults = TextAttributes{}; switch (hash) { diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h index 5feda6cb909..b66f64cb5ee 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextProps.h @@ -22,15 +22,15 @@ class BaseTextProps { public: BaseTextProps() = default; BaseTextProps( - const PropsParserContext &context, - const BaseTextProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const BaseTextProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp index 2c622565272..58d28d4a807 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.cpp @@ -16,7 +16,7 @@ namespace facebook::react { -inline ShadowView shadowViewFromShadowNode(const ShadowNode &shadowNode) { +inline ShadowView shadowViewFromShadowNode(const ShadowNode& shadowNode) { auto shadowView = ShadowView{shadowNode}; // Clearing `props` and `state` (which we don't use) allows avoiding retain // cycles. @@ -26,14 +26,14 @@ inline ShadowView shadowViewFromShadowNode(const ShadowNode &shadowNode) { } void BaseTextShadowNode::buildAttributedString( - const TextAttributes &baseTextAttributes, - const ShadowNode &parentNode, - AttributedString &outAttributedString, - Attachments &outAttachments) { - for (const auto &childNode : parentNode.getChildren()) { + const TextAttributes& baseTextAttributes, + const ShadowNode& parentNode, + AttributedString& outAttributedString, + Attachments& outAttachments) { + for (const auto& childNode : parentNode.getChildren()) { // RawShadowNode auto rawTextShadowNode = - traitCast(childNode.get()); + traitCast(childNode.get()); if (rawTextShadowNode != nullptr) { auto fragment = AttributedString::Fragment{}; fragment.string = rawTextShadowNode->getConcreteProps().text; @@ -49,7 +49,7 @@ void BaseTextShadowNode::buildAttributedString( } // TextShadowNode - auto textShadowNode = traitCast(childNode.get()); + auto textShadowNode = traitCast(childNode.get()); if (textShadowNode != nullptr) { auto localTextAttributes = baseTextAttributes; localTextAttributes.apply( diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h index d012f216430..ec281eb7e2f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/BaseTextShadowNode.h @@ -28,7 +28,7 @@ class BaseTextShadowNode { * Unowning pointer to a `ShadowNode` that represents the attachment. * Cannot be `null`. */ - const ShadowNode *shadowNode; + const ShadowNode* shadowNode; /* * Index of the fragment in `AttributedString` that represents the @@ -52,10 +52,10 @@ class BaseTextShadowNode { * function, or if TextInput should inherit from BaseTextShadowNode. */ static void buildAttributedString( - const TextAttributes &baseTextAttributes, - const ShadowNode &parentNode, - AttributedString &outAttributedString, - Attachments &outAttachments); + const TextAttributes& baseTextAttributes, + const ShadowNode& parentNode, + AttributedString& outAttributedString, + Attachments& outAttachments); /** * Returns a character used to measure empty strings in native platforms. diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h index 16901dcb4aa..cf96d75afa9 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphComponentDescriptor.h @@ -20,7 +20,7 @@ namespace facebook::react { class ParagraphComponentDescriptor final : public ConcreteComponentDescriptor { public: - ParagraphComponentDescriptor(const ComponentDescriptorParameters ¶meters) + ParagraphComponentDescriptor(const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters) { // Every single `ParagraphShadowNode` will have a reference to // a shared `TextLayoutManager`. @@ -28,10 +28,10 @@ class ParagraphComponentDescriptor final } protected: - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - auto ¶graphShadowNode = static_cast(*shadowNode); + auto& paragraphShadowNode = static_cast(*shadowNode); // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content // and communicate text rendering metrics to mounting layer. diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp index 73e6311b022..4d1b88efae6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp @@ -10,13 +10,13 @@ namespace facebook::react { static jsi::Value linesMeasurementsPayload( - jsi::Runtime &runtime, - const LinesMeasurements &linesMeasurements) { + jsi::Runtime& runtime, + const LinesMeasurements& linesMeasurements) { auto payload = jsi::Object(runtime); auto lines = jsi::Array(runtime, linesMeasurements.size()); for (size_t i = 0; i < linesMeasurements.size(); ++i) { - const auto &lineMeasurement = linesMeasurements[i]; + const auto& lineMeasurement = linesMeasurements[i]; auto jsiLine = jsi::Object(runtime); jsiLine.setProperty(runtime, "text", lineMeasurement.text); jsiLine.setProperty(runtime, "x", lineMeasurement.frame.origin.x); @@ -36,7 +36,7 @@ static jsi::Value linesMeasurementsPayload( } void ParagraphEventEmitter::onTextLayout( - const LinesMeasurements &linesMeasurements) const { + const LinesMeasurements& linesMeasurements) const { { std::scoped_lock guard(linesMeasurementsMutex_); if (linesMeasurementsMetrics_ == linesMeasurements) { @@ -45,7 +45,7 @@ void ParagraphEventEmitter::onTextLayout( linesMeasurementsMetrics_ = linesMeasurements; } - dispatchEvent("textLayout", [linesMeasurements](jsi::Runtime &runtime) { + dispatchEvent("textLayout", [linesMeasurements](jsi::Runtime& runtime) { return linesMeasurementsPayload(runtime, linesMeasurements); }); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h index d571b914d87..c9af92e99e0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h @@ -16,7 +16,7 @@ class ParagraphEventEmitter : public ViewEventEmitter { public: using ViewEventEmitter::ViewEventEmitter; - void onTextLayout(const LinesMeasurements &linesMeasurements) const; + void onTextLayout(const LinesMeasurements& linesMeasurements) const; private: mutable std::mutex linesMeasurementsMutex_; diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp index 54e32d43388..0ba10c69e46 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.cpp @@ -12,8 +12,8 @@ namespace facebook::react { TextMeasurement ParagraphLayoutManager::measure( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const { if (CoreFeatures::cacheLastTextMeasurement) { bool shouldMeasure = shoudMeasureString( @@ -39,8 +39,8 @@ TextMeasurement ParagraphLayoutManager::measure( } bool ParagraphLayoutManager::shoudMeasureString( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const { size_t newParagraphInputHash = folly::hash::hash_combine(0, attributedString, paragraphAttributes); @@ -74,8 +74,8 @@ bool ParagraphLayoutManager::shoudMeasureString( } LinesMeasurements ParagraphLayoutManager::measureLines( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, Size size) const { return textLayoutManager_->measureLines( attributedString, paragraphAttributes, size); diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.h index 0ac605525e2..475b16791d5 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphLayoutManager.h @@ -24,13 +24,13 @@ namespace facebook::react { class ParagraphLayoutManager { public: TextMeasurement measure( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; LinesMeasurements measureLines( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, Size size) const; void setTextLayoutManager( @@ -85,8 +85,8 @@ class ParagraphLayoutManager { * needed. */ bool shoudMeasureString( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp index d9fde24dac3..4011bbf2dc8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.cpp @@ -18,9 +18,9 @@ namespace facebook::react { ParagraphProps::ParagraphProps( - const PropsParserContext &context, - const ParagraphProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const ParagraphProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps), BaseTextProps(context, sourceProps, rawProps), paragraphAttributes( @@ -56,10 +56,10 @@ ParagraphProps::ParagraphProps( }; void ParagraphProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h index 79e5ff2ca62..6640fca0344 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphProps.h @@ -27,15 +27,15 @@ class ParagraphProps : public ViewProps, public BaseTextProps { public: ParagraphProps() = default; ParagraphProps( - const PropsParserContext &context, - const ParagraphProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const ParagraphProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp index 6111389429c..9a129bb605d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp @@ -27,8 +27,8 @@ using Content = ParagraphShadowNode::Content; const char ParagraphComponentName[] = "Paragraph"; ParagraphShadowNode::ParagraphShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : ConcreteViewShadowNode(sourceShadowNode, fragment) { if (CoreFeatures::enableCleanParagraphYogaNode) { if (!fragment.children && !fragment.props) { @@ -40,8 +40,8 @@ ParagraphShadowNode::ParagraphShadowNode( } } -const Content &ParagraphShadowNode::getContent( - const LayoutContext &layoutContext) const { +const Content& ParagraphShadowNode::getContent( + const LayoutContext& layoutContext) const { if (content_.has_value()) { return content_.value(); } @@ -66,8 +66,8 @@ const Content &ParagraphShadowNode::getContent( } Content ParagraphShadowNode::getContentWithMeasuredAttachments( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const { auto content = getContent(layoutContext); if (content.attachments.empty()) { @@ -79,11 +79,11 @@ Content ParagraphShadowNode::getContentWithMeasuredAttachments( // Having enforced minimum size for text fragments doesn't make much sense. localLayoutConstraints.minimumSize = Size{0, 0}; - auto &fragments = content.attributedString.getFragments(); + auto& fragments = content.attributedString.getFragments(); - for (const auto &attachment : content.attachments) { + for (const auto& attachment : content.attachments) { auto laytableShadowNode = - traitCast(attachment.shadowNode); + traitCast(attachment.shadowNode); if (laytableShadowNode == nullptr) { continue; @@ -114,10 +114,10 @@ void ParagraphShadowNode::setTextLayoutManager( std::move(textLayoutManager)); } -void ParagraphShadowNode::updateStateIfNeeded(const Content &content) { +void ParagraphShadowNode::updateStateIfNeeded(const Content& content) { ensureUnsealed(); - auto &state = getStateData(); + auto& state = getStateData(); react_native_assert(state.paragraphLayoutManager.getTextLayoutManager()); @@ -134,8 +134,8 @@ void ParagraphShadowNode::updateStateIfNeeded(const Content &content) { #pragma mark - LayoutableShadowNode Size ParagraphShadowNode::measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const { auto content = getContentWithMeasuredAttachments(layoutContext, layoutConstraints); @@ -189,7 +189,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) { // Iterating on attachments, we clone shadow nodes and moving // `paragraphShadowNode` that represents clones of `this` object. - auto paragraphShadowNode = static_cast(this); + auto paragraphShadowNode = static_cast(this); // `paragraphOwningShadowNode` is owning pointer to`paragraphShadowNode` // (besides the initial case when `paragraphShadowNode == this`), we need this // only to keep it in memory for a while. @@ -199,9 +199,9 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) { content.attachments.size() == measurement.attachments.size()); for (size_t i = 0; i < content.attachments.size(); i++) { - auto &attachment = content.attachments.at(i); + auto& attachment = content.attachments.at(i); - if (traitCast(attachment.shadowNode) == + if (traitCast(attachment.shadowNode) == nullptr) { // Not a layoutable `ShadowNode`, no need to lay it out. continue; @@ -211,15 +211,15 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) { paragraphOwningShadowNode = paragraphShadowNode->cloneTree( attachment.shadowNode->getFamily(), - [&](const ShadowNode &oldShadowNode) { + [&](const ShadowNode& oldShadowNode) { clonedShadowNode = oldShadowNode.clone({}); return clonedShadowNode; }); paragraphShadowNode = - static_cast(paragraphOwningShadowNode.get()); + static_cast(paragraphOwningShadowNode.get()); - auto &layoutableShadowNode = - traitCast(*clonedShadowNode); + auto& layoutableShadowNode = + traitCast(*clonedShadowNode); auto attachmentFrame = measurement.attachments[i].frame; auto attachmentSize = roundToPixel<&ceil>( @@ -245,8 +245,7 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) { // reflect the changes that we made. if (paragraphShadowNode != this) { this->children_ = - static_cast(paragraphShadowNode) - ->children_; + static_cast(paragraphShadowNode)->children_; } } diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h index 7255d50b192..fd598951c6d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h @@ -35,8 +35,8 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode< using ConcreteViewShadowNode::ConcreteViewShadowNode; ParagraphShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment); + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment); static ShadowNodeTraits BaseTraits() { auto traits = ConcreteViewShadowNode::BaseTraits(); @@ -65,8 +65,8 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode< void layout(LayoutContext layoutContext) override; Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const override; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const override; /* * Internal representation of the nested content of the node in a format @@ -83,20 +83,20 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode< /* * Builds (if needed) and returns a reference to a `Content` object. */ - const Content &getContent(const LayoutContext &layoutContext) const; + const Content& getContent(const LayoutContext& layoutContext) const; /* * Builds and returns a `Content` object with given `layoutConstraints`. */ Content getContentWithMeasuredAttachments( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const; /* * Creates a `State` object (with `AttributedText` and * `TextLayoutManager`) if needed. */ - void updateStateIfNeeded(const Content &content); + void updateStateIfNeeded(const Content& content); /* * Cached content of the subtree started from the node. diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h index be58cc1a62a..e448896e84f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/ParagraphState.h @@ -55,16 +55,16 @@ struct ParagraphState { #ifdef ANDROID ParagraphState( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, - const ParagraphLayoutManager ¶graphLayoutManager) + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, + const ParagraphLayoutManager& paragraphLayoutManager) : attributedString(attributedString), paragraphAttributes(paragraphAttributes), paragraphLayoutManager(paragraphLayoutManager) {} ParagraphState() = default; ParagraphState( - const ParagraphState &previousState, - const folly::dynamic &data) { + const ParagraphState& previousState, + const folly::dynamic& data) { react_native_assert(false && "Not supported"); }; folly::dynamic getDynamic() const; diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp index 92ddbf1e10b..ddbc59c855d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.cpp @@ -13,9 +13,9 @@ namespace facebook::react { RawTextProps::RawTextProps( - const PropsParserContext &context, - const RawTextProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const RawTextProps& sourceProps, + const RawProps& rawProps) : Props(context, sourceProps, rawProps), text(convertRawProp(context, rawProps, "text", sourceProps.text, {})){}; diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h index 609612929ba..c3360db14ca 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/RawTextProps.h @@ -23,9 +23,9 @@ class RawTextProps : public Props { public: RawTextProps() = default; RawTextProps( - const PropsParserContext &context, - const RawTextProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const RawTextProps& sourceProps, + const RawProps& rawProps); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp index 38fc6fb4566..e06bb5a806b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.cpp @@ -10,17 +10,17 @@ namespace facebook::react { TextProps::TextProps( - const PropsParserContext &context, - const TextProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const TextProps& sourceProps, + const RawProps& rawProps) : Props(context, sourceProps, rawProps), BaseTextProps::BaseTextProps(context, sourceProps, rawProps){}; void TextProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { BaseTextProps::setProp(context, hash, propName, value); Props::setProp(context, hash, propName, value); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h index 00e59a2d364..23c70d51c55 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextProps.h @@ -19,15 +19,15 @@ class TextProps : public Props, public BaseTextProps { public: TextProps() = default; TextProps( - const PropsParserContext &context, - const TextProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const TextProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - DebugStringConvertible diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h index a375b290f2e..64909775513 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/TextShadowNode.h @@ -52,8 +52,8 @@ class TextShadowNode : public ConcreteShadowNode< TextEventEmitter>; TextShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits) : BaseShadowNode(fragment, family, traits), BaseTextShadowNode() { orderIndex_ = std::numeric_limits::max(); diff --git a/packages/react-native/ReactCommon/react/renderer/components/text/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/text/conversions.h index 2dc83d64d67..f9002441c91 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/text/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/text/conversions.h @@ -16,7 +16,7 @@ namespace facebook::react { #ifdef ANDROID -inline folly::dynamic toDynamic(const ParagraphState ¶graphState) { +inline folly::dynamic toDynamic(const ParagraphState& paragraphState) { folly::dynamic newState = folly::dynamic::object(); newState["attributedString"] = toDynamic(paragraphState.attributedString); newState["paragraphAttributes"] = @@ -25,7 +25,7 @@ inline folly::dynamic toDynamic(const ParagraphState ¶graphState) { return newState; } -inline MapBuffer toMapBuffer(const ParagraphState ¶graphState) { +inline MapBuffer toMapBuffer(const ParagraphState& paragraphState) { auto builder = MapBufferBuilder(); auto attStringMapBuffer = toMapBuffer(paragraphState.attributedString); builder.putMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING, attStringMapBuffer); diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h index 6ada9b8900a..89dee1c2aa9 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h @@ -26,7 +26,7 @@ class AndroidTextInputComponentDescriptor final : public ConcreteComponentDescriptor { public: AndroidTextInputComponentDescriptor( - const ComponentDescriptorParameters ¶meters) + const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters) { // Every single `AndroidTextInputShadowNode` will have a reference to // a shared `TextLayoutManager`. @@ -34,8 +34,8 @@ class AndroidTextInputComponentDescriptor final } virtual State::Shared createInitialState( - const Props::Shared &props, - const ShadowNodeFamily::Shared &family) const override { + const Props::Shared& props, + const ShadowNodeFamily::Shared& family) const override { int surfaceId = family->getSurfaceId(); yoga::Style::Edges theme; @@ -44,7 +44,7 @@ class AndroidTextInputComponentDescriptor final surfaceIdToThemePaddingMap_.end()) { theme = surfaceIdToThemePaddingMap_[surfaceId]; } else { - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer_->at>("FabricUIManager"); auto env = jni::Environment::current(); @@ -55,7 +55,7 @@ class AndroidTextInputComponentDescriptor final if (getThemeData( fabricUIManager, surfaceId, defaultTextInputPaddingArray)) { - jfloat *defaultTextInputPadding = + jfloat* defaultTextInputPadding = env->GetFloatArrayElements(defaultTextInputPaddingArray, 0); theme[YGEdgeStart] = (YGValue){defaultTextInputPadding[0], YGUnitPoint}; theme[YGEdgeEnd] = (YGValue){defaultTextInputPadding[1], YGUnitPoint}; @@ -83,23 +83,23 @@ class AndroidTextInputComponentDescriptor final } protected: - void adopt(const ShadowNode::Unshared &shadowNode) const override { - auto &textInputShadowNode = - static_cast(*shadowNode); + void adopt(const ShadowNode::Unshared& shadowNode) const override { + auto& textInputShadowNode = + static_cast(*shadowNode); // `ParagraphShadowNode` uses `TextLayoutManager` to measure text content // and communicate text rendering metrics to mounting layer. textInputShadowNode.setTextLayoutManager(textLayoutManager_); textInputShadowNode.setContextContainer( - const_cast(getContextContainer().get())); + const_cast(getContextContainer().get())); int surfaceId = textInputShadowNode.getSurfaceId(); if (surfaceIdToThemePaddingMap_.find(surfaceId) != surfaceIdToThemePaddingMap_.end()) { yoga::Style::Edges theme = surfaceIdToThemePaddingMap_[surfaceId]; - auto &textInputProps = textInputShadowNode.getConcreteProps(); + auto& textInputProps = textInputShadowNode.getConcreteProps(); // Override padding // Node is still unsealed during adoption, before layout is complete @@ -152,8 +152,8 @@ class AndroidTextInputComponentDescriptor final // commit, state update, etc, will incur this cost. if (changedPadding) { // Set new props on node - const_cast(textInputProps) - .yogaStyle.padding() = result; + const_cast(textInputProps).yogaStyle.padding() = + result; // Communicate new props to Yoga part of the node textInputShadowNode.updateYogaProps(); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp index 1052de256b7..116284f1c6b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.cpp @@ -14,11 +14,11 @@ namespace facebook::react { static bool hasValue( - const RawProps &rawProps, + const RawProps& rawProps, bool defaultValue, - const char *name, - const char *prefix, - const char *suffix) { + const char* name, + const char* prefix, + const char* suffix) { auto rawValue = rawProps.at(name, prefix, suffix); // No change to prop - use default @@ -257,10 +257,10 @@ AndroidTextInputProps::AndroidTextInputProps( } void AndroidTextInputProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h index e03ef02950f..c262e471119 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputProps.h @@ -32,9 +32,9 @@ struct AndroidTextInputTextShadowOffsetStruct { }; static inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AndroidTextInputTextShadowOffsetStruct &result) { + const PropsParserContext& context, + const RawValue& value, + AndroidTextInputTextShadowOffsetStruct& result) { auto map = (butter::map)value; auto width = map.find("width"); @@ -48,13 +48,13 @@ static inline void fromRawValue( } static inline std::string toString( - const AndroidTextInputTextShadowOffsetStruct &value) { + const AndroidTextInputTextShadowOffsetStruct& value) { return "[Object AndroidTextInputTextShadowOffsetStruct]"; } #ifdef ANDROID inline folly::dynamic toDynamic( - const AndroidTextInputTextShadowOffsetStruct &value) { + const AndroidTextInputTextShadowOffsetStruct& value) { folly::dynamic dynamicValue = folly::dynamic::object(); dynamicValue["width"] = value.width; dynamicValue["height"] = value.height; @@ -66,15 +66,15 @@ class AndroidTextInputProps final : public ViewProps, public BaseTextProps { public: AndroidTextInputProps() = default; AndroidTextInputProps( - const PropsParserContext &context, - const AndroidTextInputProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const AndroidTextInputProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); folly::dynamic getDynamic() const; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp index add962feeff..0c9cc69c673 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp @@ -26,7 +26,7 @@ namespace facebook::react { extern const char AndroidTextInputComponentName[] = "AndroidTextInput"; void AndroidTextInputShadowNode::setContextContainer( - ContextContainer *contextContainer) { + ContextContainer* contextContainer) { ensureUnsealed(); contextContainer_ = contextContainer; } @@ -97,7 +97,7 @@ void AndroidTextInputShadowNode::setTextLayoutManager( AttributedString AndroidTextInputShadowNode::getMostRecentAttributedString() const { - const auto &state = getStateData(); + const auto& state = getStateData(); auto reactTreeAttributedString = getAttributedString(); @@ -118,7 +118,7 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() { ensureUnsealed(); auto reactTreeAttributedString = getAttributedString(); - const auto &state = getStateData(); + const auto& state = getStateData(); // Tree is often out of sync with the value of the TextInput. // This is by design - don't change the value of the TextInput in the State, @@ -157,8 +157,8 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() { #pragma mark - LayoutableShadowNode Size AndroidTextInputShadowNode::measureContent( - const LayoutContext & /*layoutContext*/, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& /*layoutContext*/, + const LayoutConstraints& layoutConstraints) const { if (getStateData().cachedAttributedStringId != 0) { return textLayoutManager_ ->measureCachedSpannableById( diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h index e016e991657..53f3d42a2df 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.h @@ -38,7 +38,7 @@ class AndroidTextInputShadowNode final : public ConcreteViewShadowNode< using ConcreteViewShadowNode::ConcreteViewShadowNode; - void setContextContainer(ContextContainer *contextContainer); + void setContextContainer(ContextContainer* contextContainer); /* * Returns a `AttributedString` which represents text content of the node. @@ -56,12 +56,12 @@ class AndroidTextInputShadowNode final : public ConcreteViewShadowNode< #pragma mark - LayoutableShadowNode Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const override; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const override; void layout(LayoutContext layoutContext) override; private: - ContextContainer *contextContainer_{}; + ContextContainer* contextContainer_{}; /** * Get the most up-to-date attributed string for measurement and State. diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp index 6dc0c8bc854..83607848e4d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.cpp @@ -38,8 +38,8 @@ AndroidTextInputState::AndroidTextInputState( defaultThemePaddingBottom(defaultThemePaddingBottom) {} AndroidTextInputState::AndroidTextInputState( - const AndroidTextInputState &previousState, - const folly::dynamic &data) + const AndroidTextInputState& previousState, + const folly::dynamic& data) : mostRecentEventCount(data.getDefault( "mostRecentEventCount", previousState.mostRecentEventCount) diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h index 813c9916eed..1cf73cca7c7 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputState.h @@ -74,8 +74,8 @@ class AndroidTextInputState final { AndroidTextInputState() = default; AndroidTextInputState( - const AndroidTextInputState &previousState, - const folly::dynamic &data); + const AndroidTextInputState& previousState, + const folly::dynamic& data); folly::dynamic getDynamic() const; MapBuffer getMapBuffer() const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h index 3e5dafe0a72..36c08363b86 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputComponentDescriptor.h @@ -18,17 +18,17 @@ namespace facebook::react { class TextInputComponentDescriptor final : public ConcreteComponentDescriptor { public: - TextInputComponentDescriptor(const ComponentDescriptorParameters ¶meters) + TextInputComponentDescriptor(const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters) { textLayoutManager_ = std::make_shared(contextContainer_); } protected: - void adopt(const ShadowNode::Unshared &shadowNode) const override { + void adopt(const ShadowNode::Unshared& shadowNode) const override { ConcreteComponentDescriptor::adopt(shadowNode); - auto &concreteShadowNode = static_cast(*shadowNode); + auto& concreteShadowNode = static_cast(*shadowNode); concreteShadowNode.setTextLayoutManager(textLayoutManager_); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp index 4e6a4bd8ba7..88ae3f35a22 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.cpp @@ -10,8 +10,8 @@ namespace facebook::react { static jsi::Value textInputMetricsPayload( - jsi::Runtime &runtime, - const TextInputMetrics &textInputMetrics) { + jsi::Runtime& runtime, + const TextInputMetrics& textInputMetrics) { auto payload = jsi::Object(runtime); payload.setProperty( @@ -37,8 +37,8 @@ static jsi::Value textInputMetricsPayload( }; static jsi::Value textInputMetricsContentSizePayload( - jsi::Runtime &runtime, - const TextInputMetrics &textInputMetrics) { + jsi::Runtime& runtime, + const TextInputMetrics& textInputMetrics) { auto payload = jsi::Object(runtime); { @@ -54,8 +54,8 @@ static jsi::Value textInputMetricsContentSizePayload( }; static jsi::Value keyPressMetricsPayload( - jsi::Runtime &runtime, - const KeyPressMetrics &keyPressMetrics) { + jsi::Runtime& runtime, + const KeyPressMetrics& keyPressMetrics) { auto payload = jsi::Object(runtime); payload.setProperty(runtime, "eventCount", keyPressMetrics.eventCount); @@ -77,91 +77,91 @@ static jsi::Value keyPressMetricsPayload( }; void TextInputEventEmitter::onFocus( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("focus", textInputMetrics); } void TextInputEventEmitter::onBlur( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("blur", textInputMetrics); } void TextInputEventEmitter::onChange( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("change", textInputMetrics); } void TextInputEventEmitter::onChangeSync( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent( "changeSync", textInputMetrics, EventPriority::SynchronousBatched); } void TextInputEventEmitter::onContentSizeChange( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputContentSizeChangeEvent( "contentSizeChange", textInputMetrics); } void TextInputEventEmitter::onSelectionChange( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("selectionChange", textInputMetrics); } void TextInputEventEmitter::onEndEditing( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("endEditing", textInputMetrics); } void TextInputEventEmitter::onSubmitEditing( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("submitEditing", textInputMetrics); } void TextInputEventEmitter::onKeyPress( - const KeyPressMetrics &keyPressMetrics) const { + const KeyPressMetrics& keyPressMetrics) const { dispatchEvent( "keyPress", - [keyPressMetrics](jsi::Runtime &runtime) { + [keyPressMetrics](jsi::Runtime& runtime) { return keyPressMetricsPayload(runtime, keyPressMetrics); }, EventPriority::AsynchronousBatched); } void TextInputEventEmitter::onKeyPressSync( - const KeyPressMetrics &keyPressMetrics) const { + const KeyPressMetrics& keyPressMetrics) const { dispatchEvent( "keyPressSync", - [keyPressMetrics](jsi::Runtime &runtime) { + [keyPressMetrics](jsi::Runtime& runtime) { return keyPressMetricsPayload(runtime, keyPressMetrics); }, EventPriority::SynchronousBatched); } void TextInputEventEmitter::onScroll( - const TextInputMetrics &textInputMetrics) const { + const TextInputMetrics& textInputMetrics) const { dispatchTextInputEvent("scroll", textInputMetrics); } void TextInputEventEmitter::dispatchTextInputEvent( - const std::string &name, - const TextInputMetrics &textInputMetrics, + const std::string& name, + const TextInputMetrics& textInputMetrics, EventPriority priority) const { dispatchEvent( name, - [textInputMetrics](jsi::Runtime &runtime) { + [textInputMetrics](jsi::Runtime& runtime) { return textInputMetricsPayload(runtime, textInputMetrics); }, priority); } void TextInputEventEmitter::dispatchTextInputContentSizeChangeEvent( - const std::string &name, - const TextInputMetrics &textInputMetrics, + const std::string& name, + const TextInputMetrics& textInputMetrics, EventPriority priority) const { dispatchEvent( name, - [textInputMetrics](jsi::Runtime &runtime) { + [textInputMetrics](jsi::Runtime& runtime) { return textInputMetricsContentSizePayload(runtime, textInputMetrics); }, priority); diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h index 96bb7d3977d..0ab2b18544f 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputEventEmitter.h @@ -36,27 +36,27 @@ class TextInputEventEmitter : public ViewEventEmitter { public: using ViewEventEmitter::ViewEventEmitter; - void onFocus(const TextInputMetrics &textInputMetrics) const; - void onBlur(const TextInputMetrics &textInputMetrics) const; - void onChange(const TextInputMetrics &textInputMetrics) const; - void onChangeSync(const TextInputMetrics &textInputMetrics) const; - void onContentSizeChange(const TextInputMetrics &textInputMetrics) const; - void onSelectionChange(const TextInputMetrics &textInputMetrics) const; - void onEndEditing(const TextInputMetrics &textInputMetrics) const; - void onSubmitEditing(const TextInputMetrics &textInputMetrics) const; - void onKeyPress(const KeyPressMetrics &keyPressMetrics) const; - void onKeyPressSync(const KeyPressMetrics &keyPressMetrics) const; - void onScroll(const TextInputMetrics &textInputMetrics) const; + void onFocus(const TextInputMetrics& textInputMetrics) const; + void onBlur(const TextInputMetrics& textInputMetrics) const; + void onChange(const TextInputMetrics& textInputMetrics) const; + void onChangeSync(const TextInputMetrics& textInputMetrics) const; + void onContentSizeChange(const TextInputMetrics& textInputMetrics) const; + void onSelectionChange(const TextInputMetrics& textInputMetrics) const; + void onEndEditing(const TextInputMetrics& textInputMetrics) const; + void onSubmitEditing(const TextInputMetrics& textInputMetrics) const; + void onKeyPress(const KeyPressMetrics& keyPressMetrics) const; + void onKeyPressSync(const KeyPressMetrics& keyPressMetrics) const; + void onScroll(const TextInputMetrics& textInputMetrics) const; private: void dispatchTextInputEvent( - const std::string &name, - const TextInputMetrics &textInputMetrics, + const std::string& name, + const TextInputMetrics& textInputMetrics, EventPriority priority = EventPriority::AsynchronousBatched) const; void dispatchTextInputContentSizeChangeEvent( - const std::string &name, - const TextInputMetrics &textInputMetrics, + const std::string& name, + const TextInputMetrics& textInputMetrics, EventPriority priority = EventPriority::AsynchronousBatched) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp index e900691956c..3e4b712e91d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.cpp @@ -15,9 +15,9 @@ namespace facebook::react { TextInputProps::TextInputProps( - const PropsParserContext &context, - const TextInputProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const TextInputProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps), BaseTextProps(context, sourceProps, rawProps), traits(convertRawProp(context, rawProps, sourceProps.traits, {})), @@ -107,10 +107,10 @@ TextInputProps::TextInputProps( {})){}; void TextInputProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { ViewProps::setProp(context, hash, propName, value); BaseTextProps::setProp(context, hash, propName, value); } diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h index cf1f1b15126..203f762ede1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputProps.h @@ -26,15 +26,15 @@ class TextInputProps final : public ViewProps, public BaseTextProps { public: TextInputProps() = default; TextInputProps( - const PropsParserContext &context, - const TextInputProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const TextInputProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp index fbfcbc0d39b..a23dd665c70 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.cpp @@ -19,7 +19,7 @@ namespace facebook::react { extern const char TextInputComponentName[] = "TextInput"; AttributedStringBox TextInputShadowNode::attributedStringBoxToMeasure( - const LayoutContext &layoutContext) const { + const LayoutContext& layoutContext) const { bool hasMeaningfulState = getState() && getState()->getRevision() != State::initialRevisionValue; @@ -54,7 +54,7 @@ AttributedStringBox TextInputShadowNode::attributedStringBoxToMeasure( } AttributedString TextInputShadowNode::getAttributedString( - const LayoutContext &layoutContext) const { + const LayoutContext& layoutContext) const { auto textAttributes = getConcreteProps().getEffectiveTextAttributes( layoutContext.fontSizeMultiplier); auto attributedString = AttributedString{}; @@ -76,11 +76,11 @@ void TextInputShadowNode::setTextLayoutManager( } void TextInputShadowNode::updateStateIfNeeded( - const LayoutContext &layoutContext) { + const LayoutContext& layoutContext) { ensureUnsealed(); auto reactTreeAttributedString = getAttributedString(layoutContext); - const auto &state = getStateData(); + const auto& state = getStateData(); react_native_assert(textLayoutManager_); react_native_assert( @@ -104,8 +104,8 @@ void TextInputShadowNode::updateStateIfNeeded( #pragma mark - LayoutableShadowNode Size TextInputShadowNode::measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const { return textLayoutManager_ ->measure( attributedStringBoxToMeasure(layoutContext), diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h index 06a7fb336e3..88670730af8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputShadowNode.h @@ -51,21 +51,21 @@ class TextInputShadowNode final : public ConcreteViewShadowNode< #pragma mark - LayoutableShadowNode Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const override; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const override; void layout(LayoutContext layoutContext) override; private: /* * Creates a `State` object if needed. */ - void updateStateIfNeeded(const LayoutContext &layoutContext); + void updateStateIfNeeded(const LayoutContext& layoutContext); /* * Returns a `AttributedString` which represents text content of the node. */ AttributedString getAttributedString( - const LayoutContext &layoutContext) const; + const LayoutContext& layoutContext) const; /* * Returns an `AttributedStringBox` which represents text content that should @@ -73,7 +73,7 @@ class TextInputShadowNode final : public ConcreteViewShadowNode< * placeholder value or some character that represents the size of the font. */ AttributedStringBox attributedStringBoxToMeasure( - const LayoutContext &layoutContext) const; + const LayoutContext& layoutContext) const; std::shared_ptr textLayoutManager_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp index 2fa0624284d..a78a839b419 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.cpp @@ -11,8 +11,8 @@ namespace facebook::react { #ifdef ANDROID TextInputState::TextInputState( - const TextInputState & /*previousState*/, - const folly::dynamic & /*data*/){}; + const TextInputState& /*previousState*/, + const folly::dynamic& /*data*/){}; /* * Empty implementation for Android because it doesn't use this class. diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h index 300965c5e4a..3a11436d436 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/TextInputState.h @@ -57,8 +57,8 @@ class TextInputState final { #ifdef ANDROID TextInputState( - const TextInputState &previousState, - const folly::dynamic &data); + const TextInputState& previousState, + const folly::dynamic& data); folly::dynamic getDynamic() const; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h index 98aaf830506..93e30078534 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/conversions.h @@ -14,9 +14,9 @@ namespace facebook::react { inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AutocapitalizationType &result) { + const PropsParserContext& context, + const RawValue& value, + AutocapitalizationType& result) { auto string = (std::string)value; if (string == "none") { result = AutocapitalizationType::None; @@ -38,9 +38,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - KeyboardAppearance &result) { + const PropsParserContext& context, + const RawValue& value, + KeyboardAppearance& result) { auto string = (std::string)value; if (string == "default") { result = KeyboardAppearance::Default; @@ -58,9 +58,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ReturnKeyType &result) { + const PropsParserContext& context, + const RawValue& value, + ReturnKeyType& result) { auto string = (std::string)value; if (string == "default") { result = ReturnKeyType::Default; @@ -126,9 +126,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - SubmitBehavior &result) { + const PropsParserContext& context, + const RawValue& value, + SubmitBehavior& result) { auto string = (std::string)value; if (string == "newline") { result = SubmitBehavior::Newline; @@ -146,9 +146,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - TextInputAccessoryVisibilityMode &result) { + const PropsParserContext& context, + const RawValue& value, + TextInputAccessoryVisibilityMode& result) { auto string = (std::string)value; if (string == "never") { result = TextInputAccessoryVisibilityMode::Never; @@ -170,9 +170,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - KeyboardType &result) { + const PropsParserContext& context, + const RawValue& value, + KeyboardType& result) { auto string = (std::string)value; if (string == "default") { result = KeyboardType::Default; diff --git a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h index 6f56f9ced6f..70bff227eb8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/textinput/iostextinput/react/renderer/components/iostextinput/propsConversions.h @@ -15,10 +15,10 @@ namespace facebook::react { static TextInputTraits convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const TextInputTraits &sourceTraits, - const TextInputTraits &defaultTraits) { + const PropsParserContext& context, + const RawProps& rawProps, + const TextInputTraits& sourceTraits, + const TextInputTraits& defaultTraits) { auto traits = TextInputTraits{}; traits.multiline = convertRawProp( @@ -152,12 +152,12 @@ static TextInputTraits convertRawProp( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - Selection &result) { + const PropsParserContext& context, + const RawValue& value, + Selection& result) { if (value.hasType>()) { auto map = (butter::map)value; - for (const auto &pair : map) { + for (const auto& pair : map) { if (pair.first == "start") { result.start = pair.second; } else if (pair.first == "end") { diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp index b83dae86643..1fd2a48271a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.cpp @@ -15,13 +15,13 @@ ComponentHandle UnimplementedViewComponentDescriptor::getComponentHandle() } ComponentName UnimplementedViewComponentDescriptor::getComponentName() const { - return static_cast(flavor_.get())->c_str(); + return static_cast(flavor_.get())->c_str(); } Props::Shared UnimplementedViewComponentDescriptor::cloneProps( - const PropsParserContext &context, - const Props::Shared &props, - const RawProps &rawProps) const { + const PropsParserContext& context, + const Props::Shared& props, + const RawProps& rawProps) const { auto clonedProps = ConcreteComponentDescriptor::cloneProps( context, props, rawProps); @@ -32,7 +32,7 @@ Props::Shared UnimplementedViewComponentDescriptor::cloneProps( emptyRawProps.parse(rawPropsParser_, context); auto unimplementedViewProps = std::make_shared( context, - static_cast(*clonedProps), + static_cast(*clonedProps), emptyRawProps); unimplementedViewProps->setComponentName(getComponentName()); diff --git a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h index 08a1f729362..6240fae281d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/unimplementedview/UnimplementedViewComponentDescriptor.h @@ -33,9 +33,9 @@ class UnimplementedViewComponentDescriptor final * `Props` object. */ Props::Shared cloneProps( - const PropsParserContext &context, - const Props::Shared &props, - const RawProps &rawProps) const override; + const PropsParserContext& context, + const Props::Shared& props, + const RawProps& rawProps) const override; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h index 73c975da5dc..ce9f6eb4517 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityPrimitives.h @@ -54,14 +54,14 @@ struct AccessibilityAction { }; inline static bool operator==( - const AccessibilityAction &lhs, - const AccessibilityAction &rhs) { + const AccessibilityAction& lhs, + const AccessibilityAction& rhs) { return lhs.name == rhs.name && lhs.label == rhs.label; } inline static bool operator!=( - const AccessibilityAction &lhs, - const AccessibilityAction &rhs) { + const AccessibilityAction& lhs, + const AccessibilityAction& rhs) { return !(rhs == lhs); } @@ -74,16 +74,16 @@ struct AccessibilityState { }; constexpr bool operator==( - const AccessibilityState &lhs, - const AccessibilityState &rhs) { + const AccessibilityState& lhs, + const AccessibilityState& rhs) { return lhs.disabled == rhs.disabled && lhs.selected == rhs.selected && lhs.checked == rhs.checked && lhs.busy == rhs.busy && lhs.expanded == rhs.expanded; } constexpr bool operator!=( - const AccessibilityState &lhs, - const AccessibilityState &rhs) { + const AccessibilityState& lhs, + const AccessibilityState& rhs) { return !(rhs == lhs); } @@ -92,14 +92,14 @@ struct AccessibilityLabelledBy { }; inline static bool operator==( - const AccessibilityLabelledBy &lhs, - const AccessibilityLabelledBy &rhs) { + const AccessibilityLabelledBy& lhs, + const AccessibilityLabelledBy& rhs) { return lhs.value == rhs.value; } inline static bool operator!=( - const AccessibilityLabelledBy &lhs, - const AccessibilityLabelledBy &rhs) { + const AccessibilityLabelledBy& lhs, + const AccessibilityLabelledBy& rhs) { return !(lhs == rhs); } @@ -111,15 +111,15 @@ struct AccessibilityValue { }; constexpr bool operator==( - const AccessibilityValue &lhs, - const AccessibilityValue &rhs) { + const AccessibilityValue& lhs, + const AccessibilityValue& rhs) { return lhs.min == rhs.min && lhs.max == rhs.max && lhs.now == rhs.now && lhs.text == rhs.text; } constexpr bool operator!=( - const AccessibilityValue &lhs, - const AccessibilityValue &rhs) { + const AccessibilityValue& lhs, + const AccessibilityValue& rhs) { return !(rhs == lhs); } @@ -252,14 +252,14 @@ enum class Role { namespace std { template <> struct hash { - size_t operator()(const facebook::react::AccessibilityRole &v) const { + size_t operator()(const facebook::react::AccessibilityRole& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::Role &v) const { + size_t operator()(const facebook::react::Role& v) const { return hash()(static_cast(v)); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp index 03e9896c03e..bb5e7a6f288 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.cpp @@ -16,9 +16,9 @@ namespace facebook::react { AccessibilityProps::AccessibilityProps( - const PropsParserContext &context, - const AccessibilityProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const AccessibilityProps& sourceProps, + const RawProps& rawProps) : accessible( CoreFeatures::enablePropIteratorSetter ? sourceProps.accessible : convertRawProp( @@ -187,11 +187,11 @@ AccessibilityProps::AccessibilityProps( // to work around here, and (2) would require very careful work to address // this case and not regress the more common cases. if (!CoreFeatures::enablePropIteratorSetter) { - auto *accessibilityRoleValue = + auto* accessibilityRoleValue = rawProps.at("accessibilityRole", nullptr, nullptr); - auto *roleValue = rawProps.at("role", nullptr, nullptr); + auto* roleValue = rawProps.at("role", nullptr, nullptr); - auto *precedentRoleValue = + auto* precedentRoleValue = roleValue != nullptr ? roleValue : accessibilityRoleValue; if (accessibilityRoleValue == nullptr || @@ -216,10 +216,10 @@ AccessibilityProps::AccessibilityProps( } void AccessibilityProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char * /*propName*/, - const RawValue &value) { + const char* /*propName*/, + const RawValue& value) { static auto defaults = AccessibilityProps{}; switch (hash) { @@ -260,7 +260,7 @@ void AccessibilityProps::setProp( #if RN_DEBUG_STRING_CONVERTIBLE SharedDebugStringConvertibleList AccessibilityProps::getDebugProps() const { - const auto &defaultProps = AccessibilityProps(); + const auto& defaultProps = AccessibilityProps(); return SharedDebugStringConvertibleList{ debugStringConvertibleItem("testId", testId, defaultProps.testId), }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h index b03016b63e0..d4df71390e0 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/AccessibilityProps.h @@ -19,18 +19,18 @@ class AccessibilityProps { public: AccessibilityProps() = default; AccessibilityProps( - const PropsParserContext &context, - const AccessibilityProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const AccessibilityProps& sourceProps, + const RawProps& rawProps); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #ifdef ANDROID - void propsDiffMapBuffer(const Props *oldProps, MapBufferBuilder &builder) + void propsDiffMapBuffer(const Props* oldProps, MapBufferBuilder& builder) const; #endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.cpp index 4a7c4b5354e..944d290e85e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.cpp @@ -10,9 +10,9 @@ namespace facebook::react { void setTouchPayloadOnObject( - jsi::Object &object, - jsi::Runtime &runtime, - const BaseTouch &touch) { + jsi::Object& object, + jsi::Runtime& runtime, + const BaseTouch& touch) { object.setProperty(runtime, "locationX", touch.offsetPoint.x); object.setProperty(runtime, "locationY", touch.offsetPoint.y); object.setProperty(runtime, "pageX", touch.pagePoint.x); @@ -27,12 +27,12 @@ void setTouchPayloadOnObject( #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const BaseTouch & /*touch*/) { +std::string getDebugName(const BaseTouch& /*touch*/) { return "Touch"; } std::vector getDebugProps( - const BaseTouch &touch, + const BaseTouch& touch, DebugStringConvertibleOptions options) { return { {"pagePoint", getDebugDescription(touch.pagePoint, options)}, diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.h b/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.h index 7a4f7bfca6a..0d658310f27 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseTouch.h @@ -62,28 +62,28 @@ struct BaseTouch { * collections. Because of that they are expressed as separate classes. */ struct Hasher { - size_t operator()(const BaseTouch &touch) const { + size_t operator()(const BaseTouch& touch) const { return std::hash()(touch.identifier); } }; struct Comparator { - bool operator()(const BaseTouch &lhs, const BaseTouch &rhs) const { + bool operator()(const BaseTouch& lhs, const BaseTouch& rhs) const { return lhs.identifier == rhs.identifier; } }; }; void setTouchPayloadOnObject( - jsi::Object &object, - jsi::Runtime &runtime, - const BaseTouch &touch); + jsi::Object& object, + jsi::Runtime& runtime, + const BaseTouch& touch); #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const BaseTouch &touch); +std::string getDebugName(const BaseTouch& touch); std::vector getDebugProps( - const BaseTouch &touch, + const BaseTouch& touch, DebugStringConvertibleOptions options); #endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.cpp index 4d31583188e..f349f2503f6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.cpp @@ -13,8 +13,8 @@ namespace facebook::react { #pragma mark - Accessibility void BaseViewEventEmitter::onAccessibilityAction( - const std::string &name) const { - dispatchEvent("accessibilityAction", [name](jsi::Runtime &runtime) { + const std::string& name) const { + dispatchEvent("accessibilityAction", [name](jsi::Runtime& runtime) { auto payload = jsi::Object(runtime); payload.setProperty(runtime, "actionName", name); return payload; @@ -35,7 +35,7 @@ void BaseViewEventEmitter::onAccessibilityEscape() const { #pragma mark - Layout -void BaseViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const { +void BaseViewEventEmitter::onLayout(const LayoutMetrics& layoutMetrics) const { // A copy of a shared pointer (`layoutEventState_`) establishes shared // ownership that will be captured by lambda. auto layoutEventState = layoutEventState_; @@ -82,7 +82,7 @@ void BaseViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const { dispatchEvent( "layout", - [layoutEventState](jsi::Runtime &runtime) { + [layoutEventState](jsi::Runtime& runtime) { auto frame = Rect{}; { diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h index e68cd0cc184..584bc01239c 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewEventEmitter.h @@ -23,14 +23,14 @@ class BaseViewEventEmitter : public TouchEventEmitter { #pragma mark - Accessibility - void onAccessibilityAction(const std::string &name) const; + void onAccessibilityAction(const std::string& name) const; void onAccessibilityTap() const; void onAccessibilityMagicTap() const; void onAccessibilityEscape() const; #pragma mark - Layout - void onLayout(const LayoutMetrics &layoutMetrics) const; + void onLayout(const LayoutMetrics& layoutMetrics) const; private: /* diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp index c0ff185f27a..5cf7c710478 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.cpp @@ -30,7 +30,7 @@ std::array getTranslateForTransformOrigin( std::array origin = {viewCenterX, viewCenterY, transformOrigin.z}; for (size_t i = 0; i < transformOrigin.xy.size(); ++i) { - auto ¤tOrigin = transformOrigin.xy[i]; + auto& currentOrigin = transformOrigin.xy[i]; if (currentOrigin.unit == UnitType::Point) { origin[i] = currentOrigin.value; } else if (currentOrigin.unit == UnitType::Percent) { @@ -49,9 +49,9 @@ std::array getTranslateForTransformOrigin( } // namespace BaseViewProps::BaseViewProps( - const PropsParserContext &context, - const BaseViewProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const BaseViewProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps) : YogaStylableProps(context, sourceProps, rawProps, shouldSetRawProps), AccessibilityProps(context, sourceProps, rawProps), @@ -253,10 +253,10 @@ BaseViewProps::BaseViewProps( } void BaseViewProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. @@ -317,7 +317,7 @@ void BaseViewProps::setProp( #pragma mark - Convenience Methods -static BorderRadii ensureNoOverlap(const BorderRadii &radii, const Size &size) { +static BorderRadii ensureNoOverlap(const BorderRadii& radii, const Size& size) { // "Corner curves must not overlap: When the sum of any two adjacent border // radii exceeds the size of the border box, UAs must proportionally reduce // the used values of all border radii until none of them overlap." @@ -354,7 +354,7 @@ static BorderRadii ensureNoOverlap(const BorderRadii &radii, const Size &size) { } BorderMetrics BaseViewProps::resolveBorderMetrics( - const LayoutMetrics &layoutMetrics) const { + const LayoutMetrics& layoutMetrics) const { auto isRTL = bool{layoutMetrics.layoutDirection == LayoutDirection::RightToLeft}; @@ -386,7 +386,7 @@ BorderMetrics BaseViewProps::resolveBorderMetrics( } Transform BaseViewProps::resolveTransform( - LayoutMetrics const &layoutMetrics) const { + LayoutMetrics const& layoutMetrics) const { float viewWidth = layoutMetrics.frame.size.width; float viewHeight = layoutMetrics.frame.size.height; if (!transformOrigin.isSet() || (viewWidth == 0 && viewHeight == 0)) { @@ -412,7 +412,7 @@ bool BaseViewProps::getClipsContentToBounds() const { #if RN_DEBUG_STRING_CONVERTIBLE SharedDebugStringConvertibleList BaseViewProps::getDebugProps() const { - const auto &defaultBaseViewProps = BaseViewProps(); + const auto& defaultBaseViewProps = BaseViewProps(); return AccessibilityProps::getDebugProps() + YogaStylableProps::getDebugProps() + diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h index 31fd1007964..185400a5f2d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/BaseViewProps.h @@ -24,16 +24,16 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps { public: BaseViewProps() = default; BaseViewProps( - const PropsParserContext &context, - const BaseViewProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const BaseViewProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps = true); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #pragma mark - Props @@ -75,8 +75,8 @@ class BaseViewProps : public YogaStylableProps, public AccessibilityProps { #pragma mark - Convenience Methods - BorderMetrics resolveBorderMetrics(const LayoutMetrics &layoutMetrics) const; - Transform resolveTransform(const LayoutMetrics &layoutMetrics) const; + BorderMetrics resolveBorderMetrics(const LayoutMetrics& layoutMetrics) const; + Transform resolveTransform(const LayoutMetrics& layoutMetrics) const; bool getClipsContentToBounds() const; #if RN_DEBUG_STRING_CONVERTIBLE diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h index a1c07685564..aec7fac7b92 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ConcreteViewShadowNode.h @@ -24,7 +24,7 @@ namespace facebook::react { * For example: , , but not , . */ template < - const char *concreteComponentName, + const char* concreteComponentName, typename ViewPropsT = ViewProps, typename ViewEventEmitterT = ViewEventEmitter, typename... Ts> @@ -53,16 +53,16 @@ class ConcreteViewShadowNode : public ConcreteShadowNode< Ts...>; ConcreteViewShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits) : BaseShadowNode(fragment, family, traits) { initialize(); } ConcreteViewShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : BaseShadowNode(sourceShadowNode, fragment) { initialize(); } @@ -86,7 +86,7 @@ class ConcreteViewShadowNode : public ConcreteShadowNode< private: void initialize() noexcept { - auto &props = BaseShadowNode::getConcreteProps(); + auto& props = BaseShadowNode::getConcreteProps(); if (props.yogaStyle.display() == YGDisplayNone) { BaseShadowNode::traits_.set(ShadowNodeTraits::Trait::Hidden); diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.cpp index 5973fb2138a..23ab7a9cfc9 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.cpp @@ -9,7 +9,7 @@ namespace facebook::react { -jsi::Value PointerEvent::asJSIValue(jsi::Runtime &runtime) const { +jsi::Value PointerEvent::asJSIValue(jsi::Runtime& runtime) const { auto object = jsi::Object(runtime); object.setProperty(runtime, "pointerId", this->pointerId); object.setProperty(runtime, "pressure", this->pressure); @@ -50,12 +50,12 @@ EventPayloadType PointerEvent::getType() const { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const PointerEvent & /*pointerEvent*/) { +std::string getDebugName(const PointerEvent& /*pointerEvent*/) { return "PointerEvent"; } std::vector getDebugProps( - const PointerEvent &pointerEvent, + const PointerEvent& pointerEvent, DebugStringConvertibleOptions options) { return { {"pointerId", getDebugDescription(pointerEvent.pointerId, options)}, diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.h b/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.h index 158d73d2096..a594e6b94cd 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/PointerEvent.h @@ -114,15 +114,15 @@ struct PointerEvent : public EventPayload { /* * EventPayload implementations */ - jsi::Value asJSIValue(jsi::Runtime &runtime) const override; + jsi::Value asJSIValue(jsi::Runtime& runtime) const override; EventPayloadType getType() const override; }; #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const PointerEvent &pointerEvent); +std::string getDebugName(const PointerEvent& pointerEvent); std::vector getDebugProps( - const PointerEvent &pointerEvent, + const PointerEvent& pointerEvent, DebugStringConvertibleOptions options); #endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.cpp index c41c1bcddd7..b7ccb24d644 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.cpp @@ -11,12 +11,12 @@ namespace facebook::react { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const TouchEvent & /*touchEvent*/) { +std::string getDebugName(const TouchEvent& /*touchEvent*/) { return "TouchEvent"; } std::vector getDebugProps( - const TouchEvent &touchEvent, + const TouchEvent& touchEvent, DebugStringConvertibleOptions options) { return { {"touches", getDebugDescription(touchEvent.touches, options)}, diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.h b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.h index 3907869831e..6010f0e21d8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEvent.h @@ -41,9 +41,9 @@ struct TouchEvent { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const TouchEvent &touchEvent); +std::string getDebugName(const TouchEvent& touchEvent); std::vector getDebugProps( - const TouchEvent &touchEvent, + const TouchEvent& touchEvent, DebugStringConvertibleOptions options); #endif diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp index a4a0ba91fa1..154273a830d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp @@ -12,11 +12,11 @@ namespace facebook::react { #pragma mark - Touches static jsi::Value touchesPayload( - jsi::Runtime &runtime, - const Touches &touches) { + jsi::Runtime& runtime, + const Touches& touches) { auto array = jsi::Array(runtime, touches.size()); int i = 0; - for (const auto &touch : touches) { + for (const auto& touch : touches) { auto object = jsi::Object(runtime); setTouchPayloadOnObject(object, runtime, touch); array.setValueAtIndex(runtime, i++, object); @@ -25,8 +25,8 @@ static jsi::Value touchesPayload( } static jsi::Value touchEventPayload( - jsi::Runtime &runtime, - const TouchEvent &event) { + jsi::Runtime& runtime, + const TouchEvent& event) { auto object = jsi::Object(runtime); object.setProperty( runtime, "touches", touchesPayload(runtime, event.touches)); @@ -36,7 +36,7 @@ static jsi::Value touchEventPayload( runtime, "targetTouches", touchesPayload(runtime, event.targetTouches)); if (!event.changedTouches.empty()) { - const auto &firstChangedTouch = *event.changedTouches.begin(); + const auto& firstChangedTouch = *event.changedTouches.begin(); setTouchPayloadOnObject(object, runtime, firstChangedTouch); } return object; @@ -44,12 +44,12 @@ static jsi::Value touchEventPayload( void TouchEventEmitter::dispatchTouchEvent( std::string type, - const TouchEvent &event, + const TouchEvent& event, EventPriority priority, RawEvent::Category category) const { dispatchEvent( std::move(type), - [event](jsi::Runtime &runtime) { + [event](jsi::Runtime& runtime) { return touchEventPayload(runtime, event); }, priority, @@ -58,7 +58,7 @@ void TouchEventEmitter::dispatchTouchEvent( void TouchEventEmitter::dispatchPointerEvent( std::string type, - const PointerEvent &event, + const PointerEvent& event, EventPriority priority, RawEvent::Category category) const { dispatchEvent( @@ -68,7 +68,7 @@ void TouchEventEmitter::dispatchPointerEvent( category); } -void TouchEventEmitter::onTouchStart(const TouchEvent &event) const { +void TouchEventEmitter::onTouchStart(const TouchEvent& event) const { dispatchTouchEvent( "touchStart", event, @@ -76,13 +76,13 @@ void TouchEventEmitter::onTouchStart(const TouchEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onTouchMove(const TouchEvent &event) const { - dispatchUniqueEvent("touchMove", [event](jsi::Runtime &runtime) { +void TouchEventEmitter::onTouchMove(const TouchEvent& event) const { + dispatchUniqueEvent("touchMove", [event](jsi::Runtime& runtime) { return touchEventPayload(runtime, event); }); } -void TouchEventEmitter::onTouchEnd(const TouchEvent &event) const { +void TouchEventEmitter::onTouchEnd(const TouchEvent& event) const { dispatchTouchEvent( "touchEnd", event, @@ -90,7 +90,7 @@ void TouchEventEmitter::onTouchEnd(const TouchEvent &event) const { RawEvent::Category::ContinuousEnd); } -void TouchEventEmitter::onTouchCancel(const TouchEvent &event) const { +void TouchEventEmitter::onTouchCancel(const TouchEvent& event) const { dispatchTouchEvent( "touchCancel", event, @@ -98,7 +98,7 @@ void TouchEventEmitter::onTouchCancel(const TouchEvent &event) const { RawEvent::Category::ContinuousEnd); } -void TouchEventEmitter::onClick(const PointerEvent &event) const { +void TouchEventEmitter::onClick(const PointerEvent& event) const { dispatchPointerEvent( "click", event, @@ -106,7 +106,7 @@ void TouchEventEmitter::onClick(const PointerEvent &event) const { RawEvent::Category::Discrete); } -void TouchEventEmitter::onPointerCancel(const PointerEvent &event) const { +void TouchEventEmitter::onPointerCancel(const PointerEvent& event) const { dispatchPointerEvent( "pointerCancel", event, @@ -114,7 +114,7 @@ void TouchEventEmitter::onPointerCancel(const PointerEvent &event) const { RawEvent::Category::ContinuousEnd); } -void TouchEventEmitter::onPointerDown(const PointerEvent &event) const { +void TouchEventEmitter::onPointerDown(const PointerEvent& event) const { dispatchPointerEvent( "pointerDown", event, @@ -122,11 +122,11 @@ void TouchEventEmitter::onPointerDown(const PointerEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onPointerMove(const PointerEvent &event) const { +void TouchEventEmitter::onPointerMove(const PointerEvent& event) const { dispatchUniqueEvent("pointerMove", std::make_shared(event)); } -void TouchEventEmitter::onPointerUp(const PointerEvent &event) const { +void TouchEventEmitter::onPointerUp(const PointerEvent& event) const { dispatchPointerEvent( "pointerUp", event, @@ -134,7 +134,7 @@ void TouchEventEmitter::onPointerUp(const PointerEvent &event) const { RawEvent::Category::ContinuousEnd); } -void TouchEventEmitter::onPointerEnter(const PointerEvent &event) const { +void TouchEventEmitter::onPointerEnter(const PointerEvent& event) const { dispatchPointerEvent( "pointerEnter", event, @@ -142,7 +142,7 @@ void TouchEventEmitter::onPointerEnter(const PointerEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onPointerLeave(const PointerEvent &event) const { +void TouchEventEmitter::onPointerLeave(const PointerEvent& event) const { dispatchPointerEvent( "pointerLeave", event, @@ -150,7 +150,7 @@ void TouchEventEmitter::onPointerLeave(const PointerEvent &event) const { RawEvent::Category::ContinuousEnd); } -void TouchEventEmitter::onPointerOver(const PointerEvent &event) const { +void TouchEventEmitter::onPointerOver(const PointerEvent& event) const { dispatchPointerEvent( "pointerOver", event, @@ -158,7 +158,7 @@ void TouchEventEmitter::onPointerOver(const PointerEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onPointerOut(const PointerEvent &event) const { +void TouchEventEmitter::onPointerOut(const PointerEvent& event) const { dispatchPointerEvent( "pointerOut", event, @@ -166,7 +166,7 @@ void TouchEventEmitter::onPointerOut(const PointerEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onGotPointerCapture(const PointerEvent &event) const { +void TouchEventEmitter::onGotPointerCapture(const PointerEvent& event) const { dispatchPointerEvent( "gotPointerCapture", event, @@ -174,7 +174,7 @@ void TouchEventEmitter::onGotPointerCapture(const PointerEvent &event) const { RawEvent::Category::ContinuousStart); } -void TouchEventEmitter::onLostPointerCapture(const PointerEvent &event) const { +void TouchEventEmitter::onLostPointerCapture(const PointerEvent& event) const { dispatchPointerEvent( "lostPointerCapture", event, diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.h b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.h index a2f5252c47b..08b368c0eb5 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/TouchEventEmitter.h @@ -24,32 +24,32 @@ class TouchEventEmitter : public EventEmitter { public: using EventEmitter::EventEmitter; - void onTouchStart(const TouchEvent &event) const; - void onTouchMove(const TouchEvent &event) const; - void onTouchEnd(const TouchEvent &event) const; - void onTouchCancel(const TouchEvent &event) const; + void onTouchStart(const TouchEvent& event) const; + void onTouchMove(const TouchEvent& event) const; + void onTouchEnd(const TouchEvent& event) const; + void onTouchCancel(const TouchEvent& event) const; - void onClick(const PointerEvent &event) const; - void onPointerCancel(const PointerEvent &event) const; - void onPointerDown(const PointerEvent &event) const; - void onPointerMove(const PointerEvent &event) const; - void onPointerUp(const PointerEvent &event) const; - void onPointerEnter(const PointerEvent &event) const; - void onPointerLeave(const PointerEvent &event) const; - void onPointerOver(const PointerEvent &event) const; - void onPointerOut(const PointerEvent &event) const; - void onGotPointerCapture(const PointerEvent &event) const; - void onLostPointerCapture(const PointerEvent &event) const; + void onClick(const PointerEvent& event) const; + void onPointerCancel(const PointerEvent& event) const; + void onPointerDown(const PointerEvent& event) const; + void onPointerMove(const PointerEvent& event) const; + void onPointerUp(const PointerEvent& event) const; + void onPointerEnter(const PointerEvent& event) const; + void onPointerLeave(const PointerEvent& event) const; + void onPointerOver(const PointerEvent& event) const; + void onPointerOut(const PointerEvent& event) const; + void onGotPointerCapture(const PointerEvent& event) const; + void onLostPointerCapture(const PointerEvent& event) const; private: void dispatchTouchEvent( std::string type, - const TouchEvent &event, + const TouchEvent& event, EventPriority priority, RawEvent::Category category) const; void dispatchPointerEvent( std::string type, - const PointerEvent &event, + const PointerEvent& event, EventPriority priority, RawEvent::Category category) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h index 02349010b35..e2581d31168 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ViewComponentDescriptor.h @@ -15,7 +15,7 @@ namespace facebook::react { class ViewComponentDescriptor : public ConcreteComponentDescriptor { public: - ViewComponentDescriptor(const ComponentDescriptorParameters ¶meters) + ViewComponentDescriptor(const ComponentDescriptorParameters& parameters) : ConcreteComponentDescriptor(parameters) {} }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h b/packages/react-native/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h index 089c025fe75..2e95558c493 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ViewPropsInterpolation.h @@ -19,15 +19,15 @@ namespace facebook::react { */ static inline void interpolateViewProps( Float animationProgress, - const Props::Shared &oldPropsShared, - const Props::Shared &newPropsShared, - Props::Shared &interpolatedPropsShared) { - const ViewProps *oldViewProps = - static_cast(oldPropsShared.get()); - const ViewProps *newViewProps = - static_cast(newPropsShared.get()); - ViewProps *interpolatedProps = const_cast( - static_cast(interpolatedPropsShared.get())); + const Props::Shared& oldPropsShared, + const Props::Shared& newPropsShared, + Props::Shared& interpolatedPropsShared) { + const ViewProps* oldViewProps = + static_cast(oldPropsShared.get()); + const ViewProps* newViewProps = + static_cast(newPropsShared.get()); + ViewProps* interpolatedProps = const_cast( + static_cast(interpolatedPropsShared.get())); interpolatedProps->opacity = oldViewProps->opacity + (newViewProps->opacity - oldViewProps->opacity) * animationProgress; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp index 6b5d735395c..04a4020a946 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.cpp @@ -16,9 +16,9 @@ namespace facebook::react { const char ViewComponentName[] = "View"; ViewShadowNodeProps::ViewShadowNodeProps( - const PropsParserContext &context, - const ViewShadowNodeProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const ViewShadowNodeProps& sourceProps, + const RawProps& rawProps) : ViewProps( context, sourceProps, @@ -26,22 +26,22 @@ ViewShadowNodeProps::ViewShadowNodeProps( !CoreFeatures::enableMapBuffer){}; ViewShadowNode::ViewShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits) : ConcreteViewShadowNode(fragment, family, traits) { initialize(); } ViewShadowNode::ViewShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : ConcreteViewShadowNode(sourceShadowNode, fragment) { initialize(); } void ViewShadowNode::initialize() noexcept { - auto &viewProps = static_cast(*props_); + auto& viewProps = static_cast(*props_); bool formsStackingContext = !viewProps.collapsable || viewProps.pointerEvents == PointerEventsMode::None || diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h index 01acbcfb54d..4979d37485b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/ViewShadowNode.h @@ -21,9 +21,9 @@ class ViewShadowNodeProps final : public ViewProps { public: ViewShadowNodeProps() = default; ViewShadowNodeProps( - const PropsParserContext &context, - const ViewShadowNodeProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const ViewShadowNodeProps& sourceProps, + const RawProps& rawProps); }; /* @@ -41,13 +41,13 @@ class ViewShadowNode final : public ConcreteViewShadowNode< } ViewShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits); ViewShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment); + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment); private: void initialize() noexcept; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp index ad21539308f..3777cac00a8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp @@ -29,7 +29,7 @@ static int FabricDefaultYogaLog( const YGConfigRef /*unused*/, const YGNodeRef /*unused*/, YGLogLevel level, - const char *format, + const char* format, va_list args) { va_list args_copy; va_copy(args_copy, args); @@ -73,8 +73,8 @@ ShadowNodeTraits::Trait YogaLayoutableShadowNode::IdentifierTrait() { } YogaLayoutableShadowNode::YogaLayoutableShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits) : LayoutableShadowNode(fragment, family, traits), yogaConfig_(FabricDefaultYogaLog), @@ -100,23 +100,23 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode( } YogaLayoutableShadowNode::YogaLayoutableShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : LayoutableShadowNode(sourceShadowNode, fragment), yogaConfig_(FabricDefaultYogaLog), - yogaNode_(static_cast(sourceShadowNode) + yogaNode_(static_cast(sourceShadowNode) .yogaNode_) { // Note, cloned `yoga::Node` instance (copied using copy-constructor) inherits // dirty flag, measure function, and other properties being set originally in // the `YogaLayoutableShadowNode` constructor above. react_native_assert( - static_cast(sourceShadowNode) + static_cast(sourceShadowNode) .yogaNode_.isDirty() == yogaNode_.isDirty() && "Yoga node must inherit dirty flag."); if (!getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode)) { - for (auto &child : getChildren()) { + for (auto& child : getChildren()) { if (auto layoutableChild = traitCast(child)) { yogaLayoutableChildren_.push_back(layoutableChild); } @@ -124,7 +124,7 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode( } YGConfigRef previousConfig = YGNodeGetConfig( - &static_cast(sourceShadowNode) + &static_cast(sourceShadowNode) .yogaNode_); yogaNode_.setContext(this); @@ -145,7 +145,7 @@ YogaLayoutableShadowNode::YogaLayoutableShadowNode( // configured. if (!fragment.props && !fragment.children) { yogaTreeHasBeenConfigured_ = - static_cast(sourceShadowNode) + static_cast(sourceShadowNode) .yogaTreeHasBeenConfigured_; } @@ -182,7 +182,7 @@ void YogaLayoutableShadowNode::enableMeasurement() { } void YogaLayoutableShadowNode::appendYogaChild( - const YogaLayoutableShadowNode::Shared &childNode) { + const YogaLayoutableShadowNode::Shared& childNode) { // The caller must check this before calling this method. react_native_assert( !getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode)); @@ -205,8 +205,8 @@ void YogaLayoutableShadowNode::adoptYogaChild(size_t index) { react_native_assert( !getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode)); - auto &childNode = - traitCast(*getChildren().at(index)); + auto& childNode = + traitCast(*getChildren().at(index)); if (childNode.yogaNode_.getOwner() == nullptr) { // The child node is not owned. @@ -226,7 +226,7 @@ void YogaLayoutableShadowNode::adoptYogaChild(size_t index) { } void YogaLayoutableShadowNode::appendChild( - const ShadowNode::Shared &childNode) { + const ShadowNode::Shared& childNode) { ensureUnsealed(); ensureConsistency(); @@ -260,8 +260,8 @@ void YogaLayoutableShadowNode::appendChild( } void YogaLayoutableShadowNode::replaceChild( - const ShadowNode &oldChild, - const ShadowNode::Shared &newChild, + const ShadowNode& oldChild, + const ShadowNode::Shared& newChild, int32_t suggestedIndex) { LayoutableShadowNode::replaceChild(oldChild, newChild, suggestedIndex); @@ -269,7 +269,7 @@ void YogaLayoutableShadowNode::replaceChild( ensureYogaChildrenLookFine(); auto layoutableOldChild = - traitCast(&oldChild); + traitCast(&oldChild); auto layoutableNewChild = traitCast(newChild); if (layoutableOldChild == nullptr && layoutableNewChild == nullptr) { @@ -286,7 +286,7 @@ void YogaLayoutableShadowNode::replaceChild( : std::find_if( yogaLayoutableChildren_.begin(), yogaLayoutableChildren_.end(), - [&](const YogaLayoutableShadowNode::Shared &layoutableChild) { + [&](const YogaLayoutableShadowNode::Shared& layoutableChild) { return layoutableChild.get() == layoutableOldChild; }); auto oldChildIndex = @@ -314,15 +314,15 @@ void YogaLayoutableShadowNode::replaceChild( } bool YogaLayoutableShadowNode::doesOwn( - const YogaLayoutableShadowNode &child) const { + const YogaLayoutableShadowNode& child) const { return child.yogaNode_.getOwner() == &yogaNode_; } void YogaLayoutableShadowNode::updateYogaChildrenOwnersIfNeeded() { - for (auto &childYogaNode : yogaNode_.getChildren()) { + for (auto& childYogaNode : yogaNode_.getChildren()) { if (childYogaNode->getOwner() == &yogaNode_) { childYogaNode->setOwner( - reinterpret_cast(0xBADC0FFEE0DDF00D)); + reinterpret_cast(0xBADC0FFEE0DDF00D)); } } } @@ -338,7 +338,7 @@ void YogaLayoutableShadowNode::updateYogaChildren() { getChildren().size() == yogaNode_.getChildren().size(); auto oldYogaChildren = - isClean ? yogaNode_.getChildren() : std::vector{}; + isClean ? yogaNode_.getChildren() : std::vector{}; yogaNode_.setChildren({}); yogaLayoutableChildren_.clear(); @@ -351,8 +351,8 @@ void YogaLayoutableShadowNode::updateYogaChildren() { if (isClean) { auto yogaChildIndex = yogaLayoutableChildren_.size() - 1; - auto &oldYogaChildNode = *oldYogaChildren.at(yogaChildIndex); - auto &newYogaChildNode = + auto& oldYogaChildNode = *oldYogaChildren.at(yogaChildIndex); + auto& newYogaChildNode = yogaLayoutableChildren_.at(yogaChildIndex)->yogaNode_; isClean = isClean && !newYogaChildNode.isDirty() && @@ -370,7 +370,7 @@ void YogaLayoutableShadowNode::updateYogaChildren() { void YogaLayoutableShadowNode::updateYogaProps() { ensureUnsealed(); - auto props = static_cast(*props_); + auto props = static_cast(*props_); auto styleResult = applyAliasedProps(props.yogaStyle, props); // Resetting `dirty` flag only if `yogaStyle` portion of `Props` was changed. @@ -382,8 +382,8 @@ void YogaLayoutableShadowNode::updateYogaProps() { } /*static*/ yoga::Style YogaLayoutableShadowNode::applyAliasedProps( - const yoga::Style &baseStyle, - const YogaStylableProps &props) { + const yoga::Style& baseStyle, + const YogaStylableProps& props) { yoga::Style result{baseStyle}; // Aliases with precedence @@ -473,10 +473,10 @@ void YogaLayoutableShadowNode::configureYogaTree( // need to reconfigure it if the context values passed to the Node have // changed. for (size_t i = 0; i < yogaLayoutableChildren_.size(); i++) { - const auto &child = *yogaLayoutableChildren_[i]; + const auto& child = *yogaLayoutableChildren_[i]; auto childLayoutMetrics = child.getLayoutMetrics(); auto childErrata = - YGConfigGetErrata(const_cast(&child.yogaConfig_)); + YGConfigGetErrata(const_cast(&child.yogaConfig_)); if (child.yogaTreeHasBeenConfigured_ && childLayoutMetrics.pointScaleFactor == pointScaleFactor && @@ -486,7 +486,7 @@ void YogaLayoutableShadowNode::configureYogaTree( } if (doesOwn(child)) { - auto &mutableChild = const_cast(child); + auto& mutableChild = const_cast(child); mutableChild.configureYogaTree( pointScaleFactor, child.resolveErrata(errata), swapLeftAndRight); } else { @@ -497,8 +497,8 @@ void YogaLayoutableShadowNode::configureYogaTree( } YGErrata YogaLayoutableShadowNode::resolveErrata(YGErrata defaultErrata) const { - if (auto viewShadowNode = traitCast(this)) { - const auto &props = viewShadowNode->getConcreteProps(); + if (auto viewShadowNode = traitCast(this)) { + const auto& props = viewShadowNode->getConcreteProps(); switch (props.experimental_layoutConformance) { case LayoutConformance::Classic: return YGErrataAll; @@ -512,11 +512,11 @@ YGErrata YogaLayoutableShadowNode::resolveErrata(YGErrata defaultErrata) const { return defaultErrata; } -YogaLayoutableShadowNode &YogaLayoutableShadowNode::cloneChildInPlace( +YogaLayoutableShadowNode& YogaLayoutableShadowNode::cloneChildInPlace( int32_t layoutableChildIndex) { ensureUnsealed(); - const auto &childNode = *yogaLayoutableChildren_[layoutableChildIndex]; + const auto& childNode = *yogaLayoutableChildren_[layoutableChildIndex]; // TODO: Why does this not use `ShadowNodeFragment::statePlaceholder()` like // `adoptYogaChild()`? @@ -526,7 +526,7 @@ YogaLayoutableShadowNode &YogaLayoutableShadowNode::cloneChildInPlace( childNode.getState()}); replaceChild(childNode, clonedChildNode, layoutableChildIndex); - return static_cast(*clonedChildNode); + return static_cast(*clonedChildNode); } void YogaLayoutableShadowNode::setSize(Size size) const { @@ -620,7 +620,7 @@ void YogaLayoutableShadowNode::layoutTree( // `ownerHeight` to allow proper calculation of relative (e.g. specified in // percents) style values. - auto &yogaStyle = yogaNode_.getStyle(); + auto& yogaStyle = yogaNode_.getStyle(); auto ownerWidth = yogaFloatFromFloat(maximumSize.width); auto ownerHeight = yogaFloatFromFloat(maximumSize.height); @@ -685,7 +685,7 @@ void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) { auto contentFrame = Rect{}; for (auto childYogaNode : yogaNode_.getChildren()) { - auto &childNode = shadowNodeFromContext(childYogaNode); + auto& childNode = shadowNodeFromContext(childYogaNode); // Verifying that the Yoga node belongs to the ShadowNode. react_native_assert(&childNode.yogaNode_ == childYogaNode); @@ -728,7 +728,7 @@ void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) { auto layoutMetricsWithOverflowInset = childNode.getLayoutMetrics(); if (layoutMetricsWithOverflowInset.displayType != DisplayType::None) { - auto viewChildNode = traitCast(&childNode); + auto viewChildNode = traitCast(&childNode); auto hitSlop = viewChildNode != nullptr ? viewChildNode->getConcreteProps().hitSlop : EdgeInsets{}; @@ -774,18 +774,18 @@ void YogaLayoutableShadowNode::layout(LayoutContext layoutContext) { #pragma mark - Yoga Connectors -YGNode *YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector( - YGNode * /*oldYogaNode*/, - YGNode *parentYogaNode, +YGNode* YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector( + YGNode* /*oldYogaNode*/, + YGNode* parentYogaNode, int childIndex) { SystraceSection s("YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector"); - auto &parentNode = shadowNodeFromContext(parentYogaNode); + auto& parentNode = shadowNodeFromContext(parentYogaNode); return &parentNode.cloneChildInPlace(childIndex).yogaNode_; } YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector( - YGNode *yogaNode, + YGNode* yogaNode, float width, YGMeasureMode widthMode, float height, @@ -793,7 +793,7 @@ YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector( SystraceSection s( "YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector"); - auto &shadowNode = shadowNodeFromContext(yogaNode); + auto& shadowNode = shadowNodeFromContext(yogaNode); auto minimumSize = Size{0, 0}; auto maximumSize = Size{ @@ -831,14 +831,14 @@ YGSize YogaLayoutableShadowNode::yogaNodeMeasureCallbackConnector( yogaFloatFromFloat(size.width), yogaFloatFromFloat(size.height)}; } -YogaLayoutableShadowNode &YogaLayoutableShadowNode::shadowNodeFromContext( +YogaLayoutableShadowNode& YogaLayoutableShadowNode::shadowNodeFromContext( YGNodeRef yogaNode) { - return traitCast( - *static_cast(YGNodeGetContext(yogaNode))); + return traitCast( + *static_cast(YGNodeGetContext(yogaNode))); } -yoga::Config &YogaLayoutableShadowNode::initializeYogaConfig( - yoga::Config &config, +yoga::Config& YogaLayoutableShadowNode::initializeYogaConfig( + yoga::Config& config, const YGConfigRef previousConfig) { YGConfigSetCloneNodeFunc( &config, YogaLayoutableShadowNode::yogaNodeCloneCallbackConnector); @@ -864,12 +864,12 @@ void YogaLayoutableShadowNode::swapStyleLeftAndRight() { } void YogaLayoutableShadowNode::swapLeftAndRightInYogaStyleProps( - const YogaLayoutableShadowNode &shadowNode) { + const YogaLayoutableShadowNode& shadowNode) { auto yogaStyle = shadowNode.yogaNode_.getStyle(); - const yoga::Style::Edges &position = yogaStyle.position(); - const yoga::Style::Edges &padding = yogaStyle.padding(); - const yoga::Style::Edges &margin = yogaStyle.margin(); + const yoga::Style::Edges& position = yogaStyle.position(); + const yoga::Style::Edges& padding = yogaStyle.padding(); + const yoga::Style::Edges& margin = yogaStyle.margin(); // Swap Yoga node values, position, padding and margin. @@ -907,9 +907,9 @@ void YogaLayoutableShadowNode::swapLeftAndRightInYogaStyleProps( } void YogaLayoutableShadowNode::swapLeftAndRightInViewProps( - const YogaLayoutableShadowNode &shadowNode) { - auto &typedCasting = static_cast(*shadowNode.props_); - auto &props = const_cast(typedCasting); + const YogaLayoutableShadowNode& shadowNode) { + auto& typedCasting = static_cast(*shadowNode.props_); + auto& props = const_cast(typedCasting); // Swap border node values, borderRadii, borderColors and borderStyles. @@ -953,7 +953,7 @@ void YogaLayoutableShadowNode::swapLeftAndRightInViewProps( props.borderStyles.right.reset(); } - const yoga::Style::Edges &border = props.yogaStyle.border(); + const yoga::Style::Edges& border = props.yogaStyle.border(); if (props.yogaStyle.border()[YGEdgeLeft] != YGValueUndefined) { props.yogaStyle.border()[YGEdgeStart] = border[YGEdgeLeft]; @@ -979,9 +979,9 @@ void YogaLayoutableShadowNode::ensureYogaChildrenLookFine() const { // This is the only heuristic that might produce false-positive results // (really broken dangled nodes might look fine). This is useful as an early // signal that something went wrong. - auto &yogaChildren = yogaNode_.getChildren(); + auto& yogaChildren = yogaNode_.getChildren(); - for (const auto &yogaChild : yogaChildren) { + for (const auto& yogaChild : yogaChildren) { react_native_assert(yogaChild->getContext()); react_native_assert(yogaChild->getChildren().size() < 16384); if (!yogaChild->getChildren().empty()) { @@ -998,8 +998,8 @@ void YogaLayoutableShadowNode::ensureYogaChildrenAlignment() const { // - All Yoga children are owned/connected to corresponding children of // this node. - auto &yogaChildren = yogaNode_.getChildren(); - auto &children = yogaLayoutableChildren_; + auto& yogaChildren = yogaNode_.getChildren(); + auto& children = yogaLayoutableChildren_; if (getTraits().check(ShadowNodeTraits::Trait::LeafYogaNode)) { react_native_assert(yogaChildren.empty()); @@ -1009,11 +1009,11 @@ void YogaLayoutableShadowNode::ensureYogaChildrenAlignment() const { react_native_assert(yogaChildren.size() == children.size()); for (size_t i = 0; i < children.size(); i++) { - auto &yogaChild = yogaChildren.at(i); - auto &child = children.at(i); + auto& yogaChild = yogaChildren.at(i); + auto& child = children.at(i); react_native_assert( yogaChild->getContext() == - traitCast(child.get())); + traitCast(child.get())); } #endif } diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h index 5caefc2d469..570bd2e8607 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.h @@ -35,13 +35,13 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { #pragma mark - Constructors YogaLayoutableShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits); YogaLayoutableShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment); + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment); #pragma mark - Mutating Methods @@ -51,10 +51,10 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { */ void enableMeasurement(); - void appendChild(const ShadowNode::Shared &child) override; + void appendChild(const ShadowNode::Shared& child) override; void replaceChild( - const ShadowNode &oldChild, - const ShadowNode::Shared &newChild, + const ShadowNode& oldChild, + const ShadowNode::Shared& newChild, int32_t suggestedIndex = -1) override; void updateYogaChildren(); @@ -117,14 +117,14 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { * Return true if child's yogaNode's owner is this->yogaNode_. Otherwise * returns false. */ - bool doesOwn(const YogaLayoutableShadowNode &child) const; + bool doesOwn(const YogaLayoutableShadowNode& child) const; /* * Appends a Yoga node to the Yoga node associated with this node. * The method does *not* do anything besides that (no cloning or `owner` field * adjustment). */ - void appendYogaChild(const YogaLayoutableShadowNode::Shared &childNode); + void appendYogaChild(const YogaLayoutableShadowNode::Shared& childNode); /* * Makes the child node with a given `index` (and Yoga node associated with) a @@ -151,10 +151,10 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { /** * Replcaes a child with a mutable clone of itself, returning the clone. */ - YogaLayoutableShadowNode &cloneChildInPlace(int32_t layoutableChildIndex); + YogaLayoutableShadowNode& cloneChildInPlace(int32_t layoutableChildIndex); - static yoga::Config &initializeYogaConfig( - yoga::Config &config, + static yoga::Config& initializeYogaConfig( + yoga::Config& config, YGConfigRef previousConfig = nullptr); static YGNodeRef yogaNodeCloneCallbackConnector( YGNodeRef oldYogaNode, @@ -166,7 +166,7 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { YGMeasureMode widthMode, float height, YGMeasureMode heightMode); - static YogaLayoutableShadowNode &shadowNodeFromContext(YGNodeRef yogaNode); + static YogaLayoutableShadowNode& shadowNodeFromContext(YGNodeRef yogaNode); #pragma mark - RTL Legacy Autoflip @@ -191,7 +191,7 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { * - border(Left|Right)Color → border(Start|End)Color */ static void swapLeftAndRightInViewProps( - const YogaLayoutableShadowNode &shadowNode); + const YogaLayoutableShadowNode& shadowNode); /* * In yoga node passed as argument, reassigns following values * - (left|right) → (start|end) @@ -199,15 +199,15 @@ class YogaLayoutableShadowNode : public LayoutableShadowNode { * - padding(Left|Right) → padding(Start|End) */ static void swapLeftAndRightInYogaStyleProps( - const YogaLayoutableShadowNode &shadowNode); + const YogaLayoutableShadowNode& shadowNode); /* * Combine a base yoga::Style with aliased properties which should be * flattened into it. E.g. reconciling "marginInlineStart" and "marginStart". */ static yoga::Style applyAliasedProps( - const yoga::Style &baseStyle, - const YogaStylableProps &props); + const yoga::Style& baseStyle, + const YogaStylableProps& props); #pragma mark - Consistency Ensuring Helpers diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp index f3ce28bc98f..e9f25432ba3 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp @@ -19,9 +19,9 @@ namespace facebook::react { YogaStylableProps::YogaStylableProps( - const PropsParserContext &context, - const YogaStylableProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const YogaStylableProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps) : Props(context, sourceProps, rawProps, shouldSetRawProps), yogaStyle( @@ -35,8 +35,8 @@ YogaStylableProps::YogaStylableProps( template static inline T const getFieldValue( - const PropsParserContext &context, - const RawValue &value, + const PropsParserContext& context, + const RawValue& value, T const defaultValue) { if (value.hasValue()) { T res; @@ -99,10 +99,10 @@ static inline T const getFieldValue( REBUILD_YG_FIELD_SWITCH_CASE_INDEXED(position, YGEdgeEnd, "end"); void YogaStylableProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { static const auto ygDefaults = yoga::Style{}; static const auto defaults = YogaStylableProps{}; @@ -237,9 +237,9 @@ SharedDebugStringConvertibleList YogaStylableProps::getDebugProps() const { #endif void YogaStylableProps::convertRawPropAliases( - const PropsParserContext &context, - const YogaStylableProps &sourceProps, - const RawProps &rawProps) { + const PropsParserContext& context, + const YogaStylableProps& sourceProps, + const RawProps& rawProps) { inset = convertRawProp( context, rawProps, diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.h index 4f2c50bdd19..71d3bd70768 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/YogaStylableProps.h @@ -21,19 +21,19 @@ class YogaStylableProps : public Props { public: YogaStylableProps() = default; YogaStylableProps( - const PropsParserContext &context, - const YogaStylableProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const YogaStylableProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps = true); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); #ifdef ANDROID - void propsDiffMapBuffer(const Props *oldProps, MapBufferBuilder &builder) + void propsDiffMapBuffer(const Props* oldProps, MapBufferBuilder& builder) const override; #endif @@ -80,9 +80,9 @@ class YogaStylableProps : public Props { private: void convertRawPropAliases( - const PropsParserContext &context, - const YogaStylableProps &sourceProps, - const RawProps &rawProps); + const PropsParserContext& context, + const YogaStylableProps& sourceProps, + const RawProps& rawProps); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h index 1690113e239..247ef0aa72e 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/accessibilityPropsConversions.h @@ -17,7 +17,7 @@ namespace facebook::react { -inline void fromString(const std::string &string, AccessibilityTraits &result) { +inline void fromString(const std::string& string, AccessibilityTraits& result) { if (string == "none") { result = AccessibilityTraits::None; return; @@ -106,9 +106,9 @@ inline void fromString(const std::string &string, AccessibilityTraits &result) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityTraits &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityTraits& result) { if (value.hasType()) { fromString((std::string)value, result); return; @@ -119,7 +119,7 @@ inline void fromRawValue( react_native_expect(value.hasType>()); if (value.hasType>()) { auto items = (std::vector)value; - for (auto &item : items) { + for (auto& item : items) { AccessibilityTraits itemAccessibilityTraits; fromString(item, itemAccessibilityTraits); result = result | itemAccessibilityTraits; @@ -130,9 +130,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityState &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityState& result) { auto map = (butter::map)value; auto selected = map.find("selected"); if (selected != map.end()) { @@ -171,7 +171,7 @@ inline void fromRawValue( } inline std::string toString( - const ImportantForAccessibility &importantForAccessibility) { + const ImportantForAccessibility& importantForAccessibility) { switch (importantForAccessibility) { case ImportantForAccessibility::Auto: return "auto"; @@ -185,9 +185,9 @@ inline std::string toString( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - ImportantForAccessibility &result) { + const PropsParserContext& context, + const RawValue& value, + ImportantForAccessibility& result) { result = ImportantForAccessibility::Auto; react_native_expect(value.hasType()); if (value.hasType()) { @@ -210,9 +210,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityAction &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityAction& result) { auto map = (butter::map)value; auto name = map.find("name"); @@ -230,9 +230,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &, - const RawValue &value, - AccessibilityValue &result) { + const PropsParserContext&, + const RawValue& value, + AccessibilityValue& result) { auto map = (butter::map)value; auto min = map.find("min"); @@ -265,9 +265,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityLabelledBy &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityLabelledBy& result) { if (value.hasType()) { result.value.push_back((std::string)value); } else if (value.hasType>()) { @@ -276,9 +276,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityLiveRegion &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityLiveRegion& result) { result = AccessibilityLiveRegion::None; react_native_expect(value.hasType()); if (value.hasType()) { @@ -298,7 +298,7 @@ inline void fromRawValue( } } -inline std::string toString(const AccessibilityRole &accessibilityRole) { +inline std::string toString(const AccessibilityRole& accessibilityRole) { switch (accessibilityRole) { case AccessibilityRole::None: return "none"; @@ -389,9 +389,9 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - AccessibilityRole &result) { + const PropsParserContext& context, + const RawValue& value, + AccessibilityRole& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; @@ -488,7 +488,7 @@ inline void fromRawValue( result = AccessibilityRole::None; } -inline std::string toString(const Role &role) { +inline std::string toString(const Role& role) { switch (role) { case Role::Alert: return "alert"; @@ -629,9 +629,9 @@ inline std::string toString(const Role &role) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - Role &result) { + const PropsParserContext& context, + const RawValue& value, + Role& result) { react_native_expect(value.hasType()); if (value.hasType()) { auto string = (std::string)value; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h index ea9d3b57664..95b57b9396a 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/conversions.h @@ -88,7 +88,7 @@ inline yoga::FloatOptional yogaOptionalFloatFromFloat(Float value) { * pixels). */ inline YGValue yogaStyleValueFromFloat( - const Float &value, + const Float& value, YGUnit unit = YGUnitPoint) { if (!std::isfinite(value)) { return YGValueUndefined; @@ -114,7 +114,7 @@ inline std::optional optionalFloatFromYogaValue( } } -inline LayoutMetrics layoutMetricsFromYogaNode(yoga::Node &yogaNode) { +inline LayoutMetrics layoutMetricsFromYogaNode(yoga::Node& yogaNode) { auto layoutMetrics = LayoutMetrics{}; layoutMetrics.frame = Rect{ @@ -165,9 +165,9 @@ inline YGDirection yogaDirectionFromLayoutDirection(LayoutDirection direction) { } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGDirection &result) { + const PropsParserContext& context, + const RawValue& value, + YGDirection& result) { result = YGDirectionInherit; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -191,9 +191,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGFlexDirection &result) { + const PropsParserContext& context, + const RawValue& value, + YGFlexDirection& result) { result = YGFlexDirectionColumn; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -221,9 +221,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGJustify &result) { + const PropsParserContext& context, + const RawValue& value, + YGJustify& result) { result = YGJustifyFlexStart; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -259,9 +259,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGAlign &result) { + const PropsParserContext& context, + const RawValue& value, + YGAlign& result) { result = YGAlignStretch; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -305,9 +305,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGPositionType &result) { + const PropsParserContext& context, + const RawValue& value, + YGPositionType& result) { result = YGPositionTypeRelative; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -331,9 +331,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGWrap &result) { + const PropsParserContext& context, + const RawValue& value, + YGWrap& result) { result = YGWrapNoWrap; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -357,9 +357,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGOverflow &result) { + const PropsParserContext& context, + const RawValue& value, + YGOverflow& result) { result = YGOverflowVisible; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -383,9 +383,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGDisplay &result) { + const PropsParserContext& context, + const RawValue& value, + YGDisplay& result) { result = YGDisplayFlex; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -405,9 +405,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - yoga::Style::ValueRepr &result) { + const PropsParserContext& context, + const RawValue& value, + yoga::Style::ValueRepr& result) { if (value.hasType()) { result = yogaStyleValueFromFloat((Float)value); return; @@ -438,24 +438,24 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - YGValue &result) { + const PropsParserContext& context, + const RawValue& value, + YGValue& result) { yoga::Style::ValueRepr ygValue{}; fromRawValue(context, value, ygValue); result = ygValue; } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - yoga::FloatOptional &result) { + const PropsParserContext& context, + const RawValue& value, + yoga::FloatOptional& result) { result = value.hasType() ? yoga::FloatOptional((float)value) : yoga::FloatOptional(); } inline Float toRadians( - const RawValue &value, + const RawValue& value, std::optional defaultValue) { if (value.hasType()) { return (Float)value; @@ -465,7 +465,7 @@ inline Float toRadians( return *defaultValue; } auto stringValue = (std::string)value; - char *suffixStart; + char* suffixStart; double num = strtod( stringValue.c_str(), &suffixStart); // can't use std::stod, probably // because of old Android NDKs @@ -476,9 +476,9 @@ inline Float toRadians( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - Transform &result) { + const PropsParserContext& context, + const RawValue& value, + Transform& result) { auto transformMatrix = Transform{}; react_native_expect(value.hasType>()); if (!value.hasType>()) { @@ -487,7 +487,7 @@ inline void fromRawValue( } auto configurations = static_cast>(value); - for (const auto &configuration : configurations) { + for (const auto& configuration : configurations) { if (!configuration.hasType>()) { // TODO: The following checks have to be removed after codegen is shipped. // See T45151459. @@ -498,7 +498,7 @@ inline void fromRawValue( static_cast>(configuration); auto pair = configurationPair.begin(); auto operation = pair->first; - auto ¶meters = pair->second; + auto& parameters = pair->second; if (operation == "matrix") { react_native_expect(parameters.hasType>()); @@ -558,9 +558,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext & /*context*/, - const RawValue &value, - TransformOrigin &result) { + const PropsParserContext& /*context*/, + const RawValue& value, + TransformOrigin& result) { react_native_expect(value.hasType>()); auto origins = (std::vector)value; @@ -569,7 +569,7 @@ inline void fromRawValue( const size_t maxIndex = 2; for (size_t i = 0; i < std::min(origins.size(), maxIndex); i++) { - const auto &origin = origins[i]; + const auto& origin = origins[i]; if (origin.hasType()) { auto originFloat = (float)origin; if (std::isfinite(originFloat)) { @@ -599,9 +599,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - PointerEventsMode &result) { + const PropsParserContext& context, + const RawValue& value, + PointerEventsMode& result) { result = PointerEventsMode::Auto; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -629,9 +629,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - BackfaceVisibility &result) { + const PropsParserContext& context, + const RawValue& value, + BackfaceVisibility& result) { result = BackfaceVisibility::Auto; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -655,9 +655,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - BorderCurve &result) { + const PropsParserContext& context, + const RawValue& value, + BorderCurve& result) { result = BorderCurve::Circular; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -677,9 +677,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - BorderStyle &result) { + const PropsParserContext& context, + const RawValue& value, + BorderStyle& result) { result = BorderStyle::Solid; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -703,9 +703,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext & /*context*/, - const RawValue &value, - LayoutConformance &result) { + const PropsParserContext& /*context*/, + const RawValue& value, + LayoutConformance& result) { result = LayoutConformance::Classic; react_native_expect(value.hasType()); if (!value.hasType()) { @@ -725,25 +725,25 @@ inline void fromRawValue( } inline std::string toString( - const std::array()> &dimensions) { + const std::array()>& dimensions) { return "{" + folly::to(dimensions[0]) + ", " + folly::to(dimensions[1]) + "}"; } -inline std::string toString(const std::array &position) { +inline std::string toString(const std::array& position) { return "{" + folly::to(position[0]) + ", " + folly::to(position[1]) + "}"; } inline std::string toString( - const std::array()> &edges) { + const std::array()>& edges) { return "{" + folly::to(edges[0]) + ", " + folly::to(edges[1]) + ", " + folly::to(edges[2]) + ", " + folly::to(edges[3]) + "}"; } -inline std::string toString(const YGDirection &value) { +inline std::string toString(const YGDirection& value) { switch (value) { case YGDirectionInherit: return "inherit"; @@ -754,7 +754,7 @@ inline std::string toString(const YGDirection &value) { } } -inline std::string toString(const YGFlexDirection &value) { +inline std::string toString(const YGFlexDirection& value) { switch (value) { case YGFlexDirectionColumn: return "column"; @@ -767,7 +767,7 @@ inline std::string toString(const YGFlexDirection &value) { } } -inline std::string toString(const YGJustify &value) { +inline std::string toString(const YGJustify& value) { switch (value) { case YGJustifyFlexStart: return "flex-start"; @@ -784,7 +784,7 @@ inline std::string toString(const YGJustify &value) { } } -inline std::string toString(const YGAlign &value) { +inline std::string toString(const YGAlign& value) { switch (value) { case YGAlignAuto: return "auto"; @@ -805,7 +805,7 @@ inline std::string toString(const YGAlign &value) { } } -inline std::string toString(const YGPositionType &value) { +inline std::string toString(const YGPositionType& value) { switch (value) { case YGPositionTypeStatic: return "static"; @@ -816,7 +816,7 @@ inline std::string toString(const YGPositionType &value) { } } -inline std::string toString(const YGWrap &value) { +inline std::string toString(const YGWrap& value) { switch (value) { case YGWrapNoWrap: return "no-wrap"; @@ -827,7 +827,7 @@ inline std::string toString(const YGWrap &value) { } } -inline std::string toString(const YGOverflow &value) { +inline std::string toString(const YGOverflow& value) { switch (value) { case YGOverflowVisible: return "visible"; @@ -838,7 +838,7 @@ inline std::string toString(const YGOverflow &value) { } } -inline std::string toString(const YGDisplay &value) { +inline std::string toString(const YGDisplay& value) { switch (value) { case YGDisplayFlex: return "flex"; @@ -847,7 +847,7 @@ inline std::string toString(const YGDisplay &value) { } } -inline std::string toString(const YGValue &value) { +inline std::string toString(const YGValue& value) { switch (value.unit) { case YGUnitUndefined: return "undefined"; @@ -860,7 +860,7 @@ inline std::string toString(const YGValue &value) { } } -inline std::string toString(const yoga::FloatOptional &value) { +inline std::string toString(const yoga::FloatOptional& value) { if (value.isUndefined()) { return "undefined"; } @@ -868,11 +868,11 @@ inline std::string toString(const yoga::FloatOptional &value) { return folly::to(floatFromYogaFloat(value.unwrap())); } -inline std::string toString(const yoga::Style::Dimensions &value) { +inline std::string toString(const yoga::Style::Dimensions& value) { return "{" + toString(value[0]) + ", " + toString(value[1]) + "}"; } -inline std::string toString(const yoga::Style::Edges &value) { +inline std::string toString(const yoga::Style::Edges& value) { static std::array()> names = { {"left", "top", @@ -902,7 +902,7 @@ inline std::string toString(const yoga::Style::Edges &value) { return "{" + result + "}"; } -inline std::string toString(const LayoutConformance &value) { +inline std::string toString(const LayoutConformance& value) { switch (value) { case LayoutConformance::Undefined: return "undefined"; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp index 490e4d1fe74..de17d8df66d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/AccessibilityPropsMapBuffer.cpp @@ -11,10 +11,10 @@ namespace facebook::react { static MapBuffer convertAccessibilityActions( - const std::vector &actions) { + const std::vector& actions) { MapBufferBuilder builder(actions.size()); for (auto i = 0; i < actions.size(); i++) { - const auto &action = actions[i]; + const auto& action = actions[i]; MapBufferBuilder actionsBuilder(2); actionsBuilder.putString(ACCESSIBILITY_ACTION_NAME, action.name); if (action.label.has_value()) { @@ -27,7 +27,7 @@ static MapBuffer convertAccessibilityActions( } static MapBuffer convertAccessibilityLabelledBy( - const AccessibilityLabelledBy &labelledBy) { + const AccessibilityLabelledBy& labelledBy) { MapBufferBuilder builder(labelledBy.value.size()); for (auto i = 0; i < labelledBy.value.size(); i++) { builder.putString(i, labelledBy.value[i]); @@ -42,7 +42,7 @@ constexpr MapBuffer::Key ACCESSIBILITY_STATE_EXPANDED = 2; constexpr MapBuffer::Key ACCESSIBILITY_STATE_SELECTED = 3; constexpr MapBuffer::Key ACCESSIBILITY_STATE_CHECKED = 4; -MapBuffer convertAccessibilityState(const AccessibilityState &state) { +MapBuffer convertAccessibilityState(const AccessibilityState& state) { MapBufferBuilder builder(5); builder.putBool(ACCESSIBILITY_STATE_BUSY, state.busy); builder.putBool(ACCESSIBILITY_STATE_DISABLED, state.disabled); @@ -69,18 +69,18 @@ MapBuffer convertAccessibilityState(const AccessibilityState &state) { // TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down void AccessibilityProps::propsDiffMapBuffer( - const Props *oldPropsPtr, - MapBufferBuilder &builder) const { + const Props* oldPropsPtr, + MapBufferBuilder& builder) const { // Call with default props if necessary if (oldPropsPtr == nullptr) { AccessibilityProps defaultProps{}; - propsDiffMapBuffer(reinterpret_cast(&defaultProps), builder); + propsDiffMapBuffer(reinterpret_cast(&defaultProps), builder); return; } - const AccessibilityProps &oldProps = - *(reinterpret_cast(oldPropsPtr)); - const AccessibilityProps &newProps = *this; + const AccessibilityProps& oldProps = + *(reinterpret_cast(oldPropsPtr)); + const AccessibilityProps& newProps = *this; if (oldProps.accessibilityActions != newProps.accessibilityActions) { builder.putMapBuffer( diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp index 4e52289332e..29bb229251d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.cpp @@ -18,9 +18,9 @@ namespace facebook::react { HostPlatformViewProps::HostPlatformViewProps( - const PropsParserContext &context, - const HostPlatformViewProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const HostPlatformViewProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps) : BaseViewProps(context, sourceProps, rawProps, shouldSetRawProps), elevation( @@ -98,10 +98,10 @@ HostPlatformViewProps::HostPlatformViewProps( } void HostPlatformViewProps::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value) { + const char* propName, + const RawValue& value) { // All Props structs setProp methods must always, unconditionally, // call all super::setProp methods, since multiple structs may // reuse the same values. diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h index 4d25255fe32..c24b0229da9 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewProps.h @@ -24,18 +24,18 @@ class HostPlatformViewProps : public BaseViewProps { public: HostPlatformViewProps() = default; HostPlatformViewProps( - const PropsParserContext &context, - const HostPlatformViewProps &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const HostPlatformViewProps& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps = true); void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); - void propsDiffMapBuffer(const Props *oldProps, MapBufferBuilder &builder) + void propsDiffMapBuffer(const Props* oldProps, MapBufferBuilder& builder) const override; #pragma mark - Props diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h index e64c12c7ce4..bfbd72c3057 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/HostPlatformViewTraitsInitializer.h @@ -12,11 +12,11 @@ namespace facebook::react::HostPlatformViewTraitsInitializer { -inline bool formsStackingContext(const ViewProps &viewProps) { +inline bool formsStackingContext(const ViewProps& viewProps) { return viewProps.elevation != 0; } -inline bool formsView(const ViewProps &viewProps) { +inline bool formsView(const ViewProps& viewProps) { return viewProps.nativeBackground.has_value() || viewProps.nativeForeground.has_value() || viewProps.focusable || viewProps.hasTVPreferredFocus || diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h index a8a8ae0482a..912dace552b 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/NativeDrawable.h @@ -24,7 +24,7 @@ struct NativeDrawable { std::optional rippleRadius{}; bool borderless{false}; - bool operator==(const Ripple &rhs) const { + bool operator==(const Ripple& rhs) const { return std::tie(this->color, this->borderless, this->rippleRadius) == std::tie(rhs.color, rhs.borderless, rhs.rippleRadius); } @@ -34,7 +34,7 @@ struct NativeDrawable { Ripple ripple; Kind kind; - bool operator==(const NativeDrawable &rhs) const { + bool operator==(const NativeDrawable& rhs) const { if (this->kind != rhs.kind) { return false; } @@ -47,7 +47,7 @@ struct NativeDrawable { } } - bool operator!=(const NativeDrawable &rhs) const { + bool operator!=(const NativeDrawable& rhs) const { return !(*this == rhs); } @@ -55,9 +55,9 @@ struct NativeDrawable { }; static inline void fromRawValue( - const PropsParserContext & /*context*/, - const RawValue &rawValue, - NativeDrawable &result) { + const PropsParserContext& /*context*/, + const RawValue& rawValue, + NativeDrawable& result) { auto map = (butter::map)rawValue; auto typeIterator = map.find("type"); diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/ViewPropsMapBuffer.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/ViewPropsMapBuffer.cpp index 57cfb5c01c4..1fd158c2035 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/ViewPropsMapBuffer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/ViewPropsMapBuffer.cpp @@ -16,8 +16,8 @@ namespace facebook::react { // TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down void ViewProps::propsDiffMapBuffer( - const Props *oldPropsPtr, - MapBufferBuilder &builder) const { + const Props* oldPropsPtr, + MapBufferBuilder& builder) const { // Call with default props if necessary if (oldPropsPtr == nullptr) { ViewProps defaultProps{}; @@ -29,8 +29,8 @@ void ViewProps::propsDiffMapBuffer( YogaStylableProps::propsDiffMapBuffer(oldPropsPtr, builder); AccessibilityProps::propsDiffMapBuffer(oldPropsPtr, builder); - const ViewProps &oldProps = *(static_cast(oldPropsPtr)); - const ViewProps &newProps = *this; + const ViewProps& oldProps = *(static_cast(oldPropsPtr)); + const ViewProps& newProps = *this; if (oldProps.backfaceVisibility != newProps.backfaceVisibility) { int value; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp index 4bb73d7986e..87c0a81d845 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/android/react/renderer/components/view/YogaStylablePropsMapBuffer.cpp @@ -13,7 +13,7 @@ namespace facebook::react { -MapBuffer convertBorderWidths(const yoga::Style::Edges &border) { +MapBuffer convertBorderWidths(const yoga::Style::Edges& border) { MapBufferBuilder builder(7); putOptionalFloat( builder, EDGE_TOP, optionalFloatFromYogaValue(border[YGEdgeTop])); @@ -34,8 +34,8 @@ MapBuffer convertBorderWidths(const yoga::Style::Edges &border) { // TODO: Currently unsupported: nextFocusForward/Left/Up/Right/Down void YogaStylableProps::propsDiffMapBuffer( - const Props *oldPropsPtr, - MapBufferBuilder &builder) const { + const Props* oldPropsPtr, + MapBufferBuilder& builder) const { // Call with default props if necessary if (oldPropsPtr == nullptr) { YogaStylableProps defaultProps{}; @@ -46,13 +46,13 @@ void YogaStylableProps::propsDiffMapBuffer( // Delegate to base classes Props::propsDiffMapBuffer(oldPropsPtr, builder); - const YogaStylableProps &oldProps = - *(static_cast(oldPropsPtr)); - const YogaStylableProps &newProps = *this; + const YogaStylableProps& oldProps = + *(static_cast(oldPropsPtr)); + const YogaStylableProps& newProps = *this; if (oldProps.yogaStyle != newProps.yogaStyle) { - const auto &oldStyle = oldProps.yogaStyle; - const auto &newStyle = newProps.yogaStyle; + const auto& oldStyle = oldProps.yogaStyle; + const auto& newStyle = newProps.yogaStyle; if (!(oldStyle.border() == newStyle.border())) { builder.putMapBuffer( diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h b/packages/react-native/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h index 6fac9bd5b69..c9d8c782ad1 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/platform/cxx/react/renderer/components/view/HostPlatformViewTraitsInitializer.h @@ -12,11 +12,11 @@ namespace facebook::react::HostPlatformViewTraitsInitializer { -inline bool formsStackingContext(const ViewProps &props) { +inline bool formsStackingContext(const ViewProps& props) { return false; } -inline bool formsView(const ViewProps &props) { +inline bool formsView(const ViewProps& props) { return false; } diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/primitives.h b/packages/react-native/ReactCommon/react/renderer/components/view/primitives.h index 3e0dd3eff60..162f2292cc6 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/primitives.h @@ -77,11 +77,11 @@ struct ViewEvents { } }; -inline static bool operator==(const ViewEvents &lhs, const ViewEvents &rhs) { +inline static bool operator==(const ViewEvents& lhs, const ViewEvents& rhs) { return lhs.bits == rhs.bits; } -inline static bool operator!=(const ViewEvents &lhs, const ViewEvents &rhs) { +inline static bool operator!=(const ViewEvents& lhs, const ViewEvents& rhs) { return lhs.bits != rhs.bits; } @@ -133,7 +133,7 @@ struct CascadedRectangleEdges { }; } - bool operator==(const CascadedRectangleEdges &rhs) const { + bool operator==(const CascadedRectangleEdges& rhs) const { return std::tie( this->left, this->top, @@ -162,7 +162,7 @@ struct CascadedRectangleEdges { rhs.blockEnd); } - bool operator!=(const CascadedRectangleEdges &rhs) const { + bool operator!=(const CascadedRectangleEdges& rhs) const { return !(*this == rhs); } }; @@ -209,7 +209,7 @@ struct CascadedRectangleCorners { }; } - bool operator==(const CascadedRectangleCorners &rhs) const { + bool operator==(const CascadedRectangleCorners& rhs) const { return std::tie( this->topLeft, this->topRight, @@ -240,7 +240,7 @@ struct CascadedRectangleCorners { rhs.startStart); } - bool operator!=(const CascadedRectangleCorners &rhs) const { + bool operator!=(const CascadedRectangleCorners& rhs) const { return !(*this == rhs); } }; @@ -264,7 +264,7 @@ struct BorderMetrics { BorderCurves borderCurves{}; BorderStyles borderStyles{}; - bool operator==(const BorderMetrics &rhs) const { + bool operator==(const BorderMetrics& rhs) const { return std::tie( this->borderColors, this->borderWidths, @@ -279,7 +279,7 @@ struct BorderMetrics { rhs.borderStyles); } - bool operator!=(const BorderMetrics &rhs) const { + bool operator!=(const BorderMetrics& rhs) const { return !(*this == rhs); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/propsConversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/propsConversions.h index 0fb5bb78a0c..6926f9bd000 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/propsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/propsConversions.h @@ -18,12 +18,12 @@ namespace facebook::react { // Nearly this entire file can be deleted when iterator-style Prop parsing // ships fully for View static inline yoga::Style::Dimensions convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const char *widthName, - const char *heightName, - const yoga::Style::Dimensions &sourceValue, - const yoga::Style::Dimensions &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const char* widthName, + const char* heightName, + const yoga::Style::Dimensions& sourceValue, + const yoga::Style::Dimensions& defaultValue) { auto dimensions = defaultValue; dimensions[YGDimensionWidth] = convertRawProp( context, @@ -41,12 +41,12 @@ static inline yoga::Style::Dimensions convertRawProp( } static inline yoga::Style::Edges convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const char *prefix, - const char *suffix, - const yoga::Style::Edges &sourceValue, - const yoga::Style::Edges &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const char* prefix, + const char* suffix, + const yoga::Style::Edges& sourceValue, + const yoga::Style::Edges& defaultValue) { auto result = defaultValue; result[YGEdgeLeft] = convertRawProp( context, @@ -124,10 +124,10 @@ static inline yoga::Style::Edges convertRawProp( } static inline yoga::Style::Edges convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const yoga::Style::Edges &sourceValue, - const yoga::Style::Edges &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const yoga::Style::Edges& sourceValue, + const yoga::Style::Edges& defaultValue) { auto result = defaultValue; result[YGEdgeLeft] = convertRawProp( context, @@ -169,9 +169,9 @@ static inline yoga::Style::Edges convertRawProp( } static inline yoga::Style convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const yoga::Style &sourceValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const yoga::Style& sourceValue) { yoga::Style yogaStyle{}; yogaStyle.direction() = convertRawProp( context, @@ -327,12 +327,12 @@ static inline yoga::Style convertRawProp( // This can be deleted when non-iterator ViewProp parsing is deleted template static inline CascadedRectangleCorners convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const char *prefix, - const char *suffix, - const CascadedRectangleCorners &sourceValue, - const CascadedRectangleCorners &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const char* prefix, + const char* suffix, + const CascadedRectangleCorners& sourceValue, + const CascadedRectangleCorners& defaultValue) { CascadedRectangleCorners result; result.topLeft = convertRawProp( @@ -441,12 +441,12 @@ static inline CascadedRectangleCorners convertRawProp( template static inline CascadedRectangleEdges convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const char *prefix, - const char *suffix, - const CascadedRectangleEdges &sourceValue, - const CascadedRectangleEdges &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const char* prefix, + const char* suffix, + const CascadedRectangleEdges& sourceValue, + const CascadedRectangleEdges& defaultValue) { CascadedRectangleEdges result; result.left = convertRawProp( @@ -547,10 +547,10 @@ static inline CascadedRectangleEdges convertRawProp( // This can be deleted when non-iterator ViewProp parsing is deleted static inline ViewEvents convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const ViewEvents &sourceValue, - const ViewEvents &defaultValue) { + const PropsParserContext& context, + const RawProps& rawProps, + const ViewEvents& sourceValue, + const ViewEvents& defaultValue) { ViewEvents result{}; using Offset = ViewEvents::Offset; diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp index 6865a149b97..9209a1d3ce8 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/components/view/tests/ViewTest.cpp @@ -93,15 +93,15 @@ TEST_F(YogaDirtyFlagTest, cloningPropsWithoutChangingThem) { * Cloning props without changing them must *not* dirty a Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [&](const ShadowNode &oldShadowNode) { - auto &componentDescriptor = oldShadowNode.getComponentDescriptor(); + innerShadowNode_->getFamily(), [&](const ShadowNode& oldShadowNode) { + auto& componentDescriptor = oldShadowNode.getComponentDescriptor(); auto props = componentDescriptor.cloneProps( parserContext, oldShadowNode.getProps(), RawProps()); return oldShadowNode.clone(ShadowNodeFragment{props}); }); EXPECT_FALSE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, changingNonLayoutSubPropsMustNotDirtyYogaNode) { @@ -109,9 +109,9 @@ TEST_F(YogaDirtyFlagTest, changingNonLayoutSubPropsMustNotDirtyYogaNode) { * Changing *non-layout* sub-props must *not* dirty a Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + innerShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { auto viewProps = std::make_shared(); - auto &props = *viewProps; + auto& props = *viewProps; props.nativeId = "some new native Id"; props.backgroundColor = blackColor(); @@ -124,7 +124,7 @@ TEST_F(YogaDirtyFlagTest, changingNonLayoutSubPropsMustNotDirtyYogaNode) { }); EXPECT_FALSE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, changingLayoutSubPropsMustDirtyYogaNode) { @@ -132,9 +132,9 @@ TEST_F(YogaDirtyFlagTest, changingLayoutSubPropsMustDirtyYogaNode) { * Changing *layout* sub-props *must* dirty a Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + innerShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { auto viewProps = std::make_shared(); - auto &props = *viewProps; + auto& props = *viewProps; props.yogaStyle.alignContent() = YGAlignBaseline; props.yogaStyle.display() = YGDisplayNone; @@ -143,7 +143,7 @@ TEST_F(YogaDirtyFlagTest, changingLayoutSubPropsMustDirtyYogaNode) { }); EXPECT_TRUE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, removingAllChildrenMustDirtyYogaNode) { @@ -151,14 +151,14 @@ TEST_F(YogaDirtyFlagTest, removingAllChildrenMustDirtyYogaNode) { * Removing all children *must* dirty a Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + innerShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { return oldShadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), ShadowNode::emptySharedShadowNodeSharedList()}); }); EXPECT_TRUE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, removingLastChildMustDirtyYogaNode) { @@ -166,7 +166,7 @@ TEST_F(YogaDirtyFlagTest, removingLastChildMustDirtyYogaNode) { * Removing the last child *must* dirty the Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + innerShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { auto children = oldShadowNode.getChildren(); children.pop_back(); @@ -178,7 +178,7 @@ TEST_F(YogaDirtyFlagTest, removingLastChildMustDirtyYogaNode) { }); EXPECT_TRUE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, reversingListOfChildrenMustDirtyYogaNode) { @@ -186,7 +186,7 @@ TEST_F(YogaDirtyFlagTest, reversingListOfChildrenMustDirtyYogaNode) { * Reversing a list of children *must* dirty a Yoga node. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - innerShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + innerShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { auto children = oldShadowNode.getChildren(); std::reverse(children.begin(), children.end()); @@ -197,7 +197,7 @@ TEST_F(YogaDirtyFlagTest, reversingListOfChildrenMustDirtyYogaNode) { }); EXPECT_TRUE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } TEST_F(YogaDirtyFlagTest, updatingStateForScrollViewMistNotDirtyYogaNode) { @@ -206,11 +206,11 @@ TEST_F(YogaDirtyFlagTest, updatingStateForScrollViewMistNotDirtyYogaNode) { * nodes. */ auto newRootShadowNode = rootShadowNode_->cloneTree( - scrollViewShadowNode_->getFamily(), [](const ShadowNode &oldShadowNode) { + scrollViewShadowNode_->getFamily(), [](const ShadowNode& oldShadowNode) { auto state = ScrollViewState{}; state.contentOffset = Point{42, 9000}; - auto &componentDescriptor = oldShadowNode.getComponentDescriptor(); + auto& componentDescriptor = oldShadowNode.getComponentDescriptor(); auto newState = componentDescriptor.createState( oldShadowNode.getFamily(), std::make_shared(state)); @@ -222,7 +222,7 @@ TEST_F(YogaDirtyFlagTest, updatingStateForScrollViewMistNotDirtyYogaNode) { }); EXPECT_FALSE( - static_cast(*newRootShadowNode).layoutIfNeeded()); + static_cast(*newRootShadowNode).layoutIfNeeded()); } } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/components/view/viewPropConversions.h b/packages/react-native/ReactCommon/react/renderer/components/view/viewPropConversions.h index da5ff26b189..0d99ea87f9d 100644 --- a/packages/react-native/ReactCommon/react/renderer/components/view/viewPropConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/components/view/viewPropConversions.h @@ -46,14 +46,14 @@ constexpr MapBuffer::Key CORNER_START_END = 11; constexpr MapBuffer::Key CORNER_START_START = 12; inline void putOptionalFloat( - MapBufferBuilder &builder, + MapBufferBuilder& builder, MapBuffer::Key key, - const std::optional &value) { + const std::optional& value) { builder.putDouble(key, value.value_or(NAN)); } inline std::optional optionalFromValue( - const std::optional &value) { + const std::optional& value) { if (!value) { return {}; } @@ -62,12 +62,12 @@ inline std::optional optionalFromValue( } inline std::optional optionalFromValue( - const std::optional &value) { + const std::optional& value) { return value; } inline std::optional optionalFromValue( - const std::optional &value) { + const std::optional& value) { if (!value) { return {}; } @@ -89,13 +89,13 @@ inline std::optional optionalFromValue( } inline void putOptionalColor( - MapBufferBuilder &builder, + MapBufferBuilder& builder, MapBuffer::Key key, - const std::optional &color) { + const std::optional& color) { builder.putInt(key, color.has_value() ? toAndroidRepr(color.value()) : -1); } -inline MapBuffer convertBorderColors(const CascadedBorderColors &colors) { +inline MapBuffer convertBorderColors(const CascadedBorderColors& colors) { MapBufferBuilder builder(7); putOptionalColor(builder, EDGE_TOP, colors.top); putOptionalColor(builder, EDGE_RIGHT, colors.right); @@ -108,7 +108,7 @@ inline MapBuffer convertBorderColors(const CascadedBorderColors &colors) { } template -MapBuffer convertCascadedEdges(const CascadedRectangleEdges &edges) { +MapBuffer convertCascadedEdges(const CascadedRectangleEdges& edges) { MapBufferBuilder builder(10); putOptionalFloat(builder, EDGE_TOP, optionalFromValue(edges.top)); putOptionalFloat(builder, EDGE_RIGHT, optionalFromValue(edges.right)); @@ -125,7 +125,7 @@ MapBuffer convertCascadedEdges(const CascadedRectangleEdges &edges) { } template -MapBuffer convertCascadedCorners(const CascadedRectangleCorners &corners) { +MapBuffer convertCascadedCorners(const CascadedRectangleCorners& corners) { MapBufferBuilder builder(13); putOptionalFloat( builder, CORNER_TOP_LEFT, optionalFromValue(corners.topLeft)); @@ -153,7 +153,7 @@ MapBuffer convertCascadedCorners(const CascadedRectangleCorners &corners) { return builder.build(); } -inline MapBuffer convertEdgeInsets(const EdgeInsets &insets) { +inline MapBuffer convertEdgeInsets(const EdgeInsets& insets) { MapBufferBuilder builder(4); builder.putDouble(EDGE_TOP, insets.top); builder.putDouble(EDGE_RIGHT, insets.right); @@ -171,12 +171,12 @@ constexpr MapBuffer::Key NATIVE_DRAWABLE_BORDERLESS = 3; constexpr MapBuffer::Key NATIVE_DRAWABLE_RIPPLE_RADIUS = 4; inline MapBuffer convertNativeBackground( - const std::optional &value) { + const std::optional& value) { if (!value.has_value()) { return MapBufferBuilder::EMPTY(); } - const auto &drawable = value.value(); + const auto& drawable = value.value(); MapBufferBuilder builder(4); switch (drawable.kind) { case NativeDrawable::Kind::ThemeAttr: @@ -202,7 +202,7 @@ inline MapBuffer convertNativeBackground( #endif -inline MapBuffer convertTransform(const Transform &transform) { +inline MapBuffer convertTransform(const Transform& transform) { MapBufferBuilder builder(16); for (int32_t i = 0; i < transform.matrix.size(); i++) { builder.putDouble(i, transform.matrix[i]); diff --git a/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.cpp b/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.cpp index 53c89f0b3cd..77be47989a1 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.cpp @@ -10,12 +10,12 @@ namespace facebook::react { ComponentDescriptor::ComponentDescriptor( - const ComponentDescriptorParameters ¶meters) + const ComponentDescriptorParameters& parameters) : eventDispatcher_(parameters.eventDispatcher), contextContainer_(parameters.contextContainer), flavor_(parameters.flavor) {} -const ContextContainer::Shared &ComponentDescriptor::getContextContainer() +const ContextContainer::Shared& ComponentDescriptor::getContextContainer() const { return contextContainer_; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.h index 425abd9605a..25f07993824 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ComponentDescriptor.h @@ -48,14 +48,14 @@ class ComponentDescriptor { */ using Flavor = std::shared_ptr; - ComponentDescriptor(const ComponentDescriptorParameters ¶meters); + ComponentDescriptor(const ComponentDescriptorParameters& parameters); virtual ~ComponentDescriptor() = default; /* * Returns stored instance of `ContextContainer`. */ - const ContextContainer::Shared &getContextContainer() const; + const ContextContainer::Shared& getContextContainer() const; /* * Returns `componentHandle` associated with particular kind of components. @@ -79,22 +79,22 @@ class ComponentDescriptor { * Creates a new `ShadowNode` of a particular component type. */ virtual ShadowNode::Shared createShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family) const = 0; + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family) const = 0; /* * Clones a `ShadowNode` with optionally new `props` and/or `children`. */ virtual ShadowNode::Unshared cloneShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) const = 0; + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) const = 0; /* * Appends (by mutating) a given `childShadowNode` to `parentShadowNode`. */ virtual void appendChild( - const ShadowNode::Shared &parentShadowNode, - const ShadowNode::Shared &childShadowNode) const = 0; + const ShadowNode::Shared& parentShadowNode, + const ShadowNode::Shared& childShadowNode) const = 0; /* * Creates a new `Props` of a particular type with all values copied from @@ -104,37 +104,37 @@ class ComponentDescriptor { * Must return an object which is NOT pointer equal to `props`. */ virtual Props::Shared cloneProps( - const PropsParserContext &context, - const Props::Shared &props, - const RawProps &rawProps) const = 0; + const PropsParserContext& context, + const Props::Shared& props, + const RawProps& rawProps) const = 0; /* * Create an initial State object that represents (and contains) an initial * State's data which can be constructed based on initial Props. */ virtual State::Shared createInitialState( - const Props::Shared &props, - const ShadowNodeFamily::Shared &family) const = 0; + const Props::Shared& props, + const ShadowNodeFamily::Shared& family) const = 0; /* * Creates a new State object that represents (and contains) a new version of * State's data. */ virtual State::Shared createState( - const ShadowNodeFamily &family, - const StateData::Shared &data) const = 0; + const ShadowNodeFamily& family, + const StateData::Shared& data) const = 0; /* * Creates a shadow node family for particular node. */ virtual ShadowNodeFamily::Shared createFamily( - const ShadowNodeFamilyFragment &fragment) const = 0; + const ShadowNodeFamilyFragment& fragment) const = 0; /* * Creates an event emitter for particular node. */ virtual SharedEventEmitter createEventEmitter( - const InstanceHandle::Shared &instanceHandle) const = 0; + const InstanceHandle::Shared& instanceHandle) const = 0; protected: EventDispatcher::Weak eventDispatcher_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h index a607b582b0a..0af595779a8 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteComponentDescriptor.h @@ -46,7 +46,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { using ConcreteState = typename ShadowNodeT::ConcreteState; using ConcreteStateData = typename ShadowNodeT::ConcreteState::Data; - ConcreteComponentDescriptor(const ComponentDescriptorParameters ¶meters) + ConcreteComponentDescriptor(const ComponentDescriptorParameters& parameters) : ComponentDescriptor(parameters) { rawPropsParser_.prepare(); } @@ -64,8 +64,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } ShadowNode::Shared createShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family) const override { + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family) const override { auto shadowNode = std::make_shared(fragment, family, getTraits()); @@ -75,8 +75,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } ShadowNode::Unshared cloneShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) const override { + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) const override { auto shadowNode = std::make_shared(sourceShadowNode, fragment); adopt(shadowNode); @@ -84,18 +84,18 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } void appendChild( - const ShadowNode::Shared &parentShadowNode, - const ShadowNode::Shared &childShadowNode) const override { - auto &concreteParentShadowNode = - static_cast(*parentShadowNode); - const_cast(concreteParentShadowNode) + const ShadowNode::Shared& parentShadowNode, + const ShadowNode::Shared& childShadowNode) const override { + auto& concreteParentShadowNode = + static_cast(*parentShadowNode); + const_cast(concreteParentShadowNode) .appendChild(childShadowNode); } virtual Props::Shared cloneProps( - const PropsParserContext &context, - const Props::Shared &props, - const RawProps &rawProps) const override { + const PropsParserContext& context, + const Props::Shared& props, + const RawProps& rawProps) const override { // Optimization: // Quite often nodes are constructed with default/empty props: the base // `props` object is `null` (there no base because it's not cloning) and the @@ -115,8 +115,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { // the type of ShadowNode; it acts as the single global flag. if (CoreFeatures::enablePropIteratorSetter) { rawProps.iterateOverValues([&](RawPropsPropNameHash hash, - const char *propName, - const RawValue &fn) { + const char* propName, + const RawValue& fn) { shadowNodeProps.get()->setProp(context, hash, propName, fn); }); } @@ -125,8 +125,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { }; virtual State::Shared createInitialState( - const Props::Shared &props, - const ShadowNodeFamily::Shared &family) const override { + const Props::Shared& props, + const ShadowNodeFamily::Shared& family) const override { if (std::is_same::value) { // Default case: Returning `null` for nodes that don't use `State`. return nullptr; @@ -139,8 +139,8 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } virtual State::Shared createState( - const ShadowNodeFamily &family, - const StateData::Shared &data) const override { + const ShadowNodeFamily& family, + const StateData::Shared& data) const override { if (std::is_same::value) { // Default case: Returning `null` for nodes that don't use `State`. return nullptr; @@ -154,7 +154,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } ShadowNodeFamily::Shared createFamily( - const ShadowNodeFamilyFragment &fragment) const override { + const ShadowNodeFamilyFragment& fragment) const override { return std::make_shared( ShadowNodeFamilyFragment{ fragment.tag, fragment.surfaceId, fragment.instanceHandle}, @@ -163,7 +163,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { } SharedEventEmitter createEventEmitter( - const InstanceHandle::Shared &instanceHandle) const override { + const InstanceHandle::Shared& instanceHandle) const override { return std::make_shared( std::make_shared(instanceHandle), eventDispatcher_); } @@ -181,7 +181,7 @@ class ConcreteComponentDescriptor : public ComponentDescriptor { * - Set `ShadowNode`'s size from state in * `ModalHostViewComponentDescriptor`. */ - virtual void adopt(const ShadowNode::Unshared &shadowNode) const { + virtual void adopt(const ShadowNode::Unshared& shadowNode) const { // Default implementation does nothing. react_native_assert( shadowNode->getComponentHandle() == getComponentHandle()); diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h index b160e8bb72f..e91c757d8d7 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteShadowNode.h @@ -71,12 +71,12 @@ class ConcreteShadowNode : public BaseShadowNodeT { } static UnsharedConcreteProps Props( - const PropsParserContext &context, - const RawProps &rawProps, - const Props::Shared &baseProps = nullptr) { + const PropsParserContext& context, + const RawProps& rawProps, + const Props::Shared& baseProps = nullptr) { return std::make_shared( context, - baseProps ? static_cast(*baseProps) : PropsT(), + baseProps ? static_cast(*baseProps) : PropsT(), rawProps); } @@ -87,9 +87,9 @@ class ConcreteShadowNode : public BaseShadowNodeT { } static ConcreteStateData initialStateData( - const Props::Shared & /*props*/, - const ShadowNodeFamily::Shared & /*family*/, - const ComponentDescriptor & /*componentDescriptor*/) { + const Props::Shared& /*props*/, + const ShadowNodeFamily::Shared& /*family*/, + const ComponentDescriptor& /*componentDescriptor*/) { return {}; } @@ -97,18 +97,18 @@ class ConcreteShadowNode : public BaseShadowNodeT { * Returns a concrete props object associated with the node. * Thread-safe after the node is sealed. */ - const ConcreteProps &getConcreteProps() const { + const ConcreteProps& getConcreteProps() const { react_native_assert( BaseShadowNodeT::props_ && "Props must not be `nullptr`."); - return static_cast(*props_); + return static_cast(*props_); } /* * Returns a concrete event emitter object associated with the node. * Thread-safe after the node is sealed. */ - const ConcreteEventEmitter &getConcreteEventEmitter() const { - return static_cast( + const ConcreteEventEmitter& getConcreteEventEmitter() const { + return static_cast( *BaseShadowNodeT::getEventEmitter()); } @@ -116,16 +116,16 @@ class ConcreteShadowNode : public BaseShadowNodeT { * Returns a concrete state data associated with the node. * Thread-safe after the node is sealed. */ - const ConcreteStateData &getStateData() const { + const ConcreteStateData& getStateData() const { react_native_assert(state_ && "State must not be `nullptr`."); - return static_cast(state_.get())->getData(); + return static_cast(state_.get())->getData(); } /* * Creates and assigns a new state object containing given state data. * Can be called only before the node is sealed (usually during construction). */ - void setStateData(ConcreteStateData &&data) { + void setStateData(ConcreteStateData&& data) { Sealable::ensureUnsealed(); state_ = std::make_shared( std::make_shared(std::move(data)), *state_); diff --git a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h index 54c6fe0f5b6..441c6efb911 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ConcreteState.h @@ -32,7 +32,7 @@ class ConcreteState : public State { /* * Creates an updated `State` object with given previous one and `data`. */ - explicit ConcreteState(const SharedData &data, const State &state) + explicit ConcreteState(const SharedData& data, const State& state) : State(data, state) {} /* @@ -40,8 +40,8 @@ class ConcreteState : public State { * `data`. */ explicit ConcreteState( - const SharedData &data, - const ShadowNodeFamily::Shared &family) + const SharedData& data, + const ShadowNodeFamily::Shared& family) : State(data, family) {} ~ConcreteState() override = default; @@ -49,8 +49,8 @@ class ConcreteState : public State { /* * Returns stored data. */ - const Data &getData() const { - return *static_cast(data_.get()); + const Data& getData() const { + return *static_cast(data_.get()); } /* @@ -59,15 +59,15 @@ class ConcreteState : public State { * function for cases where a new value of data does not depend on an old * value. */ - void updateState(Data &&newData, EventPriority priority) const { + void updateState(Data&& newData, EventPriority priority) const { updateState( - [data{std::move(newData)}](const Data &oldData) -> SharedData { + [data{std::move(newData)}](const Data& oldData) -> SharedData { return std::make_shared(data); }, priority); } - void updateState(Data &&newData) const { + void updateState(Data&& newData) const { updateState( std::move(newData), CoreFeatures::enableDefaultAsyncBatchedPriority @@ -84,7 +84,7 @@ class ConcreteState : public State { * return `nullptr`. */ void updateState( - std::function callback, + std::function callback, EventPriority priority = EventPriority::AsynchronousBatched) const { auto family = family_.lock(); @@ -95,9 +95,9 @@ class ConcreteState : public State { } auto stateUpdate = StateUpdate{ - family, [=](const StateData::Shared &oldData) -> StateData::Shared { + family, [=](const StateData::Shared& oldData) -> StateData::Shared { react_native_assert(oldData); - return callback(*static_cast(oldData.get())); + return callback(*static_cast(oldData.get())); }}; family->dispatchRawState(std::move(stateUpdate), priority); @@ -108,7 +108,7 @@ class ConcreteState : public State { return getData().getDynamic(); } - void updateState(folly::dynamic &&data) const override { + void updateState(folly::dynamic&& data) const override { updateState(Data(getData(), std::move(data))); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp b/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp index f528c816362..e90aa160fd1 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.cpp @@ -10,8 +10,8 @@ namespace facebook::react { folly::dynamic mergeDynamicProps( - const folly::dynamic &source, - const folly::dynamic &patch) { + const folly::dynamic& source, + const folly::dynamic& patch) { auto result = source; if (!result.isObject()) { @@ -24,7 +24,7 @@ folly::dynamic mergeDynamicProps( // Note, here we have to preserve sub-prop objects with `null` value as // an indication for the legacy mounting layer that it needs to clean them up. - for (const auto &pair : patch.items()) { + for (const auto& pair : patch.items()) { result[pair.first] = pair.second; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h b/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h index e3b40675620..f5abb9d21e3 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h +++ b/packages/react-native/ReactCommon/react/renderer/core/DynamicPropsUtilities.h @@ -18,7 +18,7 @@ namespace facebook::react { * `patch`, overriding existing keys. */ folly::dynamic mergeDynamicProps( - const folly::dynamic &source, - const folly::dynamic &patch); + const folly::dynamic& source, + const folly::dynamic& patch); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp index f55120661b4..39b1927c9bf 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.cpp @@ -18,7 +18,7 @@ void EventBeat::request() const { isRequested_ = true; } -void EventBeat::beat(jsi::Runtime &runtime) const { +void EventBeat::beat(jsi::Runtime& runtime) const { if (!this->isRequested_) { return; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.h b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.h index 1a9b8b31c04..7f2b143dd0b 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventBeat.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventBeat.h @@ -42,9 +42,9 @@ class EventBeat { using SharedOwnerBox = std::shared_ptr; using Factory = - std::function(const SharedOwnerBox &ownerBox)>; + std::function(const SharedOwnerBox& ownerBox)>; - using BeatCallback = std::function; + using BeatCallback = std::function; EventBeat(SharedOwnerBox ownerBox); @@ -79,7 +79,7 @@ class EventBeat { * Should be used by subclasses to send a beat. * Receiver might ignore the call if a beat was not requested. */ - void beat(jsi::Runtime &runtime) const; + void beat(jsi::Runtime& runtime) const; BeatCallback beatCallback_; SharedOwnerBox ownerBox_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.cpp index e5b015a0aea..331e9e73524 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.cpp @@ -17,10 +17,10 @@ namespace facebook::react { EventDispatcher::EventDispatcher( - const EventQueueProcessor &eventProcessor, - const EventBeat::Factory &synchonousEventBeatFactory, - const EventBeat::Factory &asynchronousEventBeatFactory, - const EventBeat::SharedOwnerBox &ownerBox) + const EventQueueProcessor& eventProcessor, + const EventBeat::Factory& synchonousEventBeatFactory, + const EventBeat::Factory& asynchronousEventBeatFactory, + const EventBeat::SharedOwnerBox& ownerBox) : synchronousUnbatchedQueue_(std::make_unique( eventProcessor, synchonousEventBeatFactory(ownerBox))), @@ -34,7 +34,7 @@ EventDispatcher::EventDispatcher( eventProcessor, asynchronousEventBeatFactory(ownerBox))) {} -void EventDispatcher::dispatchEvent(RawEvent &&rawEvent, EventPriority priority) +void EventDispatcher::dispatchEvent(RawEvent&& rawEvent, EventPriority priority) const { // Allows the event listener to interrupt default event dispatch if (eventListeners_.willDispatchEvent(rawEvent)) { @@ -49,12 +49,12 @@ void EventDispatcher::dispatchEvent(RawEvent &&rawEvent, EventPriority priority) } void EventDispatcher::dispatchStateUpdate( - StateUpdate &&stateUpdate, + StateUpdate&& stateUpdate, EventPriority priority) const { getEventQueue(priority).enqueueStateUpdate(std::move(stateUpdate)); } -void EventDispatcher::dispatchUniqueEvent(RawEvent &&rawEvent) const { +void EventDispatcher::dispatchUniqueEvent(RawEvent&& rawEvent) const { // Allows the event listener to interrupt default event dispatch if (eventListeners_.willDispatchEvent(rawEvent)) { return; @@ -62,7 +62,7 @@ void EventDispatcher::dispatchUniqueEvent(RawEvent &&rawEvent) const { asynchronousBatchedQueue_->enqueueUniqueEvent(std::move(rawEvent)); } -const EventQueue &EventDispatcher::getEventQueue(EventPriority priority) const { +const EventQueue& EventDispatcher::getEventQueue(EventPriority priority) const { switch (priority) { case EventPriority::SynchronousUnbatched: return *synchronousUnbatchedQueue_; @@ -76,7 +76,7 @@ const EventQueue &EventDispatcher::getEventQueue(EventPriority priority) const { } void EventDispatcher::addListener( - const std::shared_ptr &listener) const { + const std::shared_ptr& listener) const { eventListeners_.addListener(listener); } @@ -84,7 +84,7 @@ void EventDispatcher::addListener( * Removes provided event listener to the event dispatcher. */ void EventDispatcher::removeListener( - const std::shared_ptr &listener) const { + const std::shared_ptr& listener) const { eventListeners_.removeListener(listener); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.h b/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.h index 186db8a3b63..77594bfb877 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventDispatcher.h @@ -29,43 +29,43 @@ class EventDispatcher { using Weak = std::weak_ptr; EventDispatcher( - const EventQueueProcessor &eventProcessor, - const EventBeat::Factory &synchonousEventBeatFactory, - const EventBeat::Factory &asynchronousEventBeatFactory, - const EventBeat::SharedOwnerBox &ownerBox); + const EventQueueProcessor& eventProcessor, + const EventBeat::Factory& synchonousEventBeatFactory, + const EventBeat::Factory& asynchronousEventBeatFactory, + const EventBeat::SharedOwnerBox& ownerBox); /* * Dispatches a raw event with given priority using event-delivery pipe. */ - void dispatchEvent(RawEvent &&rawEvent, EventPriority priority) const; + void dispatchEvent(RawEvent&& rawEvent, EventPriority priority) const; /* * Dispatches a raw event with asynchronous batched priority. Before the * dispatch we make sure that no other RawEvent of same type and same target * is on the queue. */ - void dispatchUniqueEvent(RawEvent &&rawEvent) const; + void dispatchUniqueEvent(RawEvent&& rawEvent) const; /* * Dispatches a state update with given priority. */ - void dispatchStateUpdate(StateUpdate &&stateUpdate, EventPriority priority) + void dispatchStateUpdate(StateUpdate&& stateUpdate, EventPriority priority) const; #pragma mark - Event listeners /* * Adds provided event listener to the event dispatcher. */ - void addListener(const std::shared_ptr &listener) const; + void addListener(const std::shared_ptr& listener) const; /* * Removes provided event listener to the event dispatcher. */ void removeListener( - const std::shared_ptr &listener) const; + const std::shared_ptr& listener) const; private: - const EventQueue &getEventQueue(EventPriority priority) const; + const EventQueue& getEventQueue(EventPriority priority) const; std::unique_ptr synchronousUnbatchedQueue_; std::unique_ptr synchronousBatchedQueue_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp index 6d69cc9c83c..8c3f9d83bf6 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.cpp @@ -30,14 +30,14 @@ static std::string normalizeEventType(std::string type) { return prefixedType; } -std::mutex &EventEmitter::DispatchMutex() { +std::mutex& EventEmitter::DispatchMutex() { static std::mutex mutex; return mutex; } ValueFactory EventEmitter::defaultPayloadFactory() { static auto payloadFactory = - ValueFactory{[](jsi::Runtime &runtime) { return jsi::Object(runtime); }}; + ValueFactory{[](jsi::Runtime& runtime) { return jsi::Object(runtime); }}; return payloadFactory; } @@ -49,12 +49,12 @@ EventEmitter::EventEmitter( void EventEmitter::dispatchEvent( std::string type, - const folly::dynamic &payload, + const folly::dynamic& payload, EventPriority priority, RawEvent::Category category) const { dispatchEvent( std::move(type), - [payload](jsi::Runtime &runtime) { + [payload](jsi::Runtime& runtime) { return valueFromDynamic(runtime, payload); }, priority, @@ -63,15 +63,15 @@ void EventEmitter::dispatchEvent( void EventEmitter::dispatchUniqueEvent( std::string type, - const folly::dynamic &payload) const { - dispatchUniqueEvent(std::move(type), [payload](jsi::Runtime &runtime) { + const folly::dynamic& payload) const { + dispatchUniqueEvent(std::move(type), [payload](jsi::Runtime& runtime) { return valueFromDynamic(runtime, payload); }); } void EventEmitter::dispatchEvent( std::string type, - const ValueFactory &payloadFactory, + const ValueFactory& payloadFactory, EventPriority priority, RawEvent::Category category) const { dispatchEvent( @@ -104,7 +104,7 @@ void EventEmitter::dispatchEvent( void EventEmitter::dispatchUniqueEvent( std::string type, - const ValueFactory &payloadFactory) const { + const ValueFactory& payloadFactory) const { dispatchUniqueEvent( std::move(type), std::make_shared(payloadFactory)); @@ -150,7 +150,7 @@ void EventEmitter::setEnabled(bool enabled) const { } } -const SharedEventTarget &EventEmitter::getEventTarget() const { +const SharedEventTarget& EventEmitter::getEventTarget() const { return eventTarget_; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h index de83c149fa6..8f1c26f1480 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventEmitter.h @@ -34,7 +34,7 @@ class EventEmitter { public: using Shared = std::shared_ptr; - static std::mutex &DispatchMutex(); + static std::mutex& DispatchMutex(); static ValueFactory defaultPayloadFactory(); @@ -56,7 +56,7 @@ class EventEmitter { */ void setEnabled(bool enabled) const; - const SharedEventTarget &getEventTarget() const; + const SharedEventTarget& getEventTarget() const; protected: #ifdef ANDROID @@ -71,14 +71,14 @@ class EventEmitter { */ void dispatchEvent( std::string type, - const ValueFactory &payloadFactory = + const ValueFactory& payloadFactory = EventEmitter::defaultPayloadFactory(), EventPriority priority = EventPriority::AsynchronousBatched, RawEvent::Category category = RawEvent::Category::Unspecified) const; void dispatchEvent( std::string type, - const folly::dynamic &payload, + const folly::dynamic& payload, EventPriority priority = EventPriority::AsynchronousBatched, RawEvent::Category category = RawEvent::Category::Unspecified) const; @@ -88,12 +88,12 @@ class EventEmitter { EventPriority priority = EventPriority::AsynchronousBatched, RawEvent::Category category = RawEvent::Category::Unspecified) const; - void dispatchUniqueEvent(std::string type, const folly::dynamic &payload) + void dispatchUniqueEvent(std::string type, const folly::dynamic& payload) const; void dispatchUniqueEvent( std::string type, - const ValueFactory &payloadFactory = + const ValueFactory& payloadFactory = EventEmitter::defaultPayloadFactory()) const; void dispatchUniqueEvent(std::string type, SharedEventPayload payload) const; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventListener.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventListener.cpp index e4beb50f177..cbe8d3287ba 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventListener.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventListener.cpp @@ -11,25 +11,25 @@ namespace facebook::react { -bool EventListenerContainer::willDispatchEvent(const RawEvent &event) { +bool EventListenerContainer::willDispatchEvent(const RawEvent& event) { std::shared_lock lock(mutex_); bool handled = false; - for (const auto &listener : eventListeners_) { + for (const auto& listener : eventListeners_) { handled = handled || listener->operator()(event); } return handled; } void EventListenerContainer::addListener( - const std::shared_ptr &listener) { + const std::shared_ptr& listener) { std::unique_lock lock(mutex_); eventListeners_.push_back(listener); } void EventListenerContainer::removeListener( - const std::shared_ptr &listener) { + const std::shared_ptr& listener) { std::unique_lock lock(mutex_); auto it = std::find(eventListeners_.begin(), eventListeners_.end(), listener); diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventListener.h b/packages/react-native/ReactCommon/react/renderer/core/EventListener.h index 700151e8084..ca36430a453 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventListener.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventListener.h @@ -19,7 +19,7 @@ namespace facebook::react { * Return `true` to interrupt default dispatch to JS event emitter, `false` to * pass through to default handlers. */ -using EventListener = std::function; +using EventListener = std::function; class EventListenerContainer { public: @@ -28,10 +28,10 @@ class EventListenerContainer { * Returns true if event was handled by the listener, false to continue * default dispatch. */ - bool willDispatchEvent(const RawEvent &event); + bool willDispatchEvent(const RawEvent& event); - void addListener(const std::shared_ptr &listener); - void removeListener(const std::shared_ptr &listener); + void addListener(const std::shared_ptr& listener); + void removeListener(const std::shared_ptr& listener); private: std::shared_mutex mutex_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.cpp index b751d291b03..2bb552ea9b8 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.cpp @@ -9,13 +9,13 @@ namespace facebook::react { -EventLogger *eventLogger; +EventLogger* eventLogger; -void setEventLogger(EventLogger *logger) { +void setEventLogger(EventLogger* logger) { eventLogger = logger; } -EventLogger *getEventLogger() { +EventLogger* getEventLogger() { return eventLogger; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h index bac04866382..fbfeebd6c25 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventLogger.h @@ -24,7 +24,7 @@ class EventLogger { * Called when an event is first created, returns and unique tag for this * event, which can be used to log further event processing stages. */ - virtual EventTag onEventStart(const char *name) = 0; + virtual EventTag onEventStart(const char* name) = 0; /* * Called when event starts getting dispatched (processed by the handlers, if @@ -38,7 +38,7 @@ class EventLogger { virtual void onEventEnd(EventTag tag) = 0; }; -void setEventLogger(EventLogger *eventLogger); -EventLogger *getEventLogger(); +void setEventLogger(EventLogger* eventLogger); +EventLogger* getEventLogger(); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventPayload.h b/packages/react-native/ReactCommon/react/renderer/core/EventPayload.h index 1d46c84f87b..a03405ae5a2 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventPayload.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventPayload.h @@ -20,12 +20,12 @@ struct EventPayload { virtual ~EventPayload() = default; EventPayload() = default; - EventPayload(const EventPayload &) = default; - EventPayload &operator=(const EventPayload &) = default; - EventPayload(EventPayload &&) = default; - EventPayload &operator=(EventPayload &&) = default; + EventPayload(const EventPayload&) = default; + EventPayload& operator=(const EventPayload&) = default; + EventPayload(EventPayload&&) = default; + EventPayload& operator=(EventPayload&&) = default; - virtual jsi::Value asJSIValue(jsi::Runtime &runtime) const = 0; + virtual jsi::Value asJSIValue(jsi::Runtime& runtime) const = 0; /** * Reports the type of the event payload for efficient downcasting. diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h index 28dec4068dc..0c94b2f202b 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventPipe.h @@ -19,12 +19,12 @@ namespace facebook::react { using EventPipe = std::function; + const EventPayload& payload)>; -using EventPipeConclusion = std::function; +using EventPipeConclusion = std::function; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventQueue.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventQueue.cpp index f99b9833a40..099e529e48d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventQueue.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventQueue.cpp @@ -18,10 +18,10 @@ EventQueue::EventQueue( : eventProcessor_(std::move(eventProcessor)), eventBeat_(std::move(eventBeat)) { eventBeat_->setBeatCallback( - [this](jsi::Runtime &runtime) { onBeat(runtime); }); + [this](jsi::Runtime& runtime) { onBeat(runtime); }); } -void EventQueue::enqueueEvent(RawEvent &&rawEvent) const { +void EventQueue::enqueueEvent(RawEvent&& rawEvent) const { { std::scoped_lock lock(queueMutex_); eventQueue_.push_back(std::move(rawEvent)); @@ -30,7 +30,7 @@ void EventQueue::enqueueEvent(RawEvent &&rawEvent) const { onEnqueue(); } -void EventQueue::enqueueUniqueEvent(RawEvent &&rawEvent) const { +void EventQueue::enqueueUniqueEvent(RawEvent&& rawEvent) const { { std::scoped_lock lock(queueMutex_); @@ -60,7 +60,7 @@ void EventQueue::enqueueUniqueEvent(RawEvent &&rawEvent) const { onEnqueue(); } -void EventQueue::enqueueStateUpdate(StateUpdate &&stateUpdate) const { +void EventQueue::enqueueStateUpdate(StateUpdate&& stateUpdate) const { { std::scoped_lock lock(queueMutex_); if (!stateUpdateQueue_.empty()) { @@ -75,12 +75,12 @@ void EventQueue::enqueueStateUpdate(StateUpdate &&stateUpdate) const { onEnqueue(); } -void EventQueue::onBeat(jsi::Runtime &runtime) const { +void EventQueue::onBeat(jsi::Runtime& runtime) const { flushStateUpdates(); flushEvents(runtime); } -void EventQueue::flushEvents(jsi::Runtime &runtime) const { +void EventQueue::flushEvents(jsi::Runtime& runtime) const { std::vector queue; { diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventQueue.h b/packages/react-native/ReactCommon/react/renderer/core/EventQueue.h index 8549063ceb7..a4bd7b087e9 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventQueue.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventQueue.h @@ -34,20 +34,20 @@ class EventQueue { * Enqueues and (probably later) dispatch a given event. * Can be called on any thread. */ - void enqueueEvent(RawEvent &&rawEvent) const; + void enqueueEvent(RawEvent&& rawEvent) const; /* * Enqueues and (probably later) dispatches a given event. * Deletes last RawEvent from the queue if it has the same type and target. * Can be called on any thread. */ - void enqueueUniqueEvent(RawEvent &&rawEvent) const; + void enqueueUniqueEvent(RawEvent&& rawEvent) const; /* * Enqueues and (probably later) dispatch a given state update. * Can be called on any thread. */ - void enqueueStateUpdate(StateUpdate &&stateUpdate) const; + void enqueueStateUpdate(StateUpdate&& stateUpdate) const; protected: /* @@ -56,9 +56,9 @@ class EventQueue { * Default implementation does nothing. */ virtual void onEnqueue() const = 0; - void onBeat(jsi::Runtime &runtime) const; + void onBeat(jsi::Runtime& runtime) const; - void flushEvents(jsi::Runtime &runtime) const; + void flushEvents(jsi::Runtime& runtime) const; void flushStateUpdates() const; EventQueueProcessor eventProcessor_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.cpp index 7b13d96a166..b562e0e8768 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.cpp @@ -24,19 +24,19 @@ EventQueueProcessor::EventQueueProcessor( statePipe_(std::move(statePipe)) {} void EventQueueProcessor::flushEvents( - jsi::Runtime &runtime, - std::vector &&events) const { + jsi::Runtime& runtime, + std::vector&& events) const { { std::scoped_lock lock(EventEmitter::DispatchMutex()); - for (const auto &event : events) { + for (const auto& event : events) { if (event.eventTarget) { event.eventTarget->retain(runtime); } } } - for (const auto &event : events) { + for (const auto& event : events) { if (event.category == RawEvent::Category::ContinuousEnd) { hasContinuousEventStarted_ = false; } @@ -93,7 +93,7 @@ void EventQueueProcessor::flushEvents( // The mutex protects from a situation when the `instanceHandle` can be // deallocated during accessing, but that's impossible at this point because // we have a strong pointer to it. - for (const auto &event : events) { + for (const auto& event : events) { if (event.eventTarget) { event.eventTarget->release(runtime); } @@ -101,8 +101,8 @@ void EventQueueProcessor::flushEvents( } void EventQueueProcessor::flushStateUpdates( - std::vector &&states) const { - for (const auto &stateUpdate : states) { + std::vector&& states) const { + for (const auto& stateUpdate : states) { statePipe_(stateUpdate); } } diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.h b/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.h index 04b786adbbd..bfcad84c155 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventQueueProcessor.h @@ -24,8 +24,8 @@ class EventQueueProcessor { EventPipeConclusion eventPipeConclusion, StatePipe statePipe); - void flushEvents(jsi::Runtime &runtime, std::vector &&events) const; - void flushStateUpdates(std::vector &&states) const; + void flushEvents(jsi::Runtime& runtime, std::vector&& events) const; + void flushStateUpdates(std::vector&& states) const; private: const EventPipe eventPipe_; diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventTarget.cpp b/packages/react-native/ReactCommon/react/renderer/core/EventTarget.cpp index 4b8662e5fdc..c864960c6f4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventTarget.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/EventTarget.cpp @@ -21,7 +21,7 @@ void EventTarget::setEnabled(bool enabled) const { enabled_ = enabled; } -void EventTarget::retain(jsi::Runtime &runtime) const { +void EventTarget::retain(jsi::Runtime& runtime) const { if (!enabled_) { return; } @@ -43,7 +43,7 @@ void EventTarget::retain(jsi::Runtime &runtime) const { // react_native_assert(!strongInstanceHandle_.isUndefined()); } -void EventTarget::release(jsi::Runtime & /*runtime*/) const { +void EventTarget::release(jsi::Runtime& /*runtime*/) const { // The method does not use `jsi::Runtime` reference. // It takes it only to ensure thread-safety (if the caller has the reference, // we are on a proper thread). @@ -55,7 +55,7 @@ void EventTarget::release(jsi::Runtime & /*runtime*/) const { react_native_assert(retainCount_ >= 0); } -jsi::Value EventTarget::getInstanceHandle(jsi::Runtime &runtime) const { +jsi::Value EventTarget::getInstanceHandle(jsi::Runtime& runtime) const { if (strongInstanceHandle_.isNull()) { // The `instanceHandle` is not retained. return jsi::Value::null(); diff --git a/packages/react-native/ReactCommon/react/renderer/core/EventTarget.h b/packages/react-native/ReactCommon/react/renderer/core/EventTarget.h index 1b0c32d2d76..1d65d7cd9fa 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/EventTarget.h +++ b/packages/react-native/ReactCommon/react/renderer/core/EventTarget.h @@ -46,18 +46,18 @@ class EventTarget { * Retains an instance handler by creating a strong reference to it. * If the EventTarget is disabled, does nothing. */ - void retain(jsi::Runtime &runtime) const; + void retain(jsi::Runtime& runtime) const; /* * Releases the instance handler by nulling a strong reference to it. */ - void release(jsi::Runtime &runtime) const; + void release(jsi::Runtime& runtime) const; /* * Creates and returns the `instanceHandle`. * Returns `null` if the `instanceHandle` is not retained at this moment. */ - jsi::Value getInstanceHandle(jsi::Runtime &runtime) const; + jsi::Value getInstanceHandle(jsi::Runtime& runtime) const; /* * Deprecated. Do not use. diff --git a/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.cpp b/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.cpp index 69049125d1c..609cd9a3116 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.cpp @@ -10,14 +10,14 @@ namespace facebook::react { InstanceHandle::InstanceHandle( - jsi::Runtime &runtime, - const jsi::Value &instanceHandle, + jsi::Runtime& runtime, + const jsi::Value& instanceHandle, Tag tag) : weakInstanceHandle_( jsi::WeakObject(runtime, instanceHandle.asObject(runtime))), tag_(tag) {} -jsi::Value InstanceHandle::getInstanceHandle(jsi::Runtime &runtime) const { +jsi::Value InstanceHandle::getInstanceHandle(jsi::Runtime& runtime) const { return weakInstanceHandle_.lock(runtime); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.h b/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.h index f5347ba62fb..17f5a3d2763 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.h +++ b/packages/react-native/ReactCommon/react/renderer/core/InstanceHandle.h @@ -18,15 +18,15 @@ class InstanceHandle { using Shared = std::shared_ptr; InstanceHandle( - jsi::Runtime &runtime, - const jsi::Value &instanceHandle, + jsi::Runtime& runtime, + const jsi::Value& instanceHandle, Tag tag); /* * Creates and returns the `instanceHandle`. * Returns `null` if the `instanceHandle` is not retained at this moment. */ - jsi::Value getInstanceHandle(jsi::Runtime &runtime) const; + jsi::Value getInstanceHandle(jsi::Runtime& runtime) const; /* * Deprecated. Do not use. diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.cpp b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.cpp index c64cac4d0ca..9f616638a02 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.cpp @@ -11,7 +11,7 @@ namespace facebook::react { -Size LayoutConstraints::clamp(const Size &size) const { +Size LayoutConstraints::clamp(const Size& size) const { return { std::max(minimumSize.width, std::min(maximumSize.width, size.width)), std::max(minimumSize.height, std::min(maximumSize.height, size.height))}; diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h index 96089757f18..ea5a38ea520 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutConstraints.h @@ -29,19 +29,19 @@ struct LayoutConstraints { * Clamps the provided `Size` between the `minimumSize` and `maximumSize` * bounds of this `LayoutConstraints`. */ - Size clamp(const Size &size) const; + Size clamp(const Size& size) const; }; inline bool operator==( - const LayoutConstraints &lhs, - const LayoutConstraints &rhs) { + const LayoutConstraints& lhs, + const LayoutConstraints& rhs) { return std::tie(lhs.minimumSize, lhs.maximumSize, lhs.layoutDirection) == std::tie(rhs.minimumSize, rhs.maximumSize, rhs.layoutDirection); } inline bool operator!=( - const LayoutConstraints &lhs, - const LayoutConstraints &rhs) { + const LayoutConstraints& lhs, + const LayoutConstraints& rhs) { return !(lhs == rhs); } @@ -51,7 +51,7 @@ namespace std { template <> struct hash { size_t operator()( - const facebook::react::LayoutConstraints &constraints) const { + const facebook::react::LayoutConstraints& constraints) const { return folly::hash::hash_combine( 0, constraints.minimumSize, diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h index 65860dc1ca8..fb2afbeb52e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutContext.h @@ -33,7 +33,7 @@ struct LayoutContext { * list. The order is not specified. Nothing in this collection is owing (on * purpose), make sure the memory is managed responsibly. */ - std::vector *affectedNodes{}; + std::vector* affectedNodes{}; /* * Flag indicating whether in reassignment of direction @@ -61,7 +61,7 @@ struct LayoutContext { Point viewportOffset{}; }; -inline bool operator==(const LayoutContext &lhs, const LayoutContext &rhs) { +inline bool operator==(const LayoutContext& lhs, const LayoutContext& rhs) { return std::tie( lhs.pointScaleFactor, lhs.affectedNodes, @@ -76,7 +76,7 @@ inline bool operator==(const LayoutContext &lhs, const LayoutContext &rhs) { rhs.viewportOffset); } -inline bool operator!=(const LayoutContext &lhs, const LayoutContext &rhs) { +inline bool operator!=(const LayoutContext& lhs, const LayoutContext& rhs) { return !(lhs == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.cpp b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.cpp index 039d1708d03..f2fa1e9077d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.cpp @@ -14,12 +14,12 @@ namespace facebook::react { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const LayoutMetrics & /*object*/) { +std::string getDebugName(const LayoutMetrics& /*object*/) { return "LayoutMetrics"; } std::vector getDebugProps( - const LayoutMetrics &object, + const LayoutMetrics& object, DebugStringConvertibleOptions options) { return { {"frame", diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h index 825090ec3d6..3c615e2a7f0 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutMetrics.h @@ -53,7 +53,7 @@ struct LayoutMetrics { frame.size.height - contentInsets.top - contentInsets.bottom}}; } - bool operator==(const LayoutMetrics &rhs) const { + bool operator==(const LayoutMetrics& rhs) const { return std::tie( this->frame, this->contentInsets, @@ -72,7 +72,7 @@ struct LayoutMetrics { rhs.overflowInset); } - bool operator!=(const LayoutMetrics &rhs) const { + bool operator!=(const LayoutMetrics& rhs) const { return !(*this == rhs); } }; @@ -87,9 +87,9 @@ static const LayoutMetrics EmptyLayoutMetrics = { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const LayoutMetrics &object); +std::string getDebugName(const LayoutMetrics& object); std::vector getDebugProps( - const LayoutMetrics &object, + const LayoutMetrics& object, DebugStringConvertibleOptions options); #endif @@ -100,7 +100,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::LayoutMetrics &layoutMetrics) const { + size_t operator()(const facebook::react::LayoutMetrics& layoutMetrics) const { return folly::hash::hash_combine( 0, layoutMetrics.frame, diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutPrimitives.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutPrimitives.h index f3bc1d91ee0..f38c74feb8a 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutPrimitives.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutPrimitives.h @@ -36,14 +36,14 @@ enum class LayoutDirection { namespace std { template <> struct hash { - size_t operator()(const facebook::react::LayoutDirection &v) const { + size_t operator()(const facebook::react::LayoutDirection& v) const { return hash()(static_cast(v)); } }; template <> struct hash { - size_t operator()(const facebook::react::DisplayType &v) const { + size_t operator()(const facebook::react::DisplayType& v) const { return hash()(static_cast(v)); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp index 78323225910..3d6da6ed3a4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp @@ -21,7 +21,7 @@ template using LayoutableSmallVector = butter::small_vector; static LayoutableSmallVector calculateTransformedFrames( - const LayoutableSmallVector &shadowNodeList, + const LayoutableSmallVector& shadowNodeList, LayoutableShadowNode::LayoutInspectingPolicy policy) { auto size = shadowNodeList.size(); auto transformedFrames = LayoutableSmallVector{size}; @@ -29,13 +29,13 @@ static LayoutableSmallVector calculateTransformedFrames( for (auto i = size; i > 0; --i) { auto currentShadowNode = - traitCast(shadowNodeList.at(i - 1)); + traitCast(shadowNodeList.at(i - 1)); auto currentFrame = currentShadowNode->getLayoutMetrics().frame; if (policy.includeTransform) { if (Transform::isVerticalInversion(transformation)) { auto parentShadowNode = - traitCast(shadowNodeList.at(i)); + traitCast(shadowNodeList.at(i)); currentFrame.origin.y = parentShadowNode->getLayoutMetrics().frame.size.height - currentFrame.size.height - currentFrame.origin.y; @@ -43,7 +43,7 @@ static LayoutableSmallVector calculateTransformedFrames( if (Transform::isHorizontalInversion(transformation)) { auto parentShadowNode = - traitCast(shadowNodeList.at(i)); + traitCast(shadowNodeList.at(i)); currentFrame.origin.x = parentShadowNode->getLayoutMetrics().frame.size.width - currentFrame.size.width - currentFrame.origin.x; @@ -51,7 +51,7 @@ static LayoutableSmallVector calculateTransformedFrames( if (i != size) { auto parentShadowNode = - traitCast(shadowNodeList.at(i)); + traitCast(shadowNodeList.at(i)); auto contentOriginOffset = parentShadowNode->getContentOriginOffset(); if (Transform::isVerticalInversion(transformation)) { contentOriginOffset.y = -contentOriginOffset.y; @@ -72,21 +72,21 @@ static LayoutableSmallVector calculateTransformedFrames( } LayoutableShadowNode::LayoutableShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits) : ShadowNode(fragment, family, traits), layoutMetrics_({}) {} LayoutableShadowNode::LayoutableShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : ShadowNode(sourceShadowNode, fragment), - layoutMetrics_(static_cast(sourceShadowNode) + layoutMetrics_(static_cast(sourceShadowNode) .layoutMetrics_) {} LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( - const ShadowNodeFamily &descendantNodeFamily, - const LayoutableShadowNode &ancestorNode, + const ShadowNodeFamily& descendantNodeFamily, + const LayoutableShadowNode& ancestorNode, LayoutInspectingPolicy policy) { // Prelude. @@ -109,7 +109,7 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( } LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( - const AncestorList &ancestors, + const AncestorList& ancestors, LayoutInspectingPolicy policy) { if (ancestors.empty()) { // Specified nodes do not form an ancestor-descender relationship @@ -122,12 +122,12 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( // Step 1. // Creating a list of nodes that form a chain from the descender node to // ancestor node inclusively. - auto shadowNodeList = LayoutableSmallVector{}; + auto shadowNodeList = LayoutableSmallVector{}; // Finding the measured node. // The last element in the `AncestorList` is a pair of a parent of the node // and an index of this node in the parent's children list. - auto &pair = ancestors.at(ancestors.size() - 1); + auto& pair = ancestors.at(ancestors.size() - 1); auto descendantNode = pair.first.get().getChildren().at(pair.second).get(); // Putting the node inside the list. @@ -136,7 +136,7 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( shadowNodeList.push_back(descendantNode); for (auto it = ancestors.rbegin(); it != ancestors.rend(); it++) { - auto &shadowNode = it->first.get(); + auto& shadowNode = it->first.get(); shadowNodeList.push_back(&shadowNode); @@ -152,7 +152,7 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( // Step 2. // Computing the initial size of the measured node. auto descendantLayoutableNode = - traitCast(descendantNode); + traitCast(descendantNode); if (descendantLayoutableNode == nullptr) { return EmptyLayoutMetrics; @@ -175,7 +175,7 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( ? calculateTransformedFrames(shadowNodeList, policy) : LayoutableSmallVector(); auto layoutMetrics = descendantLayoutableNode->getLayoutMetrics(); - auto &resultFrame = layoutMetrics.frame; + auto& resultFrame = layoutMetrics.frame; resultFrame.origin = {0, 0}; // Step 3. @@ -183,7 +183,7 @@ LayoutMetrics LayoutableShadowNode::computeRelativeLayoutMetrics( auto size = shadowNodeList.size(); for (size_t i = 0; i < size; i++) { auto currentShadowNode = - traitCast(shadowNodeList.at(i)); + traitCast(shadowNodeList.at(i)); if (currentShadowNode == nullptr) { return EmptyLayoutMetrics; @@ -276,29 +276,29 @@ Point LayoutableShadowNode::getContentOriginOffset() const { LayoutableShadowNode::UnsharedList LayoutableShadowNode::getLayoutableChildNodes() const { LayoutableShadowNode::UnsharedList layoutableChildren; - for (const auto &childShadowNode : getChildren()) { + for (const auto& childShadowNode : getChildren()) { auto layoutableChildShadowNode = - traitCast(childShadowNode.get()); + traitCast(childShadowNode.get()); if (layoutableChildShadowNode != nullptr) { layoutableChildren.push_back( - const_cast(layoutableChildShadowNode)); + const_cast(layoutableChildShadowNode)); } } return layoutableChildren; } Size LayoutableShadowNode::measureContent( - const LayoutContext & /*layoutContext*/, - const LayoutConstraints & /*layoutConstraints*/) const { + const LayoutContext& /*layoutContext*/, + const LayoutConstraints& /*layoutConstraints*/) const { return {}; } Size LayoutableShadowNode::measure( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const { + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const { auto clonedShadowNode = clone({}); - auto &layoutableShadowNode = - static_cast(*clonedShadowNode); + auto& layoutableShadowNode = + static_cast(*clonedShadowNode); auto localLayoutContext = layoutContext; localLayoutContext.affectedNodes = nullptr; @@ -317,10 +317,10 @@ Float LayoutableShadowNode::lastBaseline(Size /*size*/) const { } ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint( - const ShadowNode::Shared &node, + const ShadowNode::Shared& node, Point point) { auto layoutableShadowNode = - traitCast(node.get()); + traitCast(node.get()); if (layoutableShadowNode == nullptr) { return nullptr; @@ -340,12 +340,12 @@ ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint( std::stable_sort( sortedChildren.begin(), sortedChildren.end(), - [](const auto &lhs, const auto &rhs) -> bool { + [](const auto& lhs, const auto& rhs) -> bool { return lhs->getOrderIndex() < rhs->getOrderIndex(); }); for (auto it = sortedChildren.rbegin(); it != sortedChildren.rend(); it++) { - const auto &childShadowNode = *it; + const auto& childShadowNode = *it; auto hitView = findNodeAtPoint(childShadowNode, newPoint); if (hitView) { return hitView; diff --git a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h index 219ec7b4f1f..a215dba1a55 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/LayoutableShadowNode.h @@ -32,13 +32,13 @@ struct LayoutContext; class LayoutableShadowNode : public ShadowNode { public: LayoutableShadowNode( - const ShadowNodeFragment &fragment, - const ShadowNodeFamily::Shared &family, + const ShadowNodeFragment& fragment, + const ShadowNodeFamily::Shared& family, ShadowNodeTraits traits); LayoutableShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment); + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment); static ShadowNodeTraits BaseTraits(); static ShadowNodeTraits::Trait IdentifierTrait(); @@ -50,7 +50,7 @@ class LayoutableShadowNode : public ShadowNode { }; using UnsharedList = butter:: - small_vector; + small_vector; /* * Returns layout metrics of a node represented as `descendantNodeFamily` @@ -59,15 +59,15 @@ class LayoutableShadowNode : public ShadowNode { * tree. */ static LayoutMetrics computeRelativeLayoutMetrics( - const ShadowNodeFamily &descendantNodeFamily, - const LayoutableShadowNode &ancestorNode, + const ShadowNodeFamily& descendantNodeFamily, + const LayoutableShadowNode& ancestorNode, LayoutInspectingPolicy policy); /* * Computes the layout metrics of a node relative to its specified ancestors. */ static LayoutMetrics computeRelativeLayoutMetrics( - const AncestorList &ancestors, + const AncestorList& ancestors, LayoutInspectingPolicy policy); /* @@ -85,8 +85,8 @@ class LayoutableShadowNode : public ShadowNode { * Default implementation returns zero size. */ virtual Size measureContent( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const; /* * Measures the node with given `layoutContext` and `layoutConstraints`. @@ -94,8 +94,8 @@ class LayoutableShadowNode : public ShadowNode { * should *not* be included. Default implementation returns zero size. */ virtual Size measure( - const LayoutContext &layoutContext, - const LayoutConstraints &layoutConstraints) const; + const LayoutContext& layoutContext, + const LayoutConstraints& layoutConstraints) const; /* * Computes layout recursively. @@ -140,7 +140,7 @@ class LayoutableShadowNode : public ShadowNode { * parameter. */ static ShadowNode::Shared findNodeAtPoint( - const ShadowNode::Shared &node, + const ShadowNode::Shared& node, Point point); /* diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.cpp b/packages/react-native/ReactCommon/react/renderer/core/Props.cpp index cd8e0d72cf9..a5604fef18d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Props.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/Props.cpp @@ -14,9 +14,9 @@ namespace facebook::react { Props::Props( - const PropsParserContext &context, - const Props &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const Props& sourceProps, + const RawProps& rawProps, const bool shouldSetRawProps) : nativeId( CoreFeatures::enablePropIteratorSetter ? sourceProps.nativeId @@ -36,10 +36,10 @@ Props::Props( } void Props::setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char * /*propName*/, - const RawValue &value) { + const char* /*propName*/, + const RawValue& value) { switch (hash) { case CONSTEXPR_RAW_PROPS_KEY_HASH("nativeID"): fromRawValue(context, value, nativeId, {}); @@ -52,8 +52,8 @@ void Props::setProp( constexpr MapBuffer::Key PROPS_NATIVE_ID = 1; void Props::propsDiffMapBuffer( - const Props *oldPropsPtr, - MapBufferBuilder &builder) const { + const Props* oldPropsPtr, + MapBufferBuilder& builder) const { // Call with default props if necessary if (oldPropsPtr == nullptr) { Props defaultProps{}; @@ -61,8 +61,8 @@ void Props::propsDiffMapBuffer( return; } - const Props &oldProps = *oldPropsPtr; - const Props &newProps = *this; + const Props& oldProps = *oldPropsPtr; + const Props& newProps = *this; if (oldProps.nativeId != newProps.nativeId) { builder.putString(PROPS_NATIVE_ID, nativeId); diff --git a/packages/react-native/ReactCommon/react/renderer/core/Props.h b/packages/react-native/ReactCommon/react/renderer/core/Props.h index bab36628a23..11f9e148d53 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Props.h +++ b/packages/react-native/ReactCommon/react/renderer/core/Props.h @@ -31,9 +31,9 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible { Props() = default; Props( - const PropsParserContext &context, - const Props &sourceProps, - const RawProps &rawProps, + const PropsParserContext& context, + const Props& sourceProps, + const RawProps& rawProps, bool shouldSetRawProps = true); virtual ~Props() = default; @@ -48,10 +48,10 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible { * ViewProps uses "propX", Props may also use "propX". */ void setProp( - const PropsParserContext &context, + const PropsParserContext& context, RawPropsPropNameHash hash, - const char *propName, - const RawValue &value); + const char* propName, + const RawValue& value); std::string nativeId; @@ -59,8 +59,8 @@ class Props : public virtual Sealable, public virtual DebugStringConvertible { folly::dynamic rawProps = folly::dynamic::object(); virtual void propsDiffMapBuffer( - const Props *oldProps, - MapBufferBuilder &builder) const; + const Props* oldProps, + MapBufferBuilder& builder) const; #endif }; diff --git a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h index 62e873cb2be..9d733c7f671 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h +++ b/packages/react-native/ReactCommon/react/renderer/core/PropsParserContext.h @@ -20,15 +20,15 @@ namespace facebook::react { struct PropsParserContext { PropsParserContext( const SurfaceId surfaceId, - const ContextContainer &contextContainer) + const ContextContainer& contextContainer) : surfaceId(surfaceId), contextContainer(contextContainer) {} // Non-copyable - PropsParserContext(const PropsParserContext &) = delete; - PropsParserContext &operator=(const PropsParserContext &) = delete; + PropsParserContext(const PropsParserContext&) = delete; + PropsParserContext& operator=(const PropsParserContext&) = delete; const SurfaceId surfaceId; - const ContextContainer &contextContainer; + const ContextContainer& contextContainer; // Temporary feature flags bool treatAutoAsYGValueUndefined() const; diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp index aab0c669c1a..c2ee470c73f 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawProps.cpp @@ -20,7 +20,7 @@ RawProps::RawProps() { /* * Creates an object with given `runtime` and `value`. */ -RawProps::RawProps(jsi::Runtime &runtime, const jsi::Value &value) noexcept { +RawProps::RawProps(jsi::Runtime& runtime, const jsi::Value& value) noexcept { if (value.isNull()) { mode_ = Mode::Empty; return; @@ -37,7 +37,7 @@ RawProps::RawProps(jsi::Runtime &runtime, const jsi::Value &value) noexcept { * We need this temporary, only because we have a callsite that does not have * a `jsi::Runtime` behind the data. */ -RawProps::RawProps(const folly::dynamic &dynamic) noexcept { +RawProps::RawProps(const folly::dynamic& dynamic) noexcept { if (dynamic.isNull()) { mode_ = Mode::Empty; return; @@ -48,8 +48,8 @@ RawProps::RawProps(const folly::dynamic &dynamic) noexcept { } void RawProps::parse( - const RawPropsParser &parser, - const PropsParserContext & /*unused*/) const noexcept { + const RawPropsParser& parser, + const PropsParserContext& /*unused*/) const noexcept { react_native_assert(parser_ == nullptr && "A parser was already assigned."); parser_ = &parser; parser.preparse(*this); @@ -83,10 +83,10 @@ bool RawProps::isEmpty() const noexcept { * Returns a const unowning pointer to `RawValue` of a prop with a given name. * Returns `nullptr` if a prop with the given name does not exist. */ -const RawValue *RawProps::at( - const char *name, - const char *prefix, - const char *suffix) const noexcept { +const RawValue* RawProps::at( + const char* name, + const char* prefix, + const char* suffix) const noexcept { react_native_assert( parser_ && "The object is not parsed. `parse` must be called before `at`."); @@ -95,7 +95,7 @@ const RawValue *RawProps::at( void RawProps::iterateOverValues( const std::function< - void(RawPropsPropNameHash, const char *, RawValue const &)> &fn) const { + void(RawPropsPropNameHash, const char*, RawValue const&)>& fn) const { return parser_->iterateOverValues(*this, fn); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h index d3089cd9110..cb041ee8ba5 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawProps.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawProps.h @@ -51,7 +51,7 @@ class RawProps final { /* * Creates an object with given `runtime` and `value`. */ - RawProps(jsi::Runtime &runtime, const jsi::Value &value) noexcept; + RawProps(jsi::Runtime& runtime, const jsi::Value& value) noexcept; /* * Creates an object with given `folly::dynamic` object. @@ -59,21 +59,21 @@ class RawProps final { * We need this temporary, only because we have a callsite that does not have * a `jsi::Runtime` behind the data. */ - RawProps(const folly::dynamic &dynamic) noexcept; + RawProps(const folly::dynamic& dynamic) noexcept; /* * Not moveable. */ - RawProps(RawProps &&other) noexcept = delete; - RawProps &operator=(RawProps &&other) noexcept = delete; + RawProps(RawProps&& other) noexcept = delete; + RawProps& operator=(RawProps&& other) noexcept = delete; /* * Not copyable. */ - RawProps(const RawProps &other) noexcept = delete; - RawProps &operator=(const RawProps &other) noexcept = delete; + RawProps(const RawProps& other) noexcept = delete; + RawProps& operator=(const RawProps& other) noexcept = delete; - void parse(const RawPropsParser &parser, const PropsParserContext &) + void parse(const RawPropsParser& parser, const PropsParserContext&) const noexcept; /* @@ -93,7 +93,7 @@ class RawProps final { * Returns a const unowning pointer to `RawValue` of a prop with a given name. * Returns `nullptr` if a prop with the given name does not exist. */ - const RawValue *at(const char *name, const char *prefix, const char *suffix) + const RawValue* at(const char* name, const char* prefix, const char* suffix) const noexcept; /** @@ -102,13 +102,12 @@ class RawProps final { */ void iterateOverValues( const std::function< - void(RawPropsPropNameHash, const char *, RawValue const &)> &fn) - const; + void(RawPropsPropNameHash, const char*, RawValue const&)>& fn) const; private: friend class RawPropsParser; - mutable const RawPropsParser *parser_{nullptr}; + mutable const RawPropsParser* parser_{nullptr}; /* * Source artefacts: @@ -117,7 +116,7 @@ class RawProps final { mutable Mode mode_; // Case 1: Source data is represented as `jsi::Object`. - jsi::Runtime *runtime_{}; + jsi::Runtime* runtime_{}; jsi::Value value_; // Case 2: Source data is represented as `folly::dynamic`. diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.cpp index 9c8abbd69f7..81ecb15e260 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.cpp @@ -16,7 +16,7 @@ namespace facebook::react { -void RawPropsKey::render(char *buffer, RawPropsPropNameLength *length) +void RawPropsKey::render(char* buffer, RawPropsPropNameLength* length) const noexcept { *length = 0; @@ -51,21 +51,21 @@ RawPropsKey::operator std::string() const noexcept { return std::string{buffer.data(), length}; } -static bool areFieldsEqual(const char *lhs, const char *rhs) { +static bool areFieldsEqual(const char* lhs, const char* rhs) { if (lhs == nullptr || rhs == nullptr) { return lhs == rhs; } return lhs == rhs || strcmp(lhs, rhs) == 0; } -bool operator==(const RawPropsKey &lhs, const RawPropsKey &rhs) noexcept { +bool operator==(const RawPropsKey& lhs, const RawPropsKey& rhs) noexcept { // Note: We check the name first. return areFieldsEqual(lhs.name, rhs.name) && areFieldsEqual(lhs.prefix, rhs.prefix) && areFieldsEqual(lhs.suffix, rhs.suffix); } -bool operator!=(const RawPropsKey &lhs, const RawPropsKey &rhs) noexcept { +bool operator!=(const RawPropsKey& lhs, const RawPropsKey& rhs) noexcept { return !(lhs == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.h index de03c22035e..d85de9792e3 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKey.h @@ -18,9 +18,9 @@ namespace facebook::react { */ class RawPropsKey final { public: - const char *prefix{}; - const char *name{}; - const char *suffix{}; + const char* prefix{}; + const char* name{}; + const char* suffix{}; /* * Converts to `std::string`. @@ -31,10 +31,10 @@ class RawPropsKey final { * Renders compound prop name to given buffer and put the resulting length * into `length`. */ - void render(char *buffer, RawPropsPropNameLength *length) const noexcept; + void render(char* buffer, RawPropsPropNameLength* length) const noexcept; }; -bool operator==(const RawPropsKey &lhs, const RawPropsKey &rhs) noexcept; -bool operator!=(const RawPropsKey &lhs, const RawPropsKey &rhs) noexcept; +bool operator==(const RawPropsKey& lhs, const RawPropsKey& rhs) noexcept; +bool operator!=(const RawPropsKey& lhs, const RawPropsKey& rhs) noexcept; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp index 0d147c49b0c..36e878d1667 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.cpp @@ -17,14 +17,14 @@ namespace facebook::react { -bool RawPropsKeyMap::hasSameName(const Item &lhs, const Item &rhs) noexcept { +bool RawPropsKeyMap::hasSameName(const Item& lhs, const Item& rhs) noexcept { return lhs.length == rhs.length && (std::memcmp(lhs.name, rhs.name, lhs.length) == 0); } bool RawPropsKeyMap::shouldFirstOneBeBeforeSecondOne( - const Item &lhs, - const Item &rhs) noexcept { + const Item& lhs, + const Item& rhs) noexcept { if (lhs.length != rhs.length) { return lhs.length < rhs.length; } @@ -33,7 +33,7 @@ bool RawPropsKeyMap::shouldFirstOneBeBeforeSecondOne( } void RawPropsKeyMap::insert( - const RawPropsKey &key, + const RawPropsKey& key, RawPropsValueIndex value) noexcept { auto item = Item{}; item.value = value; @@ -77,7 +77,7 @@ void RawPropsKeyMap::reindex() noexcept { auto length = RawPropsPropNameLength{0}; for (size_t i = 0; i < items_.size(); i++) { - auto &item = items_[i]; + auto& item = items_[i]; if (item.length != length) { for (auto j = length; j < item.length; j++) { buckets_[j] = static_cast(i); @@ -92,7 +92,7 @@ void RawPropsKeyMap::reindex() noexcept { } RawPropsValueIndex RawPropsKeyMap::at( - const char *name, + const char* name, RawPropsPropNameLength length) noexcept { react_native_assert(length > 0); react_native_assert(length < kPropNameLengthHardCap); diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.h index 9ba8a2ade21..c1b6708f408 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsKeyMap.h @@ -26,7 +26,7 @@ class RawPropsKeyMap final { /* * Stores `value` with by given `key`. */ - void insert(const RawPropsKey &key, RawPropsValueIndex value) noexcept; + void insert(const RawPropsKey& key, RawPropsValueIndex value) noexcept; /* * Reindexes the stored data. @@ -39,7 +39,7 @@ class RawPropsKeyMap final { * Returns `kRawPropsValueIndexEmpty` if the value wan't found. */ RawPropsValueIndex at( - const char *name, + const char* name, RawPropsPropNameLength length) noexcept; private: @@ -50,9 +50,9 @@ class RawPropsKeyMap final { }; static bool shouldFirstOneBeBeforeSecondOne( - const Item &lhs, - const Item &rhs) noexcept; - static bool hasSameName(const Item &lhs, const Item &rhs) noexcept; + const Item& lhs, + const Item& rhs) noexcept; + static bool hasSameName(const Item& lhs, const Item& rhs) noexcept; butter::small_vector items_{}; butter::small_vector diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp index 79d18e2f7f1..3ac97018d5c 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.cpp @@ -19,9 +19,9 @@ namespace facebook::react { // During parser initialization, Props structs are used to parse // "fake"/empty objects, and `at` is called repeatedly which tells us // which props are accessed during parsing, and in which order. -const RawValue *RawPropsParser::at( - const RawProps &rawProps, - const RawPropsKey &key) const noexcept { +const RawValue* RawPropsParser::at( + const RawProps& rawProps, + const RawPropsKey& key) const noexcept { if (UNLIKELY(!ready_)) { // Check against the same key being inserted more than once. // This happens commonly with nested Props structs, where the higher-level @@ -94,7 +94,7 @@ void RawPropsParser::postPrepare() noexcept { nameToIndex_.reindex(); } -void RawPropsParser::preparse(const RawProps &rawProps) const noexcept { +void RawPropsParser::preparse(const RawProps& rawProps) const noexcept { const size_t keyCount = keys_.size(); rawProps.keyIndexToValueIndex_.resize(keyCount, kRawPropsValueIndexEmpty); @@ -113,7 +113,7 @@ void RawPropsParser::preparse(const RawProps &rawProps) const noexcept { return; case RawProps::Mode::JSI: { - auto &runtime = *rawProps.runtime_; + auto& runtime = *rawProps.runtime_; if (!rawProps.value_.isObject()) { LOG(ERROR) << "Preparse props: rawProps value is not object"; } @@ -147,10 +147,10 @@ void RawPropsParser::preparse(const RawProps &rawProps) const noexcept { } case RawProps::Mode::Dynamic: { - const auto &dynamic = rawProps.dynamic_; + const auto& dynamic = rawProps.dynamic_; auto valueIndex = RawPropsValueIndex{0}; - for (const auto &pair : dynamic.items()) { + for (const auto& pair : dynamic.items()) { auto name = pair.first.getString(); auto keyIndex = nameToIndex_.at( @@ -173,16 +173,16 @@ void RawPropsParser::preparse(const RawProps &rawProps) const noexcept { * To be used by RawProps only. Value iterator functions. */ void RawPropsParser::iterateOverValues( - const RawProps &rawProps, + const RawProps& rawProps, const std::function< - void(RawPropsPropNameHash, const char *, RawValue const &)> &visit) + void(RawPropsPropNameHash, const char*, RawValue const&)>& visit) const { switch (rawProps.mode_) { case RawProps::Mode::Empty: return; case RawProps::Mode::JSI: { - auto &runtime = *rawProps.runtime_; + auto& runtime = *rawProps.runtime_; if (!rawProps.value_.isObject()) { LOG(ERROR) << "Preparse props: rawProps value is not object"; } @@ -208,9 +208,9 @@ void RawPropsParser::iterateOverValues( } case RawProps::Mode::Dynamic: { - const auto &dynamic = rawProps.dynamic_; + const auto& dynamic = rawProps.dynamic_; - for (const auto &pair : dynamic.items()) { + for (const auto& pair : dynamic.items()) { auto name = pair.first.getString(); auto nameHash = RAW_PROPS_KEY_HASH(name.c_str()); diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h index d14f7d307c0..79bb235a939 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawPropsParser.h @@ -62,7 +62,7 @@ class RawPropsParser final { /* * To be used by `RawProps` only. */ - void preparse(const RawProps &rawProps) const noexcept; + void preparse(const RawProps& rawProps) const noexcept; /* * Non-generic part of `prepare`. @@ -72,16 +72,16 @@ class RawPropsParser final { /* * To be used by `RawProps` only. */ - const RawValue *at(const RawProps &rawProps, const RawPropsKey &key) + const RawValue* at(const RawProps& rawProps, const RawPropsKey& key) const noexcept; /** * To be used by RawProps only. Value iterator functions. */ void iterateOverValues( - const RawProps &rawProps, + const RawProps& rawProps, const std::function< - void(RawPropsPropNameHash, const char *, RawValue const &)> &visit) + void(RawPropsPropNameHash, const char*, RawValue const&)>& visit) const; mutable butter::small_vector diff --git a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h index cd831410ee4..2db863a7866 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/RawValue.h +++ b/packages/react-native/ReactCommon/react/renderer/core/RawValue.h @@ -55,9 +55,9 @@ class RawValue { */ RawValue() noexcept : dynamic_(nullptr) {} - RawValue(RawValue &&other) noexcept : dynamic_(std::move(other.dynamic_)) {} + RawValue(RawValue&& other) noexcept : dynamic_(std::move(other.dynamic_)) {} - RawValue &operator=(RawValue &&other) noexcept { + RawValue& operator=(RawValue&& other) noexcept { if (this != &other) { dynamic_ = std::move(other.dynamic_); } @@ -72,18 +72,18 @@ class RawValue { /* * Arbitrary constructors are private only for RawProps and internal usage. */ - RawValue(const folly::dynamic &dynamic) noexcept : dynamic_(dynamic) {} + RawValue(const folly::dynamic& dynamic) noexcept : dynamic_(dynamic) {} - RawValue(folly::dynamic &&dynamic) noexcept : dynamic_(std::move(dynamic)) {} + RawValue(folly::dynamic&& dynamic) noexcept : dynamic_(std::move(dynamic)) {} /* * Copy constructor and copy assignment operator would be private and only for * internal use, but it's needed for user-code that does `auto val = * (butter::map)rawVal;` */ - RawValue(const RawValue &other) noexcept : dynamic_(other.dynamic_) {} + RawValue(const RawValue& other) noexcept : dynamic_(other.dynamic_) {} - RawValue &operator=(const RawValue &other) noexcept { + RawValue& operator=(const RawValue& other) noexcept { if (this != &other) { dynamic_ = other.dynamic_; } @@ -96,7 +96,7 @@ class RawValue { */ template explicit operator T() const { - return castValue(dynamic_, (T *)nullptr); + return castValue(dynamic_, (T*)nullptr); } inline explicit operator folly::dynamic() const noexcept { @@ -108,7 +108,7 @@ class RawValue { */ template bool hasType() const noexcept { - return checkValueType(dynamic_, (T *)nullptr); + return checkValueType(dynamic_, (T*)nullptr); } /* @@ -122,57 +122,57 @@ class RawValue { folly::dynamic dynamic_; static bool checkValueType( - const folly::dynamic &dynamic, - RawValue *type) noexcept { + const folly::dynamic& dynamic, + RawValue* type) noexcept { return true; } static bool checkValueType( - const folly::dynamic &dynamic, - bool *type) noexcept { + const folly::dynamic& dynamic, + bool* type) noexcept { return dynamic.isBool(); } static bool checkValueType( - const folly::dynamic &dynamic, - int *type) noexcept { + const folly::dynamic& dynamic, + int* type) noexcept { return dynamic.isNumber(); } static bool checkValueType( - const folly::dynamic &dynamic, - int64_t *type) noexcept { + const folly::dynamic& dynamic, + int64_t* type) noexcept { return dynamic.isNumber(); } static bool checkValueType( - const folly::dynamic &dynamic, - float *type) noexcept { + const folly::dynamic& dynamic, + float* type) noexcept { return dynamic.isNumber(); } static bool checkValueType( - const folly::dynamic &dynamic, - double *type) noexcept { + const folly::dynamic& dynamic, + double* type) noexcept { return dynamic.isNumber(); } static bool checkValueType( - const folly::dynamic &dynamic, - std::string *type) noexcept { + const folly::dynamic& dynamic, + std::string* type) noexcept { return dynamic.isString(); } template static bool checkValueType( - const folly::dynamic &dynamic, - std::vector *type) noexcept { + const folly::dynamic& dynamic, + std::vector* type) noexcept { if (!dynamic.isArray()) { return false; } - for (const auto &item : dynamic) { - if (!checkValueType(item, (T *)nullptr)) { + for (const auto& item : dynamic) { + if (!checkValueType(item, (T*)nullptr)) { return false; } @@ -185,15 +185,15 @@ class RawValue { template static bool checkValueType( - const folly::dynamic &dynamic, - butter::map *type) noexcept { + const folly::dynamic& dynamic, + butter::map* type) noexcept { if (!dynamic.isObject()) { return false; } - for (const auto &item : dynamic.items()) { + for (const auto& item : dynamic.items()) { react_native_assert(item.first.isString()); - if (!checkValueType(item.second, (T *)nullptr)) { + if (!checkValueType(item.second, (T*)nullptr)) { return false; } @@ -206,72 +206,72 @@ class RawValue { // Casts static RawValue castValue( - const folly::dynamic &dynamic, - RawValue *type) noexcept { + const folly::dynamic& dynamic, + RawValue* type) noexcept { return RawValue(dynamic); } - static bool castValue(const folly::dynamic &dynamic, bool *type) { + static bool castValue(const folly::dynamic& dynamic, bool* type) { return dynamic.getBool(); } - static int castValue(const folly::dynamic &dynamic, int *type) { + static int castValue(const folly::dynamic& dynamic, int* type) { return static_cast(dynamic.asInt()); } - static int64_t castValue(const folly::dynamic &dynamic, int64_t *type) { + static int64_t castValue(const folly::dynamic& dynamic, int64_t* type) { return dynamic.asInt(); } - static float castValue(const folly::dynamic &dynamic, float *type) { + static float castValue(const folly::dynamic& dynamic, float* type) { return static_cast(dynamic.asDouble()); } - static double castValue(const folly::dynamic &dynamic, double *type) { + static double castValue(const folly::dynamic& dynamic, double* type) { return dynamic.asDouble(); } static std::string castValue( - const folly::dynamic &dynamic, - std::string *type) { + const folly::dynamic& dynamic, + std::string* type) { return dynamic.getString(); } template static std::vector castValue( - const folly::dynamic &dynamic, - std::vector *type) { + const folly::dynamic& dynamic, + std::vector* type) { react_native_assert(dynamic.isArray()); auto result = std::vector{}; result.reserve(dynamic.size()); - for (const auto &item : dynamic) { - result.push_back(castValue(item, (T *)nullptr)); + for (const auto& item : dynamic) { + result.push_back(castValue(item, (T*)nullptr)); } return result; } template static std::vector> castValue( - const folly::dynamic &dynamic, - std::vector> *type) { + const folly::dynamic& dynamic, + std::vector>* type) { react_native_assert(dynamic.isArray()); auto result = std::vector>{}; result.reserve(dynamic.size()); - for (const auto &item : dynamic) { - result.push_back(castValue(item, (std::vector *)nullptr)); + for (const auto& item : dynamic) { + result.push_back(castValue(item, (std::vector*)nullptr)); } return result; } template static butter::map castValue( - const folly::dynamic &dynamic, - butter::map *type) { + const folly::dynamic& dynamic, + butter::map* type) { react_native_assert(dynamic.isObject()); auto result = butter::map{}; - for (const auto &item : dynamic.items()) { + for (const auto& item : dynamic.items()) { react_native_assert(item.first.isString()); - result[item.first.getString()] = castValue(item.second, (T *)nullptr); + result[item.first.getString()] = castValue(item.second, (T*)nullptr); } return result; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h b/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h index 96abfc40362..bb230a8f88e 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ReactPrimitives.h @@ -35,7 +35,7 @@ using ComponentHandle = int64_t; * String identifier for components used for addressing them from * JavaScript side. */ -using ComponentName = const char *; +using ComponentName = const char*; /* * Defines how visual side effects (views, images, text, and so on) are diff --git a/packages/react-native/ReactCommon/react/renderer/core/Sealable.cpp b/packages/react-native/ReactCommon/react/renderer/core/Sealable.cpp index 202c37988be..6edb6f77213 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Sealable.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/Sealable.cpp @@ -28,20 +28,20 @@ namespace facebook::react { Sealable::Sealable() : sealed_(false) {} -Sealable::Sealable(const Sealable & /*other*/) : sealed_(false){}; +Sealable::Sealable(const Sealable& /*other*/) : sealed_(false){}; -Sealable::Sealable(Sealable &&other) noexcept : sealed_(false) { +Sealable::Sealable(Sealable&& other) noexcept : sealed_(false) { other.ensureUnsealed(); }; Sealable::~Sealable() noexcept = default; -Sealable &Sealable::operator=(const Sealable & /*other*/) { +Sealable& Sealable::operator=(const Sealable& /*other*/) { ensureUnsealed(); return *this; } -Sealable &Sealable::operator=(Sealable &&other) noexcept { +Sealable& Sealable::operator=(Sealable&& other) noexcept { ensureUnsealed(); other.ensureUnsealed(); return *this; diff --git a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h index b40cb4840af..72603b510f0 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/Sealable.h +++ b/packages/react-native/ReactCommon/react/renderer/core/Sealable.h @@ -61,11 +61,11 @@ class Sealable { class Sealable { public: Sealable(); - Sealable(const Sealable &other); - Sealable(Sealable &&other) noexcept; + Sealable(const Sealable& other); + Sealable(Sealable&& other) noexcept; ~Sealable() noexcept; - Sealable &operator=(const Sealable &other); - Sealable &operator=(Sealable &&other) noexcept; + Sealable& operator=(const Sealable& other); + Sealable& operator=(Sealable&& other) noexcept; /* * Seals the object. This operation is irreversible; diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp index d0046bfb2a1..737c20ced71 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp @@ -36,13 +36,13 @@ ShadowNode::SharedListOfShared ShadowNode::emptySharedShadowNodeSharedList() { * is finished. */ Props::Shared ShadowNode::propsForClonedShadowNode( - const ShadowNode &sourceShadowNode, - const Props::Shared &props) { + const ShadowNode& sourceShadowNode, + const Props::Shared& props) { #ifdef ANDROID bool hasBeenMounted = sourceShadowNode.hasBeenMounted_; bool sourceNodeHasRawProps = !sourceShadowNode.getProps()->rawProps.empty(); if (!hasBeenMounted && sourceNodeHasRawProps && props) { - auto &castedProps = const_cast(*props); + auto& castedProps = const_cast(*props); castedProps.rawProps = mergeDynamicProps( sourceShadowNode.getProps()->rawProps, props->rawProps); return props; @@ -51,14 +51,14 @@ Props::Shared ShadowNode::propsForClonedShadowNode( return props ? props : sourceShadowNode.getProps(); } -bool ShadowNode::sameFamily(const ShadowNode &first, const ShadowNode &second) { +bool ShadowNode::sameFamily(const ShadowNode& first, const ShadowNode& second) { return first.family_ == second.family_; } #pragma mark - Constructors ShadowNode::ShadowNode( - const ShadowNodeFragment &fragment, + const ShadowNodeFragment& fragment, ShadowNodeFamily::Shared family, ShadowNodeTraits traits) : @@ -78,7 +78,7 @@ ShadowNode::ShadowNode( traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared); - for (const auto &child : *children_) { + for (const auto& child : *children_) { child->family_->setParent(family_); } @@ -87,8 +87,8 @@ ShadowNode::ShadowNode( } ShadowNode::ShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment) + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment) : #if RN_DEBUG_STRING_CONVERTIBLE revision_(sourceShadowNode.revision_ + 1), @@ -109,16 +109,16 @@ ShadowNode::ShadowNode( traits_.set(ShadowNodeTraits::Trait::ChildrenAreShared); if (fragment.children) { - for (const auto &child : *children_) { + for (const auto& child : *children_) { child->family_->setParent(family_); } } } ShadowNode::Unshared ShadowNode::clone( - const ShadowNodeFragment &fragment) const { - const auto &family = *family_; - const auto &componentDescriptor = family.componentDescriptor_; + const ShadowNodeFragment& fragment) const { + const auto& family = *family_; + const auto& componentDescriptor = family.componentDescriptor_; if (family.nativeProps_DEPRECATED != nullptr) { auto propsParserContext = PropsParserContext{family_->getSurfaceId(), {}}; if (fragment.props == ShadowNodeFragment::propsPlaceholder()) { @@ -158,7 +158,7 @@ ComponentHandle ShadowNode::getComponentHandle() const { return family_->getComponentHandle(); } -const ShadowNode::ListOfShared &ShadowNode::getChildren() const { +const ShadowNode::ListOfShared& ShadowNode::getChildren() const { return *children_; } @@ -166,15 +166,15 @@ ShadowNodeTraits ShadowNode::getTraits() const { return traits_; } -const Props::Shared &ShadowNode::getProps() const { +const Props::Shared& ShadowNode::getProps() const { return props_; } -const SharedEventEmitter &ShadowNode::getEventEmitter() const { +const SharedEventEmitter& ShadowNode::getEventEmitter() const { return family_->eventEmitter_; } -jsi::Value ShadowNode::getInstanceHandle(jsi::Runtime &runtime) const { +jsi::Value ShadowNode::getInstanceHandle(jsi::Runtime& runtime) const { auto instanceHandle = family_->instanceHandle_; if (instanceHandle == nullptr) { return jsi::Value::null(); @@ -191,11 +191,11 @@ SurfaceId ShadowNode::getSurfaceId() const { return family_->surfaceId_; } -const ComponentDescriptor &ShadowNode::getComponentDescriptor() const { +const ComponentDescriptor& ShadowNode::getComponentDescriptor() const { return family_->componentDescriptor_; } -const State::Shared &ShadowNode::getState() const { +const State::Shared& ShadowNode::getState() const { return state_; } @@ -216,33 +216,33 @@ void ShadowNode::sealRecursive() const { props_->seal(); - for (const auto &child : *children_) { + for (const auto& child : *children_) { child->sealRecursive(); } } #pragma mark - Mutating Methods -void ShadowNode::appendChild(const ShadowNode::Shared &child) { +void ShadowNode::appendChild(const ShadowNode::Shared& child) { ensureUnsealed(); cloneChildrenIfShared(); - auto &children = const_cast(*children_); + auto& children = const_cast(*children_); children.push_back(child); child->family_->setParent(family_); } void ShadowNode::replaceChild( - const ShadowNode &oldChild, - const ShadowNode::Shared &newChild, + const ShadowNode& oldChild, + const ShadowNode::Shared& newChild, int32_t suggestedIndex) { ensureUnsealed(); cloneChildrenIfShared(); newChild->family_->setParent(family_); - auto &children = const_cast(*children_); + auto& children = const_cast(*children_); auto size = children.size(); if (suggestedIndex != -1 && suggestedIndex < size) { @@ -282,22 +282,22 @@ void ShadowNode::setMounted(bool mounted) const { family_->eventEmitter_->setEnabled(mounted); } -const ShadowNodeFamily &ShadowNode::getFamily() const { +const ShadowNodeFamily& ShadowNode::getFamily() const { return *family_; } ShadowNode::Unshared ShadowNode::cloneTree( - const ShadowNodeFamily &shadowNodeFamily, - const std::function - &callback) const { + const ShadowNodeFamily& shadowNodeFamily, + const std::function& + callback) const { auto ancestors = shadowNodeFamily.getAncestors(*this); if (ancestors.empty()) { return ShadowNode::Unshared{nullptr}; } - auto &parent = ancestors.back(); - auto &oldShadowNode = parent.first.get().getChildren().at(parent.second); + auto& parent = ancestors.back(); + auto& oldShadowNode = parent.first.get().getChildren().at(parent.second); auto newShadowNode = callback(*oldShadowNode); @@ -308,7 +308,7 @@ ShadowNode::Unshared ShadowNode::cloneTree( auto childNode = newShadowNode; for (auto it = ancestors.rbegin(); it != ancestors.rend(); ++it) { - auto &parentNode = it->first.get(); + auto& parentNode = it->first.get(); auto childIndex = it->second; auto children = parentNode.getChildren(); @@ -341,7 +341,7 @@ std::string ShadowNode::getDebugValue() const { SharedDebugStringConvertibleList ShadowNode::getDebugChildren() const { auto debugChildren = SharedDebugStringConvertibleList{}; - for (const auto &child : *children_) { + for (const auto& child : *children_) { auto debugChild = std::dynamic_pointer_cast(child); if (debugChild) { diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h index d6beec44a87..8203dbc8ba4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNode.h @@ -56,7 +56,7 @@ class ShadowNode : public Sealable, * Returns `true` if nodes belong to the same family (they were cloned one * from each other or from the same source node). */ - static bool sameFamily(const ShadowNode &first, const ShadowNode &second); + static bool sameFamily(const ShadowNode& first, const ShadowNode& second); /* * A set of traits associated with a particular class. @@ -72,7 +72,7 @@ class ShadowNode : public Sealable, * Creates a Shadow Node based on fields specified in a `fragment`. */ ShadowNode( - const ShadowNodeFragment &fragment, + const ShadowNodeFragment& fragment, ShadowNodeFamily::Shared family, ShadowNodeTraits traits); @@ -82,21 +82,21 @@ class ShadowNode : public Sealable, * Note: `tag`, `surfaceId`, and `eventEmitter` cannot be changed. */ ShadowNode( - const ShadowNode &sourceShadowNode, - const ShadowNodeFragment &fragment); + const ShadowNode& sourceShadowNode, + const ShadowNodeFragment& fragment); /* * Not copyable. */ - ShadowNode(const ShadowNode &shadowNode) noexcept = delete; - ShadowNode &operator=(const ShadowNode &other) noexcept = delete; + ShadowNode(const ShadowNode& shadowNode) noexcept = delete; + ShadowNode& operator=(const ShadowNode& other) noexcept = delete; virtual ~ShadowNode() override = default; /* * Clones the shadow node using stored `cloneFunction`. */ - Unshared clone(const ShadowNodeFragment &fragment) const; + Unshared clone(const ShadowNodeFragment& fragment) const; /* * Clones the node (and partially the tree starting from the node) by @@ -106,8 +106,8 @@ class ShadowNode : public Sealable, * Returns `nullptr` if the operation cannot be performed successfully. */ Unshared cloneTree( - const ShadowNodeFamily &shadowNodeFamily, - const std::function &callback) + const ShadowNodeFamily& shadowNodeFamily, + const std::function& callback) const; #pragma mark - Getters @@ -120,17 +120,17 @@ class ShadowNode : public Sealable, */ ShadowNodeTraits getTraits() const; - const Props::Shared &getProps() const; - const ListOfShared &getChildren() const; - const SharedEventEmitter &getEventEmitter() const; - jsi::Value getInstanceHandle(jsi::Runtime &runtime) const; + const Props::Shared& getProps() const; + const ListOfShared& getChildren() const; + const SharedEventEmitter& getEventEmitter() const; + jsi::Value getInstanceHandle(jsi::Runtime& runtime) const; Tag getTag() const; SurfaceId getSurfaceId() const; /* * Returns a concrete `ComponentDescriptor` that manages nodes of this type. */ - const ComponentDescriptor &getComponentDescriptor() const; + const ComponentDescriptor& getComponentDescriptor() const; /* * Returns the `ContextContainer` used by this ShadowNode. @@ -140,7 +140,7 @@ class ShadowNode : public Sealable, /* * Returns a state associated with the particular node. */ - const State::Shared &getState() const; + const State::Shared& getState() const; /* * Returns a momentary value of the most recently created or committed state @@ -160,14 +160,14 @@ class ShadowNode : public Sealable, void sealRecursive() const; - const ShadowNodeFamily &getFamily() const; + const ShadowNodeFamily& getFamily() const; #pragma mark - Mutating Methods - virtual void appendChild(const Shared &child); + virtual void appendChild(const Shared& child); virtual void replaceChild( - const ShadowNode &oldChild, - const Shared &newChild, + const ShadowNode& oldChild, + const Shared& newChild, int32_t suggestedIndex = -1); /* @@ -216,8 +216,8 @@ class ShadowNode : public Sealable, mutable std::atomic hasBeenMounted_{false}; static Props::Shared propsForClonedShadowNode( - const ShadowNode &sourceShadowNode, - const Props::Shared &props); + const ShadowNode& sourceShadowNode, + const Props::Shared& props); protected: /* diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp index b152fbb3beb..efe69e9e975 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.cpp @@ -19,9 +19,9 @@ namespace facebook::react { using AncestorList = ShadowNode::AncestorList; ShadowNodeFamily::ShadowNodeFamily( - const ShadowNodeFamilyFragment &fragment, + const ShadowNodeFamilyFragment& fragment, EventDispatcher::Weak eventDispatcher, - const ComponentDescriptor &componentDescriptor) + const ComponentDescriptor& componentDescriptor) : eventDispatcher_(std::move(eventDispatcher)), tag_(fragment.tag), surfaceId_(fragment.surfaceId), @@ -32,7 +32,7 @@ ShadowNodeFamily::ShadowNodeFamily( componentHandle_(componentDescriptor.getComponentHandle()), componentName_(componentDescriptor.getComponentName()) {} -void ShadowNodeFamily::setParent(const ShadowNodeFamily::Shared &parent) const { +void ShadowNodeFamily::setParent(const ShadowNodeFamily::Shared& parent) const { react_native_assert(parent_.lock() == nullptr || parent_.lock() == parent); if (hasParent_) { return; @@ -58,13 +58,13 @@ ComponentName ShadowNodeFamily::getComponentName() const { return componentName_; } -const ComponentDescriptor &ShadowNodeFamily::getComponentDescriptor() const { +const ComponentDescriptor& ShadowNodeFamily::getComponentDescriptor() const { return componentDescriptor_; } AncestorList ShadowNodeFamily::getAncestors( - const ShadowNode &ancestorShadowNode) const { - auto families = butter::small_vector{}; + const ShadowNode& ancestorShadowNode) const { + auto families = butter::small_vector{}; auto ancestorFamily = ancestorShadowNode.family_.get(); auto family = this; @@ -83,7 +83,7 @@ AncestorList ShadowNodeFamily::getAncestors( auto childFamily = *it; auto found = false; auto childIndex = 0; - for (const auto &childNode : *parentNode->children_) { + for (const auto& childNode : *parentNode->children_) { if (childNode->family_.get() == childFamily) { ancestors.emplace_back(*parentNode, childIndex); parentNode = childNode.get(); @@ -107,7 +107,7 @@ State::Shared ShadowNodeFamily::getMostRecentState() const { return mostRecentState_; } -void ShadowNodeFamily::setMostRecentState(const State::Shared &state) const { +void ShadowNodeFamily::setMostRecentState(const State::Shared& state) const { std::unique_lock lock(mutex_); /* @@ -128,7 +128,7 @@ void ShadowNodeFamily::setMostRecentState(const State::Shared &state) const { } std::shared_ptr ShadowNodeFamily::getMostRecentStateIfObsolete( - const State &state) const { + const State& state) const { std::unique_lock lock(mutex_); if (!state.isObsolete_) { return {}; @@ -137,7 +137,7 @@ std::shared_ptr ShadowNodeFamily::getMostRecentStateIfObsolete( } void ShadowNodeFamily::dispatchRawState( - StateUpdate &&stateUpdate, + StateUpdate&& stateUpdate, EventPriority priority) const { auto eventDispatcher = eventDispatcher_.lock(); if (!eventDispatcher) { diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h index b96e731a49c..41b487ea4c3 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFamily.h @@ -37,7 +37,7 @@ class State; struct ShadowNodeFamilyFragment { const Tag tag; const SurfaceId surfaceId; - const InstanceHandle::Shared &instanceHandle; + const InstanceHandle::Shared& instanceHandle; }; /* @@ -56,16 +56,16 @@ class ShadowNodeFamily final { 64>; ShadowNodeFamily( - const ShadowNodeFamilyFragment &fragment, + const ShadowNodeFamilyFragment& fragment, EventDispatcher::Weak eventDispatcher, - const ComponentDescriptor &componentDescriptor); + const ComponentDescriptor& componentDescriptor); /* * Sets the parent. * This is not technically thread-safe, but practically it mutates the object * only once (and the model enforces that this first call is not concurrent). */ - void setParent(const ShadowNodeFamily::Shared &parent) const; + void setParent(const ShadowNodeFamily::Shared& parent) const; /* * Returns a handle (or name) associated with the component. @@ -76,7 +76,7 @@ class ShadowNodeFamily final { /* * Returns a concrete `ComponentDescriptor` that manages nodes of this type. */ - const ComponentDescriptor &getComponentDescriptor() const; + const ComponentDescriptor& getComponentDescriptor() const; /* * Returns a list of all ancestors of the node relative to the given ancestor. @@ -87,7 +87,7 @@ class ShadowNodeFamily final { * Can be called from any thread. * The theoretical complexity of the algorithm is `O(ln(n))`. Use it wisely. */ - AncestorList getAncestors(const ShadowNode &ancestorShadowNode) const; + AncestorList getAncestors(const ShadowNode& ancestorShadowNode) const; SurfaceId getSurfaceId() const; @@ -97,12 +97,12 @@ class ShadowNodeFamily final { * Sets and gets the most recent state. */ std::shared_ptr getMostRecentState() const; - void setMostRecentState(const std::shared_ptr &state) const; + void setMostRecentState(const std::shared_ptr& state) const; /* * Dispatches a state update with given priority. */ - void dispatchRawState(StateUpdate &&stateUpdate, EventPriority priority) + void dispatchRawState(StateUpdate&& stateUpdate, EventPriority priority) const; /* @@ -122,7 +122,7 @@ class ShadowNodeFamily final { * To be used by `State` only. */ std::shared_ptr getMostRecentStateIfObsolete( - const State &state) const; + const State& state) const; EventDispatcher::Weak eventDispatcher_; mutable std::shared_ptr mostRecentState_; @@ -152,7 +152,7 @@ class ShadowNodeFamily final { * Reference to a concrete `ComponentDescriptor` that manages nodes of this * type. */ - const ComponentDescriptor &componentDescriptor_; + const ComponentDescriptor& componentDescriptor_; /* * ComponentHandle and ComponentName must be stored (cached) inside the object diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp index 69a28388460..6ce91d8f8dd 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.cpp @@ -15,25 +15,25 @@ namespace facebook::react { #define NO_DESTROY #endif -const Props::Shared &ShadowNodeFragment::propsPlaceholder() { +const Props::Shared& ShadowNodeFragment::propsPlaceholder() { NO_DESTROY static Props::Shared instance; return instance; } -const ShadowNode::SharedListOfShared & +const ShadowNode::SharedListOfShared& ShadowNodeFragment::childrenPlaceholder() { NO_DESTROY static ShadowNode::SharedListOfShared instance; return instance; } -const State::Shared &ShadowNodeFragment::statePlaceholder() { +const State::Shared& ShadowNodeFragment::statePlaceholder() { NO_DESTROY static State::Shared instance; return instance; } using Value = ShadowNodeFragment::Value; -Value::Value(const ShadowNodeFragment &fragment) +Value::Value(const ShadowNodeFragment& fragment) : props(fragment.props), children(fragment.children), state(fragment.state) {} diff --git a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.h b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.h index f80ee5df33b..84efaa8c3bd 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ShadowNodeFragment.h @@ -25,18 +25,18 @@ namespace facebook::react { * fragment content to store or pass the data asynchronously. */ struct ShadowNodeFragment { - const Props::Shared &props = propsPlaceholder(); - const ShadowNode::SharedListOfShared &children = childrenPlaceholder(); - const State::Shared &state = statePlaceholder(); + const Props::Shared& props = propsPlaceholder(); + const ShadowNode::SharedListOfShared& children = childrenPlaceholder(); + const State::Shared& state = statePlaceholder(); /* * Placeholders. * Use as default arguments as an indication that the field does not need to * be changed. */ - static const Props::Shared &propsPlaceholder(); - static const ShadowNode::SharedListOfShared &childrenPlaceholder(); - static const State::Shared &statePlaceholder(); + static const Props::Shared& propsPlaceholder(); + static const ShadowNode::SharedListOfShared& childrenPlaceholder(); + static const State::Shared& statePlaceholder(); /* * `ShadowNodeFragment` is not owning data-structure, it only stores raw @@ -48,7 +48,7 @@ struct ShadowNodeFragment { /* * Creates an object with given `ShadowNodeFragment`. */ - Value(const ShadowNodeFragment &fragment); + Value(const ShadowNodeFragment& fragment); /* * Creates a `ShadowNodeFragment` from the object. diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.cpp b/packages/react-native/ReactCommon/react/renderer/core/State.cpp index 13a11cc9e7b..23ba6d0009a 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/State.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/State.cpp @@ -16,12 +16,12 @@ namespace facebook::react { -State::State(StateData::Shared data, const State &state) +State::State(StateData::Shared data, const State& state) : family_(state.family_), data_(std::move(data)), revision_(state.revision_ + 1){}; -State::State(StateData::Shared data, const ShadowNodeFamily::Shared &family) +State::State(StateData::Shared data, const ShadowNodeFamily::Shared& family) : family_(family), data_(std::move(data)), revision_{State::initialRevisionValue} {}; diff --git a/packages/react-native/ReactCommon/react/renderer/core/State.h b/packages/react-native/ReactCommon/react/renderer/core/State.h index dbb6923b91b..f4df0cd648d 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/State.h +++ b/packages/react-native/ReactCommon/react/renderer/core/State.h @@ -33,10 +33,10 @@ class State { * Constructors are protected to make calling them directly with * type-erasured arguments impossible. */ - explicit State(StateData::Shared data, const State &state); + explicit State(StateData::Shared data, const State& state); explicit State( StateData::Shared data, - const ShadowNodeFamily::Shared &family); + const ShadowNodeFamily::Shared& family); public: virtual ~State() = default; @@ -67,7 +67,7 @@ class State { #ifdef ANDROID virtual folly::dynamic getDynamic() const = 0; virtual MapBuffer getMapBuffer() const = 0; - virtual void updateState(folly::dynamic &&data) const = 0; + virtual void updateState(folly::dynamic&& data) const = 0; #endif protected: @@ -78,7 +78,7 @@ class State { * Returns a shared pointer to data. * To be used by `UIManager` only. */ - const StateData::Shared &getDataPointer() const { + const StateData::Shared& getDataPointer() const { return data_; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/StateData.h b/packages/react-native/ReactCommon/react/renderer/core/StateData.h index b3f05ddfe82..aa051f5d9b4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/StateData.h +++ b/packages/react-native/ReactCommon/react/renderer/core/StateData.h @@ -26,7 +26,7 @@ struct StateData final { #ifdef ANDROID StateData() = default; - StateData(const StateData &previousState, folly::dynamic data) {} + StateData(const StateData& previousState, folly::dynamic data) {} folly::dynamic getDynamic() const; MapBuffer getMapBuffer() const; #endif diff --git a/packages/react-native/ReactCommon/react/renderer/core/StatePipe.h b/packages/react-native/ReactCommon/react/renderer/core/StatePipe.h index a32a00b8111..0b2b65c4672 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/StatePipe.h +++ b/packages/react-native/ReactCommon/react/renderer/core/StatePipe.h @@ -13,6 +13,6 @@ namespace facebook::react { -using StatePipe = std::function; +using StatePipe = std::function; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/StateUpdate.h b/packages/react-native/ReactCommon/react/renderer/core/StateUpdate.h index 1d0fbc7b9c4..d1a8e381f6c 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/StateUpdate.h +++ b/packages/react-native/ReactCommon/react/renderer/core/StateUpdate.h @@ -19,7 +19,7 @@ using SharedShadowNodeFamily = std::shared_ptr; class StateUpdate { public: using Callback = - std::function; + std::function; using FailureCallback = std::function; SharedShadowNodeFamily family; diff --git a/packages/react-native/ReactCommon/react/renderer/core/TraitCast.h b/packages/react-native/ReactCommon/react/renderer/core/TraitCast.h index f5804ec495f..39dd31de3e8 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/TraitCast.h +++ b/packages/react-native/ReactCommon/react/renderer/core/TraitCast.h @@ -24,7 +24,7 @@ ShadowNodePointerT traitCastPointer(ParamT shadowNode) { } template -ShadowNodeRefT traitCastRef(ParamT &&shadowNode) { +ShadowNodeRefT traitCastRef(ParamT&& shadowNode) { auto expectedIdentifier = std::remove_reference_t::IdentifierTrait(); if (!shadowNode.getTraits().check(expectedIdentifier)) { @@ -40,7 +40,7 @@ ShadowNodeRefT traitCastRef(ParamT &&shadowNode) { template std::shared_ptr traitCastShared( - const std::shared_ptr &shadowNode) { + const std::shared_ptr& shadowNode) { auto expectedIdentifier = ShadowNodeT::IdentifierTrait(); if (!shadowNode || !shadowNode->getTraits().check(expectedIdentifier)) { return nullptr; @@ -55,22 +55,22 @@ namespace facebook::react { // Cast from one ShadowNode reference to another, terminating if the cast is // invalid. template -ShadowNodeReferenceT traitCast(const ShadowNode &shadowNode) { +ShadowNodeReferenceT traitCast(const ShadowNode& shadowNode) { return details::traitCastRef(shadowNode); } template -ShadowNodeReferenceT traitCast(ShadowNode &shadowNode) { +ShadowNodeReferenceT traitCast(ShadowNode& shadowNode) { return details::traitCastRef(shadowNode); } // Cast from one ShadowNode pointer to another, returning nullptr if the cast is // invalid. template -ShadowNodePointerT traitCast(const ShadowNode *shadowNode) { +ShadowNodePointerT traitCast(const ShadowNode* shadowNode) { return details::traitCastPointer(shadowNode); } template -ShadowNodePointerT traitCast(ShadowNode *shadowNode) { +ShadowNodePointerT traitCast(ShadowNode* shadowNode) { return details::traitCastPointer(shadowNode); } @@ -78,12 +78,12 @@ ShadowNodePointerT traitCast(ShadowNode *shadowNode) { // cast is invalid. template std::shared_ptr traitCast( - const std::shared_ptr &shadowNode) { + const std::shared_ptr& shadowNode) { return details::traitCastShared(shadowNode); } template std::shared_ptr traitCast( - const std::shared_ptr &shadowNode) { + const std::shared_ptr& shadowNode) { return details::traitCastShared(shadowNode); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/ValueFactory.h b/packages/react-native/ReactCommon/react/renderer/core/ValueFactory.h index ddf262293e3..ba554335f54 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ValueFactory.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ValueFactory.h @@ -13,6 +13,6 @@ namespace facebook::react { -using ValueFactory = std::function; +using ValueFactory = std::function; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.cpp b/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.cpp index 3d13654910d..05cbc61c720 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.cpp @@ -12,7 +12,7 @@ namespace facebook::react { ValueFactoryEventPayload::ValueFactoryEventPayload(ValueFactory factory) : valueFactory_(std::move(factory)) {} -jsi::Value ValueFactoryEventPayload::asJSIValue(jsi::Runtime &runtime) const { +jsi::Value ValueFactoryEventPayload::asJSIValue(jsi::Runtime& runtime) const { return valueFactory_(runtime); } diff --git a/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.h b/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.h index 205929a8e02..b0e1398ffac 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.h +++ b/packages/react-native/ReactCommon/react/renderer/core/ValueFactoryEventPayload.h @@ -15,7 +15,7 @@ namespace facebook::react { class ValueFactoryEventPayload : public EventPayload { public: explicit ValueFactoryEventPayload(ValueFactory factory); - jsi::Value asJSIValue(jsi::Runtime &runtime) const override; + jsi::Value asJSIValue(jsi::Runtime& runtime) const override; EventPayloadType getType() const override; private: diff --git a/packages/react-native/ReactCommon/react/renderer/core/conversions.h b/packages/react-native/ReactCommon/react/renderer/core/conversions.h index 8723d5e23d1..a11c2120fd4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/conversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/conversions.h @@ -11,7 +11,7 @@ namespace facebook::react { -inline std::string toString(const LayoutDirection &layoutDirection) { +inline std::string toString(const LayoutDirection& layoutDirection) { switch (layoutDirection) { case LayoutDirection::Undefined: return "undefined"; @@ -22,7 +22,7 @@ inline std::string toString(const LayoutDirection &layoutDirection) { } } -inline int toInt(const LayoutDirection &layoutDirection) { +inline int toInt(const LayoutDirection& layoutDirection) { switch (layoutDirection) { case LayoutDirection::Undefined: return 0; @@ -33,7 +33,7 @@ inline int toInt(const LayoutDirection &layoutDirection) { } } -inline int toInt(const DisplayType &displayType) { +inline int toInt(const DisplayType& displayType) { switch (displayType) { case DisplayType::None: return 0; @@ -44,7 +44,7 @@ inline int toInt(const DisplayType &displayType) { } } -inline std::string toString(const DisplayType &displayType) { +inline std::string toString(const DisplayType& displayType) { switch (displayType) { case DisplayType::None: return "none"; @@ -63,8 +63,8 @@ inline Size yogaMeassureToSize(int64_t value) { int32_t wBits = 0xFFFFFFFF & (value >> 32); int32_t hBits = 0xFFFFFFFF & value; - float *measuredWidth = reinterpret_cast(&wBits); - float *measuredHeight = reinterpret_cast(&hBits); + float* measuredWidth = reinterpret_cast(&wBits); + float* measuredHeight = reinterpret_cast(&hBits); return {*measuredWidth, *measuredHeight}; } diff --git a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h index 8b863220cc5..502b526c0c7 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/graphicsConversions.h @@ -25,9 +25,9 @@ namespace facebook::react { #pragma mark - Color inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - SharedColor &result) { + const PropsParserContext& context, + const RawValue& value, + SharedColor& result) { ColorComponents colorComponents = {0, 0, 0, 0}; if (value.hasType()) { @@ -54,15 +54,15 @@ inline void fromRawValue( } #ifdef ANDROID -inline int toAndroidRepr(const SharedColor &color) { +inline int toAndroidRepr(const SharedColor& color) { return *color; } -inline folly::dynamic toDynamic(const SharedColor &color) { +inline folly::dynamic toDynamic(const SharedColor& color) { return *color; } #endif -inline std::string toString(const SharedColor &value) { +inline std::string toString(const SharedColor& value) { ColorComponents components = colorComponentsFromColor(value); auto ratio = 255.f; return "rgba(" + folly::to(round(components.red * ratio)) + @@ -74,12 +74,12 @@ inline std::string toString(const SharedColor &value) { #pragma mark - Geometry inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - Point &result) { + const PropsParserContext& context, + const RawValue& value, + Point& result) { if (value.hasType>()) { auto map = (butter::map)value; - for (const auto &pair : map) { + for (const auto& pair : map) { if (pair.first == "x") { result.x = pair.second; } else if (pair.first == "y") { @@ -105,12 +105,12 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - Size &result) { + const PropsParserContext& context, + const RawValue& value, + Size& result) { if (value.hasType>()) { auto map = (butter::map)value; - for (const auto &pair : map) { + for (const auto& pair : map) { if (pair.first == "width") { result.width = pair.second; } else if (pair.first == "height") { @@ -139,9 +139,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - EdgeInsets &result) { + const PropsParserContext& context, + const RawValue& value, + EdgeInsets& result) { if (value.hasType()) { auto number = (Float)value; result = {number, number, number, number}; @@ -150,7 +150,7 @@ inline void fromRawValue( if (value.hasType>()) { auto map = (butter::map)value; - for (const auto &pair : map) { + for (const auto& pair : map) { if (pair.first == "top") { result.top = pair.second; } else if (pair.first == "left") { @@ -183,9 +183,9 @@ inline void fromRawValue( } inline void fromRawValue( - const PropsParserContext &context, - const RawValue &value, - CornerInsets &result) { + const PropsParserContext& context, + const RawValue& value, + CornerInsets& result) { if (value.hasType()) { auto number = (Float)value; result = {number, number, number, number}; @@ -194,7 +194,7 @@ inline void fromRawValue( if (value.hasType>()) { auto map = (butter::map)value; - for (const auto &pair : map) { + for (const auto& pair : map) { if (pair.first == "topLeft") { result.topLeft = pair.second; } else if (pair.first == "topRight") { @@ -228,28 +228,28 @@ inline void fromRawValue( LOG(ERROR) << "Unsupported CornerInsets type"; } -inline std::string toString(const Point &point) { +inline std::string toString(const Point& point) { return "{" + folly::to(point.x) + ", " + folly::to(point.y) + "}"; } -inline std::string toString(const Size &size) { +inline std::string toString(const Size& size) { return "{" + folly::to(size.width) + ", " + folly::to(size.height) + "}"; } -inline std::string toString(const Rect &rect) { +inline std::string toString(const Rect& rect) { return "{" + toString(rect.origin) + ", " + toString(rect.size) + "}"; } -inline std::string toString(const EdgeInsets &edgeInsets) { +inline std::string toString(const EdgeInsets& edgeInsets) { return "{" + folly::to(edgeInsets.left) + ", " + folly::to(edgeInsets.top) + ", " + folly::to(edgeInsets.right) + ", " + folly::to(edgeInsets.bottom) + "}"; } -inline std::string toString(const CornerInsets &cornerInsets) { +inline std::string toString(const CornerInsets& cornerInsets) { return "{" + folly::to(cornerInsets.topLeft) + ", " + folly::to(cornerInsets.topRight) + ", " + folly::to(cornerInsets.bottomLeft) + ", " + diff --git a/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h b/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h index e6a983b3300..99b35f22959 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h +++ b/packages/react-native/ReactCommon/react/renderer/core/propsConversions.h @@ -25,9 +25,9 @@ namespace facebook::react { */ template void fromRawValue( - const PropsParserContext &context, - const RawValue &rawValue, - T &result, + const PropsParserContext& context, + const RawValue& rawValue, + T& result, T defaultValue) { if (!rawValue.hasValue()) { result = std::move(defaultValue); @@ -39,17 +39,17 @@ void fromRawValue( template void fromRawValue( - const PropsParserContext &context, - const RawValue &rawValue, - T &result) { + const PropsParserContext& context, + const RawValue& rawValue, + T& result) { result = (T)rawValue; } template void fromRawValue( - const PropsParserContext &context, - const RawValue &rawValue, - std::optional &result) { + const PropsParserContext& context, + const RawValue& rawValue, + std::optional& result) { T resultValue; fromRawValue(context, rawValue, resultValue); result = std::optional{std::move(resultValue)}; @@ -57,9 +57,9 @@ void fromRawValue( template void fromRawValue( - const PropsParserContext &context, - const RawValue &rawValue, - std::vector &result) { + const PropsParserContext& context, + const RawValue& rawValue, + std::vector& result) { if (rawValue.hasType>()) { auto items = (std::vector)rawValue; auto length = items.size(); @@ -83,9 +83,9 @@ void fromRawValue( template void fromRawValue( - const PropsParserContext &context, - const RawValue &rawValue, - std::vector> &result) { + const PropsParserContext& context, + const RawValue& rawValue, + std::vector>& result) { if (rawValue.hasType>>()) { auto items = (std::vector>)rawValue; auto length = items.size(); @@ -109,14 +109,14 @@ void fromRawValue( template T convertRawProp( - const PropsParserContext &context, - const RawProps &rawProps, - const char *name, - T const &sourceValue, - U const &defaultValue, - const char *namePrefix = nullptr, - const char *nameSuffix = nullptr) { - const auto *rawValue = rawProps.at(name, namePrefix, nameSuffix); + const PropsParserContext& context, + const RawProps& rawProps, + const char* name, + T const& sourceValue, + U const& defaultValue, + const char* namePrefix = nullptr, + const char* nameSuffix = nullptr) { + const auto* rawValue = rawProps.at(name, namePrefix, nameSuffix); if (LIKELY(rawValue == nullptr)) { return sourceValue; } @@ -131,7 +131,7 @@ T convertRawProp( T result; fromRawValue(context, *rawValue, result); return result; - } catch (const std::exception &e) { + } catch (const std::exception& e) { // In case of errors, log the error and fall back to the default RawPropsKey key{namePrefix, name, nameSuffix}; // TODO: report this using ErrorUtils so it's more visible to the user diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp index b4b9023b77c..d9d623713d4 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/ComponentDescriptorTest.cpp @@ -26,7 +26,7 @@ TEST(ComponentDescriptorTest, createShadowNode) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc")); + const auto& raw = RawProps(folly::dynamic::object("nativeID", "abc")); Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw); auto family = descriptor->createFamily(ShadowNodeFamilyFragment{ @@ -58,7 +58,7 @@ TEST(ComponentDescriptorTest, cloneShadowNode) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc")); + const auto& raw = RawProps(folly::dynamic::object("nativeID", "abc")); Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw); auto family = descriptor->createFamily(ShadowNodeFamilyFragment{ /* .tag = */ 9, @@ -91,7 +91,7 @@ TEST(ComponentDescriptorTest, appendChild) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc")); + const auto& raw = RawProps(folly::dynamic::object("nativeID", "abc")); Props::Shared props = descriptor->cloneProps(parserContext, nullptr, raw); auto family1 = descriptor->createFamily(ShadowNodeFamilyFragment{ /* .tag = */ 1, diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp index 0c23103b22a..1d673222b93 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/EventQueueProcessorTest.cpp @@ -23,17 +23,17 @@ class EventQueueProcessorTest : public testing::Test { runtime_ = facebook::hermes::makeHermesRuntime(); auto eventPipe = [this]( - jsi::Runtime & /*runtime*/, - const EventTarget * /*eventTarget*/, - const std::string &type, + jsi::Runtime& /*runtime*/, + const EventTarget* /*eventTarget*/, + const std::string& type, ReactEventPriority priority, - const EventPayload & /*payload*/) { + const EventPayload& /*payload*/) { eventTypes_.push_back(type); eventPriorities_.push_back(priority); }; - auto dummyEventPipeConclusion = [](jsi::Runtime &runtime) {}; - auto dummyStatePipe = [](const StateUpdate &stateUpdate) {}; + auto dummyEventPipeConclusion = [](jsi::Runtime& runtime) {}; + auto dummyStatePipe = [](const StateUpdate& stateUpdate) {}; eventProcessor_ = std::make_unique( eventPipe, dummyEventPipeConclusion, dummyStatePipe); diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp index 5c0068782a5..bca6d019ffb 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/RawPropsTest.cpp @@ -22,9 +22,9 @@ class PropsSingleFloat : public Props { public: PropsSingleFloat() = default; PropsSingleFloat( - const PropsParserContext &context, - const PropsSingleFloat &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const PropsSingleFloat& sourceProps, + const RawProps& rawProps) : floatValue(convertRawProp( context, rawProps, @@ -40,9 +40,9 @@ class PropsSingleDouble : public Props { public: PropsSingleDouble() = default; PropsSingleDouble( - const PropsParserContext &context, - const PropsSingleDouble &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const PropsSingleDouble& sourceProps, + const RawProps& rawProps) : doubleValue(convertRawProp( context, rawProps, @@ -58,9 +58,9 @@ class PropsSingleInt : public Props { public: PropsSingleInt() = default; PropsSingleInt( - const PropsParserContext &context, - const PropsSingleInt &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const PropsSingleInt& sourceProps, + const RawProps& rawProps) : intValue(convertRawProp( context, rawProps, @@ -76,9 +76,9 @@ class PropsPrimitiveTypes : public Props { public: PropsPrimitiveTypes() = default; PropsPrimitiveTypes( - const PropsParserContext &context, - const PropsPrimitiveTypes &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const PropsPrimitiveTypes& sourceProps, + const RawProps& rawProps) : intValue(convertRawProp( context, rawProps, @@ -122,9 +122,9 @@ class PropsMultiLookup : public Props { public: PropsMultiLookup() = default; PropsMultiLookup( - const PropsParserContext &context, - const PropsMultiLookup &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const PropsMultiLookup& sourceProps, + const RawProps& rawProps) : floatValue(convertRawProp( context, rawProps, @@ -151,7 +151,7 @@ TEST(RawPropsTest, handleProps) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc")); + const auto& raw = RawProps(folly::dynamic::object("nativeID", "abc")); auto parser = RawPropsParser(); parser.prepare(); raw.parse(parser, parserContext); @@ -168,7 +168,7 @@ TEST(RawPropsTest, handleRawPropsSingleString) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("nativeID", "abc")); + const auto& raw = RawProps(folly::dynamic::object("nativeID", "abc")); auto parser = RawPropsParser(); parser.prepare(); raw.parse(parser, parserContext); @@ -182,7 +182,7 @@ TEST(RawPropsTest, handleRawPropsSingleFloat) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = + const auto& raw = RawProps(folly::dynamic::object("floatValue", (float)42.42)); auto parser = RawPropsParser(); parser.prepare(); @@ -197,7 +197,7 @@ TEST(RawPropsTest, handleRawPropsSingleDouble) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = + const auto& raw = RawProps(folly::dynamic::object("doubleValue", (double)42.42)); auto parser = RawPropsParser(); parser.prepare(); @@ -212,7 +212,7 @@ TEST(RawPropsTest, handleRawPropsSingleInt) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42.42)); + const auto& raw = RawProps(folly::dynamic::object("intValue", (int)42.42)); auto parser = RawPropsParser(); parser.prepare(); raw.parse(parser, parserContext); @@ -226,7 +226,7 @@ TEST(RawPropsTest, handleRawPropsSingleIntGetManyTimes) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42.42)); + const auto& raw = RawProps(folly::dynamic::object("intValue", (int)42.42)); auto parser = RawPropsParser(); parser.prepare(); raw.parse(parser, parserContext); @@ -240,7 +240,7 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypes) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps( + const auto& raw = RawProps( folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)( "floatValue", (float)66.67)("stringValue", "helloworld")("boolValue", true)); @@ -262,7 +262,7 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetTwice) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps( + const auto& raw = RawProps( folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)( "floatValue", (float)66.67)("stringValue", "helloworld")("boolValue", true)); @@ -292,7 +292,7 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesGetOutOfOrder) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps( + const auto& raw = RawProps( folly::dynamic::object("intValue", (int)42)("doubleValue", (double)17.42)( "floatValue", (float)66.67)("stringValue", "helloworld")("boolValue", true)); @@ -322,7 +322,7 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncomplete) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42)); + const auto& raw = RawProps(folly::dynamic::object("intValue", (int)42)); auto parser = RawPropsParser(); parser.prepare(); @@ -342,7 +342,7 @@ TEST(RawPropsTest, handleRawPropsPrimitiveTypesIncorrectLookup) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("intValue", (int)42)); + const auto& raw = RawProps(folly::dynamic::object("intValue", (int)42)); auto parser = RawPropsParser(); parser.prepare(); @@ -360,7 +360,7 @@ TEST(RawPropsTest, handlePropsMultiLookup) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; - const auto &raw = RawProps(folly::dynamic::object("floatValue", (float)10.0)); + const auto& raw = RawProps(folly::dynamic::object("floatValue", (float)10.0)); auto parser = RawPropsParser(); parser.prepare(); raw.parse(parser, parserContext); diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/TestComponent.h b/packages/react-native/ReactCommon/react/renderer/core/tests/TestComponent.h index 99fa87ab3d0..16cdac44330 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/TestComponent.h +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/TestComponent.h @@ -35,7 +35,7 @@ struct TestState { TestState() = default; #ifdef ANDROID - TestState(const TestState &previousState, folly::dynamic &&data){}; + TestState(const TestState& previousState, folly::dynamic&& data){}; folly::dynamic getDynamic() const { return {}; @@ -54,9 +54,9 @@ class TestProps : public ViewProps { TestProps() = default; TestProps( - const PropsParserContext &context, - const TestProps &sourceProps, - const RawProps &rawProps) + const PropsParserContext& context, + const TestProps& sourceProps, + const RawProps& rawProps) : ViewProps(context, sourceProps, rawProps) {} }; diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp index 1cf34af49c5..fe7bdc5e4ff 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/benchmarks/RawPropsBenchmark.cpp @@ -34,14 +34,14 @@ auto unsupportedPropsDynamic = auto sourceProps = ViewProps{}; auto sharedSourceProps = ViewShadowNode::defaultSharedProps(); -static void emptyPropCreation(benchmark::State &state) { +static void emptyPropCreation(benchmark::State& state) { for (auto _ : state) { ViewProps{}; } } BENCHMARK(emptyPropCreation); -static void propParsingEmptyRawProps(benchmark::State &state) { +static void propParsingEmptyRawProps(benchmark::State& state) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; for (auto _ : state) { @@ -51,7 +51,7 @@ static void propParsingEmptyRawProps(benchmark::State &state) { } BENCHMARK(propParsingEmptyRawProps); -static void propParsingRegularRawProps(benchmark::State &state) { +static void propParsingRegularRawProps(benchmark::State& state) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; for (auto _ : state) { @@ -61,7 +61,7 @@ static void propParsingRegularRawProps(benchmark::State &state) { } BENCHMARK(propParsingRegularRawProps); -static void propParsingUnsupportedRawProps(benchmark::State &state) { +static void propParsingUnsupportedRawProps(benchmark::State& state) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; for (auto _ : state) { @@ -72,7 +72,7 @@ static void propParsingUnsupportedRawProps(benchmark::State &state) { BENCHMARK(propParsingUnsupportedRawProps); static void propParsingRegularRawPropsWithNoSourceProps( - benchmark::State &state) { + benchmark::State& state) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; for (auto _ : state) { diff --git a/packages/react-native/ReactCommon/react/renderer/core/tests/traitCastTest.cpp b/packages/react-native/ReactCommon/react/renderer/core/tests/traitCastTest.cpp index fbb3f08aab5..d08f5ab3aee 100644 --- a/packages/react-native/ReactCommon/react/renderer/core/tests/traitCastTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/core/tests/traitCastTest.cpp @@ -52,95 +52,93 @@ TEST(traitCastTest, testOne) { std::shared_ptr shadowNodeForTextShadowNode{textShadowNode}; // Casting `nullptr` returns `nullptrs`. - ShadowNode *nullShadowNode = nullptr; - EXPECT_FALSE(traitCast(nullShadowNode)); - EXPECT_FALSE(traitCast(nullShadowNode)); - EXPECT_FALSE(traitCast(nullShadowNode)); - EXPECT_FALSE(traitCast(nullShadowNode)); + ShadowNode* nullShadowNode = nullptr; + EXPECT_FALSE(traitCast(nullShadowNode)); + EXPECT_FALSE(traitCast(nullShadowNode)); + EXPECT_FALSE(traitCast(nullShadowNode)); + EXPECT_FALSE(traitCast(nullShadowNode)); EXPECT_FALSE(traitCast( std::shared_ptr(nullShadowNode))); // `ViewShadowNode` is `LayoutableShadowNode` and `YogaLayoutableShadowNode`. - EXPECT_TRUE(traitCast(viewShadowNode.get())); - EXPECT_TRUE( - traitCast(viewShadowNode.get())); + EXPECT_TRUE(traitCast(viewShadowNode.get())); + EXPECT_TRUE(traitCast(viewShadowNode.get())); EXPECT_NO_FATAL_FAILURE( - traitCast(*viewShadowNode)); + traitCast(*viewShadowNode)); EXPECT_NO_FATAL_FAILURE( - traitCast(*viewShadowNode)); + traitCast(*viewShadowNode)); EXPECT_NO_FATAL_FAILURE( - traitCast(*viewShadowNode)); - EXPECT_TRUE(traitCast(viewShadowNode.get())); + traitCast(*viewShadowNode)); + EXPECT_TRUE(traitCast(viewShadowNode.get())); EXPECT_TRUE(traitCast(viewShadowNode)); // `ScrollViewShadowNode` is `LayoutableShadowNode` and // `YogaLayoutableShadowNode`. EXPECT_TRUE( - traitCast(scrollViewShadowNode.get())); + traitCast(scrollViewShadowNode.get())); EXPECT_TRUE( - traitCast(scrollViewShadowNode.get())); + traitCast(scrollViewShadowNode.get())); EXPECT_NO_FATAL_FAILURE( - traitCast(*scrollViewShadowNode)); + traitCast(*scrollViewShadowNode)); EXPECT_NO_FATAL_FAILURE( - traitCast(*scrollViewShadowNode)); + traitCast(*scrollViewShadowNode)); // `ParagraphShadowNode` is `LayoutableShadowNode` and // `YogaLayoutableShadowNode`. EXPECT_TRUE( - traitCast(paragraphShadowNode.get())); + traitCast(paragraphShadowNode.get())); EXPECT_TRUE( - traitCast(paragraphShadowNode.get())); + traitCast(paragraphShadowNode.get())); EXPECT_NO_FATAL_FAILURE( - traitCast(*paragraphShadowNode)); + traitCast(*paragraphShadowNode)); EXPECT_NO_FATAL_FAILURE( - traitCast(*paragraphShadowNode)); + traitCast(*paragraphShadowNode)); // `TextShadowNode` is *not* `LayoutableShadowNode` nor // `YogaLayoutableShadowNode`. - EXPECT_FALSE(traitCast(textShadowNode.get())); + EXPECT_FALSE(traitCast(textShadowNode.get())); EXPECT_FALSE( - traitCast(textShadowNode.get())); + traitCast(textShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*textShadowNode), ""); + traitCast(*textShadowNode), ""); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*textShadowNode), ""); + traitCast(*textShadowNode), ""); // `RawTextShadowNode` is *not* `LayoutableShadowNode` nor // `YogaLayoutableShadowNode`. + EXPECT_FALSE(traitCast(rawTextShadowNode.get())); EXPECT_FALSE( - traitCast(rawTextShadowNode.get())); - EXPECT_FALSE( - traitCast(rawTextShadowNode.get())); + traitCast(rawTextShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*rawTextShadowNode), ""); + traitCast(*rawTextShadowNode), ""); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*rawTextShadowNode), ""); + traitCast(*rawTextShadowNode), ""); // trait cast to `RawTextShadowNode` works on `RawTextShadowNode` // and not on TextShadowNode or ViewShadowNode - EXPECT_TRUE(traitCast( + EXPECT_TRUE(traitCast( shadowNodeForRawTextShadowNode.get())); EXPECT_NO_FATAL_FAILURE( - traitCast(*shadowNodeForRawTextShadowNode)); + traitCast(*shadowNodeForRawTextShadowNode)); EXPECT_FALSE( - traitCast(shadowNodeForTextShadowNode.get())); + traitCast(shadowNodeForTextShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*shadowNodeForTextShadowNode), ""); - EXPECT_FALSE(traitCast(viewShadowNode.get())); + traitCast(*shadowNodeForTextShadowNode), ""); + EXPECT_FALSE(traitCast(viewShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*viewShadowNode), ""); + traitCast(*viewShadowNode), ""); // trait cast to `TextShadowNode` works on `TextShadowNode` // and not on RawTextShadowNode or ViewShadowNode EXPECT_TRUE( - traitCast(shadowNodeForTextShadowNode.get())); + traitCast(shadowNodeForTextShadowNode.get())); EXPECT_NO_FATAL_FAILURE( - traitCast(*shadowNodeForTextShadowNode)); + traitCast(*shadowNodeForTextShadowNode)); EXPECT_FALSE( - traitCast(shadowNodeForRawTextShadowNode.get())); + traitCast(shadowNodeForRawTextShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*shadowNodeForRawTextShadowNode), ""); - EXPECT_FALSE(traitCast(viewShadowNode.get())); + traitCast(*shadowNodeForRawTextShadowNode), ""); + EXPECT_FALSE(traitCast(viewShadowNode.get())); EXPECT_DEATH_IF_SUPPORTED( - traitCast(*viewShadowNode), ""); + traitCast(*viewShadowNode), ""); } diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp index 4a889af38fd..dd987800797 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp +++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.cpp @@ -25,7 +25,7 @@ std::string DebugStringConvertible::getDebugChildrenDescription( auto trailing = options.format ? std::string{"\n"} : std::string{""}; std::string childrenString; - for (const auto &child : getDebugChildren()) { + for (const auto& child : getDebugChildren()) { if (!child) { continue; } @@ -51,7 +51,7 @@ std::string DebugStringConvertible::getDebugPropsDescription( std::string propsString; - for (const auto &prop : getDebugProps()) { + for (const auto& prop : getDebugProps()) { if (!prop) { continue; } @@ -125,22 +125,22 @@ SharedDebugStringConvertibleList DebugStringConvertible::getDebugProps() const { /* * `toString`-family implementation. */ -std::string toString(const std::string &value) { +std::string toString(const std::string& value) { return value; } -std::string toString(const int &value) { +std::string toString(const int& value) { return folly::to(value); } -std::string toString(const bool &value) { +std::string toString(const bool& value) { return folly::to(value); } -std::string toString(const float &value) { +std::string toString(const float& value) { return folly::to(value); } -std::string toString(const double &value) { +std::string toString(const double& value) { return folly::to(value); } -std::string toString(const void *value) { +std::string toString(const void* value) { if (value == nullptr) { return "null"; } diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h index 939d831f147..b7d494fe053 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertible.h @@ -92,15 +92,15 @@ class DebugStringConvertible {}; * Set of particular-format-opinionated functions that convert base types to * `std::string`; practically incapsulate `folly:to<>` and `folly::format`. */ -std::string toString(const std::string &value); -std::string toString(const int &value); -std::string toString(const bool &value); -std::string toString(const float &value); -std::string toString(const double &value); -std::string toString(const void *value); +std::string toString(const std::string& value); +std::string toString(const int& value); +std::string toString(const bool& value); +std::string toString(const float& value); +std::string toString(const double& value); +std::string toString(const void* value); template -std::string toString(const std::optional &value) { +std::string toString(const std::optional& value) { if (!value) { return "null"; } @@ -140,32 +140,32 @@ std::string toString(const std::optional &value) { * types. */ template -std::string getDebugName(T const &object) { +std::string getDebugName(T const& object) { return "Node"; } template -std::string getDebugValue(T const &object) { +std::string getDebugValue(T const& object) { return ""; } template std::vector getDebugChildren( - T const &object, + T const& object, DebugStringConvertibleOptions options) { return {}; } template std::vector getDebugProps( - T const &object, + T const& object, DebugStringConvertibleOptions options) { return {}; } template std::string getDebugPropsDescription( - T const &object, + T const& object, DebugStringConvertibleOptions options) { if (options.depth >= options.maximumDepth) { return ""; @@ -195,7 +195,7 @@ std::string getDebugPropsDescription( template std::string getDebugChildrenDescription( - T const &object, + T const& object, DebugStringConvertibleOptions options) { if (options.depth >= options.maximumDepth) { return ""; @@ -219,7 +219,7 @@ std::string getDebugChildrenDescription( template std::string getDebugDescription( - T const &object, + T const& object, DebugStringConvertibleOptions options) { auto nameString = getDebugName(object); auto valueString = getDebugValue(object); @@ -284,43 +284,43 @@ inline std::string getDebugDescription( // `void *` inline std::string getDebugDescription( - void *pointer, + void* pointer, DebugStringConvertibleOptions options) { return toString(pointer); } // `std::string` inline std::string getDebugDescription( - const std::string &string, + const std::string& string, DebugStringConvertibleOptions options) { return string; } // `std::vector` template -std::string getDebugName(const std::vector &vector) { +std::string getDebugName(const std::vector& vector) { return "List"; } template std::vector getDebugChildren( - const std::vector &vector, + const std::vector& vector, DebugStringConvertibleOptions options) { return vector; } // `std::array` template -std::string getDebugName(const std::array &array) { +std::string getDebugName(const std::array& array) { return "List"; } template std::vector getDebugChildren( - const std::array &array, + const std::array& array, DebugStringConvertibleOptions options) { auto vector = std::vector{}; - for (const auto &value : array) { + for (const auto& value : array) { vector.push_back(value); } return vector; @@ -328,13 +328,13 @@ std::vector getDebugChildren( // `std::unordered_set` template -std::string getDebugName(const std::unordered_set &set) { +std::string getDebugName(const std::unordered_set& set) { return "Set"; } template std::vector getDebugChildren( - const std::unordered_set &set, + const std::unordered_set& set, DebugStringConvertibleOptions options) { auto vector = std::vector{}; vector.insert(vector.end(), set.begin(), set.end()); @@ -344,25 +344,25 @@ std::vector getDebugChildren( // `std::shared_ptr` template inline std::string getDebugDescription( - const std::shared_ptr &pointer, + const std::shared_ptr& pointer, DebugStringConvertibleOptions options) { - return getDebugDescription((void *)pointer.get(), options) + "(shared)"; + return getDebugDescription((void*)pointer.get(), options) + "(shared)"; } // `std::weak_ptr` template inline std::string getDebugDescription( - const std::weak_ptr &pointer, + const std::weak_ptr& pointer, DebugStringConvertibleOptions options) { - return getDebugDescription((void *)pointer.lock().get(), options) + "(weak)"; + return getDebugDescription((void*)pointer.lock().get(), options) + "(weak)"; } // `std::unique_ptr` template inline std::string getDebugDescription( - const std::unique_ptr &pointer, + const std::unique_ptr& pointer, DebugStringConvertibleOptions options) { - return getDebugDescription((void *)pointer.get(), options) + "(unique)"; + return getDebugDescription((void*)pointer.get(), options) + "(unique)"; } /* @@ -374,11 +374,11 @@ struct DebugStringConvertibleObject { std::string value; }; -inline std::string getDebugName(const DebugStringConvertibleObject &object) { +inline std::string getDebugName(const DebugStringConvertibleObject& object) { return object.name; } -inline std::string getDebugValue(const DebugStringConvertibleObject &object) { +inline std::string getDebugValue(const DebugStringConvertibleObject& object) { return object.value; } diff --git a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h index dd9e7903959..bd200e2041b 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/DebugStringConvertibleItem.h @@ -20,7 +20,7 @@ namespace facebook::react { // in custom implementations of `getDebugChildren` and `getDebugProps`. class DebugStringConvertibleItem : public DebugStringConvertible { public: - DebugStringConvertibleItem(const DebugStringConvertibleItem &item) = default; + DebugStringConvertibleItem(const DebugStringConvertibleItem& item) = default; DebugStringConvertibleItem( std::string name = "", diff --git a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h b/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h index f1579db8fc4..1208e3df6e5 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/SystraceSection.h @@ -37,8 +37,8 @@ struct ConcreteSystraceSection { public: template explicit ConcreteSystraceSection( - const char *name, - ConvertsToStringPiece &&...args) + const char* name, + ConvertsToStringPiece&&... args) : m_section(TRACE_TAG_REACT_CXX_BRIDGE, name, args...) {} private: @@ -50,8 +50,8 @@ struct DummySystraceSection { public: template explicit DummySystraceSection( - __unused const char *name, - __unused ConvertsToStringPiece &&...args) {} + __unused const char* name, + __unused ConvertsToStringPiece&&... args) {} }; using SystraceSection = DummySystraceSection; #endif diff --git a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h index 1101aeeb45d..e6372418c92 100644 --- a/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/debug/debugStringConvertibleUtils.h @@ -44,8 +44,8 @@ inline SharedDebugStringConvertible debugStringConvertibleItem( } inline SharedDebugStringConvertibleList operator+( - const SharedDebugStringConvertibleList &lhs, - const SharedDebugStringConvertibleList &rhs) { + const SharedDebugStringConvertibleList& lhs, + const SharedDebugStringConvertibleList& rhs) { auto result = SharedDebugStringConvertibleList{}; std::move(lhs.begin(), lhs.end(), std::back_inserter(result)); std::move(rhs.begin(), rhs.end(), std::back_inserter(result)); diff --git a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp index 9b787ca0a80..165b1cae778 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp +++ b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.cpp @@ -16,13 +16,13 @@ ComponentBuilder::ComponentBuilder( : componentDescriptorRegistry_(std::move(componentDescriptorRegistry)){}; ShadowNode::Unshared ComponentBuilder::build( - const ElementFragment &elementFragment) const { - auto &componentDescriptor = + const ElementFragment& elementFragment) const { + auto& componentDescriptor = componentDescriptorRegistry_->at(elementFragment.componentHandle); auto children = ShadowNode::ListOfShared{}; children.reserve(elementFragment.children.size()); - for (const auto &childFragment : elementFragment.children) { + for (const auto& childFragment : elementFragment.children) { children.push_back(build(childFragment)); } diff --git a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.h b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.h index 2028c26e6d0..a340bafc3f1 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.h +++ b/packages/react-native/ReactCommon/react/renderer/element/ComponentBuilder.h @@ -30,10 +30,10 @@ class ComponentBuilder final { /* * Copyable and movable. */ - ComponentBuilder(const ComponentBuilder &componentBuilder) = default; - ComponentBuilder(ComponentBuilder &&componentBuilder) noexcept = default; - ComponentBuilder &operator=(const ComponentBuilder &other) = default; - ComponentBuilder &operator=(ComponentBuilder &&other) = default; + ComponentBuilder(const ComponentBuilder& componentBuilder) = default; + ComponentBuilder(ComponentBuilder&& componentBuilder) noexcept = default; + ComponentBuilder& operator=(const ComponentBuilder& other) = default; + ComponentBuilder& operator=(ComponentBuilder&& other) = default; /* * Builds a `ShadowNode` tree with given `Element` tree using stored @@ -48,7 +48,7 @@ class ComponentBuilder final { /* * Internal, type-erased version of `build`. */ - ShadowNode::Unshared build(const ElementFragment &elementFragment) const; + ShadowNode::Unshared build(const ElementFragment& elementFragment) const; ComponentDescriptorRegistry::Shared componentDescriptorRegistry_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/element/Element.h b/packages/react-native/ReactCommon/react/renderer/element/Element.h index 3db756ebc1f..71e1bdf5511 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/Element.h +++ b/packages/react-native/ReactCommon/react/renderer/element/Element.h @@ -38,7 +38,7 @@ class Element final { using ConcreteUnsharedShadowNode = std::shared_ptr; using ConcreteReferenceCallback = - std::function &shadowNode)>; + std::function& shadowNode)>; /* * Constructs an `Element`. @@ -59,7 +59,7 @@ class Element final { /* * Sets `tag`. */ - Element &tag(Tag tag) { + Element& tag(Tag tag) { fragment_.tag = tag; return *this; } @@ -67,7 +67,7 @@ class Element final { /* * Sets `surfaceId`. */ - Element &surfaceId(SurfaceId surfaceId) { + Element& surfaceId(SurfaceId surfaceId) { fragment_.surfaceId = surfaceId; return *this; } @@ -75,7 +75,7 @@ class Element final { /* * Sets `props`. */ - Element &props(SharedConcreteProps props) { + Element& props(SharedConcreteProps props) { fragment_.props = props; return *this; } @@ -83,7 +83,7 @@ class Element final { /* * Sets `props` using callback. */ - Element &props(std::function callback) { + Element& props(std::function callback) { fragment_.props = callback(); return *this; } @@ -91,12 +91,12 @@ class Element final { /* * Sets `state` using callback. */ - Element &stateData(std::function callback) { + Element& stateData(std::function callback) { fragment_.stateCallback = [callback = std::move(callback)]( - const State::Shared &state) -> StateData::Shared { + const State::Shared& state) -> StateData::Shared { auto stateData = - static_cast(state.get())->getData(); + static_cast(state.get())->getData(); callback(stateData); return std::make_shared(stateData); }; @@ -106,10 +106,10 @@ class Element final { /* * Sets children. */ - Element &children(std::vector children) { + Element& children(std::vector children) { auto fragments = ElementFragment::List{}; fragments.reserve(children.size()); - for (const auto &child : children) { + for (const auto& child : children) { fragments.push_back(child); } fragment_.children = fragments; @@ -120,11 +120,11 @@ class Element final { * Calls the callback during component construction with a pointer to the * component which is being constructed. */ - Element &reference( - std::function + Element& reference( + std::function callback) { fragment_.referenceCallback = - [callback = std::move(callback)](const ShadowNode::Shared &shadowNode) { + [callback = std::move(callback)](const ShadowNode::Shared& shadowNode) { callback(std::const_pointer_cast( std::static_pointer_cast(shadowNode))); }; @@ -135,8 +135,8 @@ class Element final { * During component construction, assigns a given pointer to a component * that is being constructed. */ - Element &reference(ConcreteUnsharedShadowNode &outShadowNode) { - fragment_.referenceCallback = [&](const ShadowNode::Shared &shadowNode) { + Element& reference(ConcreteUnsharedShadowNode& outShadowNode) { + fragment_.referenceCallback = [&](const ShadowNode::Shared& shadowNode) { outShadowNode = std::const_pointer_cast( std::static_pointer_cast(shadowNode)); }; @@ -146,10 +146,10 @@ class Element final { /* * Calls the callback with a reference to a just constructed component. */ - Element &finalize( - std::function finalizeCallback) { - fragment_.finalizeCallback = [=](ShadowNode &shadowNode) { - return finalizeCallback(static_cast(shadowNode)); + Element& finalize( + std::function finalizeCallback) { + fragment_.finalizeCallback = [=](ShadowNode& shadowNode) { + return finalizeCallback(static_cast(shadowNode)); }; return *this; } diff --git a/packages/react-native/ReactCommon/react/renderer/element/ElementFragment.h b/packages/react-native/ReactCommon/react/renderer/element/ElementFragment.h index 36b0d146d24..0644cfbbae2 100644 --- a/packages/react-native/ReactCommon/react/renderer/element/ElementFragment.h +++ b/packages/react-native/ReactCommon/react/renderer/element/ElementFragment.h @@ -27,10 +27,10 @@ class ElementFragment final { using List = std::vector; using ListOfShared = std::vector; using ReferenceCallback = - std::function; - using FinalizeCallback = std::function; + std::function; + using FinalizeCallback = std::function; using StateCallback = - std::function; + std::function; /* * ComponentDescriptor part (describes the type) diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Color.cpp b/packages/react-native/ReactCommon/react/renderer/graphics/Color.cpp index e4d4e180fc9..8a2db873151 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Color.cpp +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Color.cpp @@ -9,7 +9,7 @@ namespace facebook::react { -bool isColorMeaningful(const SharedColor &color) noexcept { +bool isColorMeaningful(const SharedColor& color) noexcept { if (!color) { return false; } diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Color.h b/packages/react-native/ReactCommon/react/renderer/graphics/Color.h index 623fbe3722d..bf00b003678 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Color.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Color.h @@ -35,11 +35,11 @@ class SharedColor { return color_; } - bool operator==(const SharedColor &otherColor) const { + bool operator==(const SharedColor& otherColor) const { return color_ == otherColor.color_; } - bool operator!=(const SharedColor &otherColor) const { + bool operator!=(const SharedColor& otherColor) const { return color_ != otherColor.color_; } @@ -51,7 +51,7 @@ class SharedColor { Color color_; }; -bool isColorMeaningful(const SharedColor &color) noexcept; +bool isColorMeaningful(const SharedColor& color) noexcept; SharedColor colorFromComponents(ColorComponents components); ColorComponents colorComponentsFromColor(SharedColor color); diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Point.h b/packages/react-native/ReactCommon/react/renderer/graphics/Point.h index 146e17e62ba..85ffdefe55f 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Point.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Point.h @@ -21,38 +21,38 @@ struct Point { Float x{0}; Float y{0}; - Point &operator+=(const Point &point) noexcept { + Point& operator+=(const Point& point) noexcept { x += point.x; y += point.y; return *this; } - Point &operator-=(const Point &point) noexcept { + Point& operator-=(const Point& point) noexcept { x -= point.x; y -= point.y; return *this; } - Point &operator*=(const Point &point) noexcept { + Point& operator*=(const Point& point) noexcept { x *= point.x; y *= point.y; return *this; } - friend Point operator+(Point lhs, const Point &rhs) noexcept { + friend Point operator+(Point lhs, const Point& rhs) noexcept { return lhs += rhs; } - friend Point operator-(Point lhs, const Point &rhs) noexcept { + friend Point operator-(Point lhs, const Point& rhs) noexcept { return lhs -= rhs; } }; -inline bool operator==(const Point &rhs, const Point &lhs) noexcept { +inline bool operator==(const Point& rhs, const Point& lhs) noexcept { return std::tie(lhs.x, lhs.y) == std::tie(rhs.x, rhs.y); } -inline bool operator!=(const Point &rhs, const Point &lhs) noexcept { +inline bool operator!=(const Point& rhs, const Point& lhs) noexcept { return !(lhs == rhs); } @@ -62,7 +62,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::Point &point) const noexcept { + size_t operator()(const facebook::react::Point& point) const noexcept { return folly::hash::hash_combine(0, point.x, point.y); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h b/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h index ace417e5c47..3061a029c30 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Rect.h @@ -24,11 +24,11 @@ struct Rect { Point origin{0, 0}; Size size{0, 0}; - bool operator==(const Rect &rhs) const noexcept { + bool operator==(const Rect& rhs) const noexcept { return std::tie(this->origin, this->size) == std::tie(rhs.origin, rhs.size); } - bool operator!=(const Rect &rhs) const noexcept { + bool operator!=(const Rect& rhs) const noexcept { return !(*this == rhs); } @@ -54,7 +54,7 @@ struct Rect { return {getMidX(), getMidY()}; } - void unionInPlace(const Rect &rect) noexcept { + void unionInPlace(const Rect& rect) noexcept { auto x1 = std::min(getMinX(), rect.getMinX()); auto y1 = std::min(getMinY(), rect.getMinY()); auto x2 = std::max(getMaxX(), rect.getMaxX()); @@ -69,7 +69,7 @@ struct Rect { point.y <= (origin.y + size.height); } - static Rect intersect(const Rect &rect1, const Rect &rect2) { + static Rect intersect(const Rect& rect1, const Rect& rect2) { Float x1 = std::max(rect1.origin.x, rect2.origin.x); Float y1 = std::max(rect1.origin.y, rect2.origin.y); Float x2 = std::min( @@ -88,10 +88,10 @@ struct Rect { } static Rect boundingRect( - const Point &a, - const Point &b, - const Point &c, - const Point &d) noexcept { + const Point& a, + const Point& b, + const Point& c, + const Point& d) noexcept { auto leftTopPoint = a; auto rightBottomPoint = a; @@ -124,7 +124,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::Rect &rect) const noexcept { + size_t operator()(const facebook::react::Rect& rect) const noexcept { return folly::hash::hash_combine(0, rect.origin, rect.size); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h index 8fe39215b44..f3584629d51 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleCorners.h @@ -25,7 +25,7 @@ struct RectangleCorners { T bottomLeft{}; T bottomRight{}; - bool operator==(const RectangleCorners &rhs) const noexcept { + bool operator==(const RectangleCorners& rhs) const noexcept { return std::tie( this->topLeft, this->topRight, @@ -34,7 +34,7 @@ struct RectangleCorners { std::tie(rhs.topLeft, rhs.topRight, rhs.bottomLeft, rhs.bottomRight); } - bool operator!=(const RectangleCorners &rhs) const noexcept { + bool operator!=(const RectangleCorners& rhs) const noexcept { return !(*this == rhs); } @@ -56,7 +56,7 @@ namespace std { template struct hash> { size_t operator()( - const facebook::react::RectangleCorners &corners) const noexcept { + const facebook::react::RectangleCorners& corners) const noexcept { return folly::hash::hash_combine( 0, corners.topLeft, diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h index fbcc949427b..332ee21778d 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/RectangleEdges.h @@ -26,12 +26,12 @@ struct RectangleEdges { T right{}; T bottom{}; - bool operator==(const RectangleEdges &rhs) const noexcept { + bool operator==(const RectangleEdges& rhs) const noexcept { return std::tie(this->left, this->top, this->right, this->bottom) == std::tie(rhs.left, rhs.top, rhs.right, rhs.bottom); } - bool operator!=(const RectangleEdges &rhs) const noexcept { + bool operator!=(const RectangleEdges& rhs) const noexcept { return !(*this == rhs); } @@ -47,8 +47,8 @@ const RectangleEdges RectangleEdges::ZERO = {}; template RectangleEdges operator+( - const RectangleEdges &lhs, - const RectangleEdges &rhs) noexcept { + const RectangleEdges& lhs, + const RectangleEdges& rhs) noexcept { return RectangleEdges{ lhs.left + rhs.left, lhs.top + rhs.top, @@ -58,8 +58,8 @@ RectangleEdges operator+( template RectangleEdges operator-( - const RectangleEdges &lhs, - const RectangleEdges &rhs) noexcept { + const RectangleEdges& lhs, + const RectangleEdges& rhs) noexcept { return RectangleEdges{ lhs.left - rhs.left, lhs.top - rhs.top, @@ -75,7 +75,7 @@ using EdgeInsets = RectangleEdges; /* * Adjusts a rectangle by the given edge insets. */ -inline Rect insetBy(const Rect &rect, const EdgeInsets &insets) noexcept { +inline Rect insetBy(const Rect& rect, const EdgeInsets& insets) noexcept { return Rect{ {rect.origin.x + insets.left, rect.origin.y + insets.top}, {rect.size.width - insets.left - insets.right, @@ -85,7 +85,7 @@ inline Rect insetBy(const Rect &rect, const EdgeInsets &insets) noexcept { /* * Adjusts a rectangle by the given edge outsets. */ -inline Rect outsetBy(const Rect &rect, const EdgeInsets &outsets) noexcept { +inline Rect outsetBy(const Rect& rect, const EdgeInsets& outsets) noexcept { return Rect{ {rect.origin.x - outsets.left, rect.origin.y - outsets.top}, {rect.size.width + outsets.left + outsets.right, @@ -99,7 +99,7 @@ namespace std { template struct hash> { size_t operator()( - const facebook::react::RectangleEdges &edges) const noexcept { + const facebook::react::RectangleEdges& edges) const noexcept { return folly::hash::hash_combine( 0, edges.left, edges.right, edges.top, edges.bottom); } diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Size.h b/packages/react-native/ReactCommon/react/renderer/graphics/Size.h index a9dacc7f811..4ab260fd757 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Size.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Size.h @@ -22,24 +22,24 @@ struct Size { Float width{0}; Float height{0}; - Size &operator+=(const Point &point) noexcept { + Size& operator+=(const Point& point) noexcept { width += point.x; height += point.y; return *this; } - Size &operator*=(const Point &point) noexcept { + Size& operator*=(const Point& point) noexcept { width *= point.x; height *= point.y; return *this; } }; -inline bool operator==(const Size &rhs, const Size &lhs) noexcept { +inline bool operator==(const Size& rhs, const Size& lhs) noexcept { return std::tie(lhs.width, lhs.height) == std::tie(rhs.width, rhs.height); } -inline bool operator!=(const Size &rhs, const Size &lhs) noexcept { +inline bool operator!=(const Size& rhs, const Size& lhs) noexcept { return !(lhs == rhs); } @@ -49,7 +49,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::Size &size) const { + size_t operator()(const facebook::react::Size& size) const { return folly::hash::hash_combine(0, size.width, size.height); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp index e3daf74dc4b..3cd227e0292 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.cpp @@ -15,7 +15,7 @@ namespace facebook::react { #if RN_DEBUG_STRING_CONVERTIBLE -void Transform::print(const Transform &t, std::string prefix) { +void Transform::print(const Transform& t, std::string prefix) { LOG(ERROR) << prefix << "[ " << t.matrix[0] << " " << t.matrix[1] << " " << t.matrix[2] << " " << t.matrix[3] << " ]"; LOG(ERROR) << prefix << "[ " << t.matrix[4] << " " << t.matrix[5] << " " @@ -191,8 +191,8 @@ TransformOperation Transform::DefaultTransformOperation( Transform Transform::Interpolate( Float animationProgress, - const Transform &lhs, - const Transform &rhs) { + const Transform& lhs, + const Transform& rhs) { // Iterate through operations and reconstruct an interpolated resulting // transform If at any point we hit an "Arbitrary" Transform, return at that // point @@ -248,15 +248,15 @@ Transform Transform::Interpolate( return result; } -bool Transform::isVerticalInversion(const Transform &transform) { +bool Transform::isVerticalInversion(const Transform& transform) { return transform.at(1, 1) == -1; } -bool Transform::isHorizontalInversion(const Transform &transform) { +bool Transform::isHorizontalInversion(const Transform& transform) { return transform.at(0, 0) == -1; } -bool Transform::operator==(const Transform &rhs) const { +bool Transform::operator==(const Transform& rhs) const { for (auto i = 0; i < 16; i++) { if (matrix[i] != rhs.matrix[i]) { return false; @@ -265,25 +265,25 @@ bool Transform::operator==(const Transform &rhs) const { return true; } -bool Transform::operator!=(const Transform &rhs) const { +bool Transform::operator!=(const Transform& rhs) const { return !(*this == rhs); } -Transform Transform::operator*(const Transform &rhs) const { +Transform Transform::operator*(const Transform& rhs) const { if (*this == Transform::Identity()) { return rhs; } - const auto &lhs = *this; + const auto& lhs = *this; auto result = Transform{}; - for (const auto &op : this->operations) { + for (const auto& op : this->operations) { if (op.type == TransformOperationType::Identity && !result.operations.empty()) { continue; } result.operations.push_back(op); } - for (const auto &op : rhs.operations) { + for (const auto& op : rhs.operations) { if (op.type == TransformOperationType::Identity && !result.operations.empty()) { continue; @@ -347,15 +347,15 @@ Transform Transform::operator*(const Transform &rhs) const { return result; } -Float &Transform::at(int i, int j) { +Float& Transform::at(int i, int j) { return matrix[(i * 4) + j]; } -const Float &Transform::at(int i, int j) const { +const Float& Transform::at(int i, int j) const { return matrix[(i * 4) + j]; } -Point operator*(const Point &point, const Transform &transform) { +Point operator*(const Point& point, const Transform& transform) { if (transform == Transform::Identity()) { return point; } @@ -365,12 +365,12 @@ Point operator*(const Point &point, const Transform &transform) { return {result.x, result.y}; } -Rect operator*(const Rect &rect, const Transform &transform) { +Rect operator*(const Rect& rect, const Transform& transform) { auto center = rect.getCenter(); return transform.applyWithCenter(rect, center); } -Rect Transform::applyWithCenter(const Rect &rect, const Point ¢er) const { +Rect Transform::applyWithCenter(const Rect& rect, const Point& center) const { auto a = Point{rect.origin.x, rect.origin.y} - center; auto b = Point{rect.getMaxX(), rect.origin.y} - center; auto c = Point{rect.getMaxX(), rect.getMaxY()} - center; @@ -390,7 +390,7 @@ Rect Transform::applyWithCenter(const Rect &rect, const Point ¢er) const { transformedA, transformedB, transformedC, transformedD); } -EdgeInsets operator*(const EdgeInsets &edgeInsets, const Transform &transform) { +EdgeInsets operator*(const EdgeInsets& edgeInsets, const Transform& transform) { return EdgeInsets{ edgeInsets.left * transform.matrix[0], edgeInsets.top * transform.matrix[5], @@ -398,7 +398,7 @@ EdgeInsets operator*(const EdgeInsets &edgeInsets, const Transform &transform) { edgeInsets.bottom * transform.matrix[5]}; } -Vector operator*(const Transform &transform, const Vector &vector) { +Vector operator*(const Transform& transform, const Vector& vector) { return { vector.x * transform.at(0, 0) + vector.y * transform.at(1, 0) + vector.z * transform.at(2, 0) + vector.w * transform.at(3, 0), @@ -411,7 +411,7 @@ Vector operator*(const Transform &transform, const Vector &vector) { }; } -Size operator*(const Size &size, const Transform &transform) { +Size operator*(const Size& size, const Transform& transform) { if (transform == Transform::Identity()) { return size; } diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h index 4df5e1fb3da..bdf8028833e 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/Transform.h @@ -56,10 +56,10 @@ struct TransformOrigin { std::array xy; float z = 0.0f; - bool operator==(const TransformOrigin &other) const { + bool operator==(const TransformOrigin& other) const { return xy[0] == other.xy[0] && xy[1] == other.xy[1] && z == other.z; } - bool operator!=(const TransformOrigin &other) const { + bool operator!=(const TransformOrigin& other) const { return !(*this == other); } bool isSet() const { @@ -81,7 +81,7 @@ struct Transform { * For debugging only. Prints out the matrix. */ #if RN_DEBUG_STRING_CONVERTIBLE - static void print(const Transform &t, std::string prefix); + static void print(const Transform& t, std::string prefix); #endif /* @@ -150,30 +150,30 @@ struct Transform { */ static Transform Interpolate( Float animationProgress, - const Transform &lhs, - const Transform &rhs); + const Transform& lhs, + const Transform& rhs); - static bool isVerticalInversion(const Transform &transform); - static bool isHorizontalInversion(const Transform &transform); + static bool isVerticalInversion(const Transform& transform); + static bool isHorizontalInversion(const Transform& transform); /* * Equality operators. */ - bool operator==(const Transform &rhs) const; - bool operator!=(const Transform &rhs) const; + bool operator==(const Transform& rhs) const; + bool operator!=(const Transform& rhs) const; /* * Matrix subscript. */ - Float &at(int i, int j); - const Float &at(int i, int j) const; + Float& at(int i, int j); + const Float& at(int i, int j) const; /* * Concatenates (multiplies) transform matrices. */ - Transform operator*(const Transform &rhs) const; + Transform operator*(const Transform& rhs) const; - Rect applyWithCenter(const Rect &rect, const Point ¢er) const; + Rect applyWithCenter(const Rect& rect, const Point& center) const; /** * Convert to folly::dynamic. @@ -204,26 +204,26 @@ struct Transform { /* * Applies transformation to the given point. */ -Point operator*(const Point &point, const Transform &transform); +Point operator*(const Point& point, const Transform& transform); /* * Applies transformation to the given size. */ -Size operator*(const Size &size, const Transform &transform); +Size operator*(const Size& size, const Transform& transform); /* * Applies transformation to the given rect. * ONLY SUPPORTS scale and translation transformation. */ -Rect operator*(const Rect &rect, const Transform &transform); +Rect operator*(const Rect& rect, const Transform& transform); /* * Applies transformation to the given EdgeInsets. * ONLY SUPPORTS scale transformation. */ -EdgeInsets operator*(const EdgeInsets &edgeInsets, const Transform &transform); +EdgeInsets operator*(const EdgeInsets& edgeInsets, const Transform& transform); -Vector operator*(const Transform &transform, const Vector &vector); +Vector operator*(const Transform& transform, const Vector& vector); } // namespace facebook::react @@ -231,7 +231,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::Transform &transform) const { + size_t operator()(const facebook::react::Transform& transform) const { return folly::hash::hash_combine( 0, transform.matrix[0], diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/ValueUnit.h b/packages/react-native/ReactCommon/react/renderer/graphics/ValueUnit.h index 73b55ee10dc..6d0d535c3b8 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/ValueUnit.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/ValueUnit.h @@ -22,10 +22,10 @@ struct ValueUnit { ValueUnit() = default; ValueUnit(float v, UnitType u) : value(v), unit(u) {} - bool operator==(const ValueUnit &other) const { + bool operator==(const ValueUnit& other) const { return value == other.value && unit == other.unit; } - bool operator!=(const ValueUnit &other) const { + bool operator!=(const ValueUnit& other) const { return !(*this == other); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h index 5485575921a..07acf035f01 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/android/react/renderer/graphics/PlatformColorParser.h @@ -15,12 +15,12 @@ namespace facebook::react { inline SharedColor parsePlatformColor( - const PropsParserContext &context, - const RawValue &value) { + const PropsParserContext& context, + const RawValue& value) { ColorComponents colorComponents = {0, 0, 0, 0}; if (value.hasType>>()) { - const auto &fabricUIManager = + const auto& fabricUIManager = context.contextContainer.at>( "FabricUIManager"); static auto getColorFromJava = @@ -28,7 +28,7 @@ inline SharedColor parsePlatformColor( ->getMethod)>("getColor"); auto map = (butter::map>)value; - auto &resourcePaths = map["resource_paths"]; + auto& resourcePaths = map["resource_paths"]; auto javaResourcePaths = jni::JArrayClass::newArray(resourcePaths.size()); diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h index bc7d988794e..698b6b16d15 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/cxx/react/renderer/graphics/PlatformColorParser.h @@ -14,8 +14,8 @@ namespace facebook::react { inline SharedColor parsePlatformColor( - const PropsParserContext &context, - const RawValue &value) { + const PropsParserContext& context, + const RawValue& value) { float alpha = 0; float red = 0; float green = 0; diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h index 4f4bc6a4451..e887e02807f 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/PlatformColorParser.h @@ -15,8 +15,8 @@ namespace facebook::react { inline SharedColor parsePlatformColor( - const PropsParserContext &context, - const RawValue &value) { + const PropsParserContext& context, + const RawValue& value) { if (value.hasType>()) { auto items = (butter::map)value; if (items.find("semantic") != items.end() && diff --git a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h index 64eab12620b..397fcde6b59 100644 --- a/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/graphics/platform/ios/react/renderer/graphics/RCTPlatformColorUtils.h @@ -9,4 +9,4 @@ #include facebook::react::ColorComponents RCTPlatformColorComponentsFromSemanticItems( - std::vector &semanticItems); + std::vector& semanticItems); diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h index 02555f2fc6d..600e4b3d991 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageManager.h @@ -25,14 +25,14 @@ using SharedImageManager = std::shared_ptr; */ class ImageManager { public: - ImageManager(const ContextContainer::Shared &contextContainer); + ImageManager(const ContextContainer::Shared& contextContainer); ~ImageManager(); - ImageRequest requestImage(const ImageSource &imageSource, SurfaceId surfaceId) + ImageRequest requestImage(const ImageSource& imageSource, SurfaceId surfaceId) const; private: - void *self_{}; + void* self_{}; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h index 5853c97cd8e..22e7c41497e 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageRequest.h @@ -36,12 +36,12 @@ class ImageRequest final { /* * The move constructor. */ - ImageRequest(ImageRequest &&other) noexcept = default; + ImageRequest(ImageRequest&& other) noexcept = default; /* * `ImageRequest` does not support copying by design. */ - ImageRequest(const ImageRequest &other) = delete; + ImageRequest(const ImageRequest& other) = delete; /* * Calls cancel function if one is defined. Should be when downloading @@ -52,27 +52,27 @@ class ImageRequest final { /* * Returns the Image Source associated with the request. */ - const ImageSource &getImageSource() const; + const ImageSource& getImageSource() const; /* * Returns stored observer coordinator as a shared pointer. * Retain this *or* `ImageRequest` to ensure a correct lifetime of the object. */ - const std::shared_ptr - &getSharedObserverCoordinator() const; + const std::shared_ptr& + getSharedObserverCoordinator() const; /* * Returns stored observer coordinator as a reference. * Use this if a correct lifetime of the object is ensured in some other way * (e.g. by retaining an `ImageRequest`). */ - const ImageResponseObserverCoordinator &getObserverCoordinator() const; + const ImageResponseObserverCoordinator& getObserverCoordinator() const; /* * Returns stored image telemetry object as a shared pointer. * Retain this *or* `ImageRequest` to ensure a correct lifetime of the object. */ - const std::shared_ptr &getSharedTelemetry() const; + const std::shared_ptr& getSharedTelemetry() const; private: /* diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h index eb88941c1c3..2e67a857757 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserver.h @@ -20,7 +20,7 @@ class ImageResponseObserver { virtual ~ImageResponseObserver() noexcept = default; virtual void didReceiveProgress(float progress) const = 0; - virtual void didReceiveImage(const ImageResponse &imageResponse) const = 0; + virtual void didReceiveImage(const ImageResponse& imageResponse) const = 0; virtual void didReceiveFailure() const = 0; }; diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp index b27f90713e8..cfe0a9b258a 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.cpp @@ -14,7 +14,7 @@ namespace facebook::react { void ImageResponseObserverCoordinator::addObserver( - const ImageResponseObserver &observer) const { + const ImageResponseObserver& observer) const { mutex_.lock(); switch (status_) { case ImageResponse::Status::Loading: { @@ -38,7 +38,7 @@ void ImageResponseObserverCoordinator::addObserver( } void ImageResponseObserverCoordinator::removeObserver( - const ImageResponseObserver &observer) const { + const ImageResponseObserver& observer) const { std::scoped_lock lock(mutex_); // We remove only one element to maintain a balance between add/remove calls. @@ -61,7 +61,7 @@ void ImageResponseObserverCoordinator::nativeImageResponseProgress( } void ImageResponseObserverCoordinator::nativeImageResponseComplete( - const ImageResponse &imageResponse) const { + const ImageResponse& imageResponse) const { mutex_.lock(); imageData_ = imageResponse.getImage(); imageMetadata_ = imageResponse.getMetadata(); diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h index eeed165c9b4..df5b26d7563 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/ImageResponseObserverCoordinator.h @@ -29,12 +29,12 @@ class ImageResponseObserverCoordinator { * If the current image request status is not equal to `Loading`, the observer * will be called immediately. */ - void addObserver(const ImageResponseObserver &observer) const; + void addObserver(const ImageResponseObserver& observer) const; /* * Interested parties may stop observing the image response. */ - void removeObserver(const ImageResponseObserver &observer) const; + void removeObserver(const ImageResponseObserver& observer) const; /* * Platform-specific image loader will call this method with progress updates. @@ -45,7 +45,7 @@ class ImageResponseObserverCoordinator { * Platform-specific image loader will call this method with a completed image * response. */ - void nativeImageResponseComplete(const ImageResponse &imageResponse) const; + void nativeImageResponseComplete(const ImageResponse& imageResponse) const; /* * Platform-specific image loader will call this method in case of any @@ -58,7 +58,7 @@ class ImageResponseObserverCoordinator { * List of observers. * Mutable: protected by mutex_. */ - mutable butter::small_vector observers_; + mutable butter::small_vector observers_; /* * Current status of image loading. diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp index b22515c60aa..0544bd63697 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp @@ -10,7 +10,7 @@ namespace facebook::react { ImageManager::ImageManager( - const ContextContainer::Shared & /*contextContainer*/) { + const ContextContainer::Shared& /*contextContainer*/) { // Silence unused-private-field warning. (void)self_; // Not implemented. @@ -21,7 +21,7 @@ ImageManager::~ImageManager() { } ImageRequest ImageManager::requestImage( - const ImageSource &imageSource, + const ImageSource& imageSource, SurfaceId /*surfaceId*/) const { // Not implemented. return {imageSource, nullptr, {}}; diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp index 6a5c1341830..7974e06a2c1 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp @@ -21,14 +21,14 @@ ImageRequest::ImageRequest( // Not implemented. } -const ImageResponseObserverCoordinator &ImageRequest::getObserverCoordinator() +const ImageResponseObserverCoordinator& ImageRequest::getObserverCoordinator() const { // Not implemented abort(); } -const std::shared_ptr - &ImageRequest::getSharedObserverCoordinator() const { +const std::shared_ptr& +ImageRequest::getSharedObserverCoordinator() const { // Not implemented abort(); } diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp index 2c1e009a58e..829418e8a70 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp @@ -23,22 +23,22 @@ void ImageRequest::cancel() const { cancelRequest_(); } -const ImageSource &ImageRequest::getImageSource() const { +const ImageSource& ImageRequest::getImageSource() const { return imageSource_; } -const std::shared_ptr &ImageRequest::getSharedTelemetry() +const std::shared_ptr& ImageRequest::getSharedTelemetry() const { return telemetry_; } -const ImageResponseObserverCoordinator &ImageRequest::getObserverCoordinator() +const ImageResponseObserverCoordinator& ImageRequest::getObserverCoordinator() const { return *coordinator_; } -const std::shared_ptr - &ImageRequest::getSharedObserverCoordinator() const { +const std::shared_ptr& +ImageRequest::getSharedObserverCoordinator() const { return coordinator_; } diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h index b3014de5442..00ca6f5d485 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/primitives.h @@ -25,11 +25,11 @@ class ImageSource { Float scale{3}; Size size{0}; - bool operator==(const ImageSource &rhs) const { + bool operator==(const ImageSource& rhs) const { return std::tie(this->type, this->uri) == std::tie(rhs.type, rhs.uri); } - bool operator!=(const ImageSource &rhs) const { + bool operator!=(const ImageSource& rhs) const { return !(*this == rhs); } }; diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp b/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp index ce1de521778..9cd62548674 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.cpp @@ -18,7 +18,7 @@ LeakChecker::LeakChecker(RuntimeExecutor runtimeExecutor) : runtimeExecutor_(std::move(runtimeExecutor)) {} void LeakChecker::uiManagerDidCreateShadowNodeFamily( - const ShadowNodeFamily::Shared &shadowNodeFamily) const { + const ShadowNodeFamily::Shared& shadowNodeFamily) const { registry_.add(shadowNodeFamily); } @@ -27,7 +27,7 @@ void LeakChecker::stopSurface(SurfaceId surfaceId) { // Dispatch the check onto JavaScript thread to make sure all other // cleanup code has had chance to run. runtimeExecutor_([previouslyStoppedSurface = previouslyStoppedSurface_, - this](jsi::Runtime &runtime) { + this](jsi::Runtime& runtime) { runtime.instrumentation().collectGarbage("LeakChecker"); // For now check the previous surface because React uses double // buffering which keeps the surface that was just stopped in @@ -43,7 +43,7 @@ void LeakChecker::stopSurface(SurfaceId surfaceId) { void LeakChecker::checkSurfaceForLeaks(SurfaceId surfaceId) const { auto weakFamilies = registry_.weakFamiliesForSurfaceId(surfaceId); unsigned int numberOfLeaks = 0; - for (const auto &weakFamily : weakFamilies) { + for (const auto& weakFamily : weakFamilies) { auto strong = weakFamily.lock(); if (strong) { ++numberOfLeaks; diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.h b/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.h index d6192290c1b..a967ed7bf40 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.h +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/LeakChecker.h @@ -22,7 +22,7 @@ class LeakChecker final { LeakChecker(RuntimeExecutor runtimeExecutor); void uiManagerDidCreateShadowNodeFamily( - const ShadowNodeFamily::Shared &shadowNodeFamily) const; + const ShadowNodeFamily::Shared& shadowNodeFamily) const; void stopSurface(SurfaceId surfaceId); private: diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp b/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp index 63971217a95..f09ef9a7748 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.cpp @@ -10,7 +10,7 @@ namespace facebook::react { void WeakFamilyRegistry::add( - const ShadowNodeFamily::Shared &shadowNodeFamily) const { + const ShadowNodeFamily::Shared& shadowNodeFamily) const { std::scoped_lock lock(familiesMutex_); ShadowNodeFamily::Weak weakFamily = shadowNodeFamily; families_[shadowNodeFamily->getSurfaceId()].push_back(weakFamily); diff --git a/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h b/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h index 18f18811a5e..474d97da7ae 100644 --- a/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/leakchecker/WeakFamilyRegistry.h @@ -18,7 +18,7 @@ class WeakFamilyRegistry final { public: using WeakFamilies = std::vector; - void add(const ShadowNodeFamily::Shared &shadowNodeFamily) const; + void add(const ShadowNodeFamily::Shared& shadowNodeFamily) const; void removeFamiliesWithSurfaceId(SurfaceId surfaceId) const; WeakFamilies weakFamiliesForSurfaceId(SurfaceId surfaceId) const; diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp index c6425d27479..8a46d17fa3b 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp @@ -22,7 +22,7 @@ static inline int32_t valueOffset(int32_t bucketIndex) { // TODO T83483191: Extend MapBuffer C++ implementation to support basic random // access MapBuffer::MapBuffer(std::vector data) : bytes_(std::move(data)) { - auto header = reinterpret_cast(bytes_.data()); + auto header = reinterpret_cast(bytes_.data()); count_ = header->count; if (header->bufferSize != bytes_.size()) { @@ -39,7 +39,7 @@ int32_t MapBuffer::getKeyBucket(Key key) const { int32_t mid = (lo + hi) >> 1; Key midVal = - *reinterpret_cast(bytes_.data() + bucketOffset(mid)); + *reinterpret_cast(bytes_.data() + bucketOffset(mid)); if (midVal < key) { lo = mid + 1; @@ -57,7 +57,7 @@ int32_t MapBuffer::getInt(Key key) const { auto bucketIndex = getKeyBucket(key); react_native_assert(bucketIndex != -1 && "Key not found in MapBuffer"); - return *reinterpret_cast( + return *reinterpret_cast( bytes_.data() + valueOffset(bucketIndex)); } @@ -69,7 +69,7 @@ double MapBuffer::getDouble(Key key) const { auto bucketIndex = getKeyBucket(key); react_native_assert(bucketIndex != -1 && "Key not found in MapBuffer"); - return *reinterpret_cast( + return *reinterpret_cast( bytes_.data() + valueOffset(bucketIndex)); } @@ -84,9 +84,9 @@ std::string MapBuffer::getString(Key key) const { // of the map buffer int32_t dynamicDataOffset = getDynamicDataOffset(); int32_t offset = getInt(key); - int32_t stringLength = *reinterpret_cast( + int32_t stringLength = *reinterpret_cast( bytes_.data() + dynamicDataOffset + offset); - const uint8_t *stringPtr = + const uint8_t* stringPtr = bytes_.data() + dynamicDataOffset + offset + sizeof(int); return {stringPtr, stringPtr + stringLength}; @@ -98,7 +98,7 @@ MapBuffer MapBuffer::getMapBuffer(Key key) const { int32_t dynamicDataOffset = getDynamicDataOffset(); int32_t offset = getInt(key); - int32_t mapBufferLength = *reinterpret_cast( + int32_t mapBufferLength = *reinterpret_cast( bytes_.data() + dynamicDataOffset + offset); std::vector value(mapBufferLength); @@ -116,13 +116,13 @@ std::vector MapBuffer::getMapBufferList(MapBuffer::Key key) const { int32_t dynamicDataOffset = getDynamicDataOffset(); int32_t offset = getInt(key); - int32_t mapBufferListLength = *reinterpret_cast( + int32_t mapBufferListLength = *reinterpret_cast( bytes_.data() + dynamicDataOffset + offset); offset = offset + sizeof(uint32_t); int32_t curLen = 0; while (curLen < mapBufferListLength) { - int32_t mapBufferLength = *reinterpret_cast( + int32_t mapBufferLength = *reinterpret_cast( bytes_.data() + dynamicDataOffset + offset + curLen); curLen = curLen + sizeof(uint32_t); std::vector value(mapBufferLength); @@ -140,7 +140,7 @@ size_t MapBuffer::size() const { return bytes_.size(); } -const uint8_t *MapBuffer::data() const { +const uint8_t* MapBuffer::data() const { return bytes_.data(); } diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h index 4b1673654bd..1efe45cf063 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBuffer.h @@ -108,13 +108,13 @@ class MapBuffer { explicit MapBuffer(std::vector data); - MapBuffer(const MapBuffer &buffer) = delete; + MapBuffer(const MapBuffer& buffer) = delete; - MapBuffer &operator=(const MapBuffer &other) = delete; + MapBuffer& operator=(const MapBuffer& other) = delete; - MapBuffer(MapBuffer &&buffer) = default; + MapBuffer(MapBuffer&& buffer) = default; - MapBuffer &operator=(MapBuffer &&other) = default; + MapBuffer& operator=(MapBuffer&& other) = default; int32_t getInt(MapBuffer::Key key) const; @@ -131,7 +131,7 @@ class MapBuffer { size_t size() const; - const uint8_t *data() const; + const uint8_t* data() const; uint16_t count() const; diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp index 89979dc2381..e2ca2d57f43 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.cpp @@ -29,7 +29,7 @@ MapBufferBuilder::MapBufferBuilder(uint32_t initialSize) { void MapBufferBuilder::storeKeyValue( MapBuffer::Key key, MapBuffer::DataType type, - const uint8_t *value, + const uint8_t* value, uint32_t valueSize) { if (valueSize > MAX_BUCKET_VALUE_SIZE) { LOG(ERROR) << "Error: size of value must be <= MAX_VALUE_SIZE. ValueSize: " @@ -38,7 +38,7 @@ void MapBufferBuilder::storeKeyValue( } uint64_t data = 0; - auto *dataPtr = reinterpret_cast(&data); + auto* dataPtr = reinterpret_cast(&data); memcpy(dataPtr, value, valueSize); buckets_.emplace_back(key, static_cast(type), data); @@ -56,7 +56,7 @@ void MapBufferBuilder::putBool(MapBuffer::Key key, bool value) { storeKeyValue( key, MapBuffer::DataType::Boolean, - reinterpret_cast(&intValue), + reinterpret_cast(&intValue), INT_SIZE); } @@ -64,7 +64,7 @@ void MapBufferBuilder::putDouble(MapBuffer::Key key, double value) { storeKeyValue( key, MapBuffer::DataType::Double, - reinterpret_cast(&value), + reinterpret_cast(&value), DOUBLE_SIZE); } @@ -72,13 +72,13 @@ void MapBufferBuilder::putInt(MapBuffer::Key key, int32_t value) { storeKeyValue( key, MapBuffer::DataType::Int, - reinterpret_cast(&value), + reinterpret_cast(&value), INT_SIZE); } -void MapBufferBuilder::putString(MapBuffer::Key key, const std::string &value) { +void MapBufferBuilder::putString(MapBuffer::Key key, const std::string& value) { auto strSize = value.size(); - const char *strData = value.data(); + const char* strData = value.data(); // format [length of string (int)] + [Array of Characters in the string] auto offset = dynamicData_.size(); @@ -90,11 +90,11 @@ void MapBufferBuilder::putString(MapBuffer::Key key, const std::string &value) { storeKeyValue( key, MapBuffer::DataType::String, - reinterpret_cast(&offset), + reinterpret_cast(&offset), INT_SIZE); } -void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, const MapBuffer &map) { +void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, const MapBuffer& map) { auto mapBufferSize = map.size(); auto offset = dynamicData_.size(); @@ -109,23 +109,23 @@ void MapBufferBuilder::putMapBuffer(MapBuffer::Key key, const MapBuffer &map) { storeKeyValue( key, MapBuffer::DataType::Map, - reinterpret_cast(&offset), + reinterpret_cast(&offset), INT_SIZE); } void MapBufferBuilder::putMapBufferList( MapBuffer::Key key, - const std::vector &mapBufferList) { + const std::vector& mapBufferList) { int32_t offset = dynamicData_.size(); int32_t dataSize = 0; - for (const MapBuffer &mapBuffer : mapBufferList) { + for (const MapBuffer& mapBuffer : mapBufferList) { dataSize = dataSize + INT_SIZE + mapBuffer.size(); } dynamicData_.resize(offset + INT_SIZE, 0); memcpy(dynamicData_.data() + offset, &dataSize, INT_SIZE); - for (const MapBuffer &mapBuffer : mapBufferList) { + for (const MapBuffer& mapBuffer : mapBufferList) { int32_t mapBufferSize = mapBuffer.size(); int32_t dynamicDataSize = dynamicData_.size(); dynamicData_.resize(dynamicDataSize + INT_SIZE + mapBufferSize, 0); @@ -142,13 +142,13 @@ void MapBufferBuilder::putMapBufferList( storeKeyValue( key, MapBuffer::DataType::Map, - reinterpret_cast(&offset), + reinterpret_cast(&offset), INT_SIZE); } static inline bool compareBuckets( - const MapBuffer::Bucket &a, - const MapBuffer::Bucket &b) { + const MapBuffer::Bucket& a, + const MapBuffer::Bucket& b) { return a.key < b.key; } diff --git a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h index 61099f83c84..0b26e915aea 100644 --- a/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h +++ b/packages/react-native/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h @@ -31,13 +31,13 @@ class MapBufferBuilder { void putDouble(MapBuffer::Key key, double value); - void putString(MapBuffer::Key key, const std::string &value); + void putString(MapBuffer::Key key, const std::string& value); - void putMapBuffer(MapBuffer::Key key, const MapBuffer &map); + void putMapBuffer(MapBuffer::Key key, const MapBuffer& map); void putMapBufferList( MapBuffer::Key key, - const std::vector &mapBufferList); + const std::vector& mapBufferList); MapBuffer build(); @@ -55,7 +55,7 @@ class MapBufferBuilder { void storeKeyValue( MapBuffer::Key key, MapBuffer::DataType type, - const uint8_t *value, + const uint8_t* value, uint32_t valueSize); }; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp index 3bf564971e5..5e925065436 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.cpp @@ -31,7 +31,7 @@ enum class NoBreadcrumb {}; -#define BREADCRUMB_TYPE const NoBreadcrumb & +#define BREADCRUMB_TYPE const NoBreadcrumb& #define DIFF_BREADCRUMB(X) \ {} #define CREATE_DIFF_BREADCRUMB(X) \ @@ -66,7 +66,7 @@ template class TinyMap final { public: using Pair = std::pair; - using Iterator = Pair *; + using Iterator = Pair*; /** * This must strictly only be called from outside of this class. @@ -160,7 +160,7 @@ class TinyMap final { std::remove_if( vector_.begin(), vector_.end(), - [](const auto &item) { return item.first == 0; }), + [](const auto& item) { return item.first == 0; }), vector_.end()); } numErased_ = 0; @@ -176,8 +176,8 @@ class TinyMap final { * Sorting comparator for `reorderInPlaceIfNeeded`. */ static bool shouldFirstPairComesBeforeSecondOne( - const ShadowViewNodePair *lhs, - const ShadowViewNodePair *rhs) noexcept { + const ShadowViewNodePair* lhs, + const ShadowViewNodePair* rhs) noexcept { return lhs->shadowNode->getOrderIndex() < rhs->shadowNode->getOrderIndex(); } @@ -185,13 +185,13 @@ static bool shouldFirstPairComesBeforeSecondOne( * Reorders pairs in-place based on `orderIndex` using a stable sort algorithm. */ static void reorderInPlaceIfNeeded( - ShadowViewNodePair::NonOwningList &pairs) noexcept { + ShadowViewNodePair::NonOwningList& pairs) noexcept { if (pairs.size() < 2) { return; } auto isReorderNeeded = false; - for (const auto &pair : pairs) { + for (const auto& pair : pairs) { if (pair->shadowNode->getOrderIndex() != 0) { isReorderNeeded = true; break; @@ -206,17 +206,17 @@ static void reorderInPlaceIfNeeded( pairs.begin(), pairs.end(), &shouldFirstPairComesBeforeSecondOne); } -static inline bool shadowNodeIsConcrete(const ShadowNode &shadowNode) { +static inline bool shadowNodeIsConcrete(const ShadowNode& shadowNode) { return shadowNode.getTraits().check(ShadowNodeTraits::Trait::FormsView); } static void sliceChildShadowNodeViewPairsRecursivelyV2( - ShadowViewNodePair::NonOwningList &pairList, - ViewNodePairScope &scope, + ShadowViewNodePair::NonOwningList& pairList, + ViewNodePairScope& scope, Point layoutOffset, - const ShadowNode &shadowNode) { - for (const auto &sharedChildShadowNode : shadowNode.getChildren()) { - auto &childShadowNode = *sharedChildShadowNode; + const ShadowNode& shadowNode) { + for (const auto& sharedChildShadowNode : shadowNode.getChildren()) { + auto& childShadowNode = *sharedChildShadowNode; #ifndef ANDROID // T153547836: Disabled on Android because the mounting infrastructure @@ -259,8 +259,8 @@ static void sliceChildShadowNodeViewPairsRecursivelyV2( } ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2( - const ShadowNode &shadowNode, - ViewNodePairScope &scope, + const ShadowNode& shadowNode, + ViewNodePairScope& scope, bool allowFlattened, Point layoutOffset) { auto pairList = ShadowViewNodePair::NonOwningList{}; @@ -294,8 +294,8 @@ ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2( */ static ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsFromViewNodePair( - const ShadowViewNodePair &shadowViewNodePair, - ViewNodePairScope &scope, + const ShadowViewNodePair& shadowViewNodePair, + ViewNodePairScope& scope, bool allowFlattened = false) { return sliceChildShadowNodeViewPairsV2( *shadowViewNodePair.shadowNode, @@ -335,11 +335,11 @@ static_assert( "`ShadowViewNodePair::NonOwningList` must be `move assignable`."); static void calculateShadowViewMutationsV2( - ViewNodePairScope &scope, - ShadowViewMutation::List &mutations, - const ShadowView &parentShadowView, - ShadowViewNodePair::NonOwningList &&oldChildPairs, - ShadowViewNodePair::NonOwningList &&newChildPairs, + ViewNodePairScope& scope, + ShadowViewMutation::List& mutations, + const ShadowView& parentShadowView, + ShadowViewNodePair::NonOwningList&& oldChildPairs, + ShadowViewNodePair::NonOwningList&& newChildPairs, bool isRecursionRedundant = false); struct OrderedMutationInstructionContainer { @@ -353,32 +353,31 @@ struct OrderedMutationInstructionContainer { }; static void updateMatchedPairSubtrees( - ViewNodePairScope &scope, - OrderedMutationInstructionContainer &mutationContainer, - TinyMap &newRemainingPairs, - ShadowViewNodePair::NonOwningList &oldChildPairs, - const ShadowView &parentShadowView, - const ShadowViewNodePair &oldPair, - const ShadowViewNodePair &newPair); + ViewNodePairScope& scope, + OrderedMutationInstructionContainer& mutationContainer, + TinyMap& newRemainingPairs, + ShadowViewNodePair::NonOwningList& oldChildPairs, + const ShadowView& parentShadowView, + const ShadowViewNodePair& oldPair, + const ShadowViewNodePair& newPair); static void updateMatchedPair( - OrderedMutationInstructionContainer &mutationContainer, + OrderedMutationInstructionContainer& mutationContainer, bool oldNodeFoundInOrder, bool newNodeFoundInOrder, - const ShadowView &parentShadowView, - const ShadowViewNodePair &oldPair, - const ShadowViewNodePair &newPair); + const ShadowView& parentShadowView, + const ShadowViewNodePair& oldPair, + const ShadowViewNodePair& newPair); static void calculateShadowViewMutationsFlattener( - ViewNodePairScope &scope, + ViewNodePairScope& scope, ReparentMode reparentMode, - OrderedMutationInstructionContainer &mutationContainer, - const ShadowView &parentShadowView, - TinyMap &unvisitedOtherNodes, - const ShadowViewNodePair &node, - TinyMap *parentSubVisitedOtherNewNodes = nullptr, - TinyMap *parentSubVisitedOtherOldNodes = - nullptr); + OrderedMutationInstructionContainer& mutationContainer, + const ShadowView& parentShadowView, + TinyMap& unvisitedOtherNodes, + const ShadowViewNodePair& node, + TinyMap* parentSubVisitedOtherNewNodes = nullptr, + TinyMap* parentSubVisitedOtherOldNodes = nullptr); /** * Updates the subtrees of any matched ShadowViewNodePair. This handles @@ -389,13 +388,13 @@ static void calculateShadowViewMutationsFlattener( * the ViewNodePairScope used within. */ static void updateMatchedPairSubtrees( - ViewNodePairScope &scope, - OrderedMutationInstructionContainer &mutationContainer, - TinyMap &newRemainingPairs, - ShadowViewNodePair::NonOwningList &oldChildPairs, - const ShadowView &parentShadowView, - const ShadowViewNodePair &oldPair, - const ShadowViewNodePair &newPair) { + ViewNodePairScope& scope, + OrderedMutationInstructionContainer& mutationContainer, + TinyMap& newRemainingPairs, + ShadowViewNodePair::NonOwningList& oldChildPairs, + const ShadowView& parentShadowView, + const ShadowViewNodePair& oldPair, + const ShadowViewNodePair& newPair) { // Are we flattening or unflattening either one? If node was // flattened in both trees, there's no change, just continue. if (oldPair.flattened && newPair.flattened) { @@ -429,7 +428,7 @@ static void updateMatchedPairSubtrees( // Unflattening else { // Construct unvisited nodes map - auto unvisitedOldChildPairs = TinyMap{}; + auto unvisitedOldChildPairs = TinyMap{}; // We don't know where all the children of oldChildPair are // within oldChildPairs, but we know that they're in the same // relative order. The reason for this is because of flattening @@ -440,7 +439,7 @@ static void updateMatchedPairSubtrees( for (size_t i = 0, j = 0; i < oldChildPairs.size() && j < oldFlattenedNodes.size(); i++) { - auto &oldChild = *oldChildPairs[i]; + auto& oldChild = *oldChildPairs[i]; if (oldChild.shadowView.tag == oldFlattenedNodes[j]->shadowView.tag) { unvisitedOldChildPairs.insert({oldChild.shadowView.tag, &oldChild}); j++; @@ -460,8 +459,8 @@ static void updateMatchedPairSubtrees( // them now. They will be removed from the hierarchy by the // outermost loop of this function. // TODO: is this necessary anymore? - for (auto &oldFlattenedNodePtr : oldFlattenedNodes) { - auto &oldFlattenedNode = *oldFlattenedNodePtr; + for (auto& oldFlattenedNodePtr : oldFlattenedNodes) { + auto& oldFlattenedNode = *oldFlattenedNodePtr; auto unvisitedOldChildPairIt = unvisitedOldChildPairs.find(oldFlattenedNode.shadowView.tag); if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) { @@ -508,12 +507,12 @@ static void updateMatchedPairSubtrees( * correct ordering of INSERT and REMOVE mutations. */ static void updateMatchedPair( - OrderedMutationInstructionContainer &mutationContainer, + OrderedMutationInstructionContainer& mutationContainer, bool oldNodeFoundInOrder, bool newNodeFoundInOrder, - const ShadowView &parentShadowView, - const ShadowViewNodePair &oldPair, - const ShadowViewNodePair &newPair) { + const ShadowView& parentShadowView, + const ShadowViewNodePair& oldPair, + const ShadowViewNodePair& newPair) { oldPair.otherTreePair = &newPair; newPair.otherTreePair = &oldPair; @@ -602,14 +601,14 @@ static void updateMatchedPair( * **after this function is called**, by the caller. */ static void calculateShadowViewMutationsFlattener( - ViewNodePairScope &scope, + ViewNodePairScope& scope, ReparentMode reparentMode, - OrderedMutationInstructionContainer &mutationContainer, - const ShadowView &parentShadowView, - TinyMap &unvisitedOtherNodes, - const ShadowViewNodePair &node, - TinyMap *parentSubVisitedOtherNewNodes, - TinyMap *parentSubVisitedOtherOldNodes) { + OrderedMutationInstructionContainer& mutationContainer, + const ShadowView& parentShadowView, + TinyMap& unvisitedOtherNodes, + const ShadowViewNodePair& node, + TinyMap* parentSubVisitedOtherNewNodes, + TinyMap* parentSubVisitedOtherOldNodes) { DEBUG_LOGS({ LOG(ERROR) << "Differ Flattener 1: " << (reparentMode == ReparentMode::Unflatten ? "Unflattening" @@ -635,7 +634,7 @@ static void calculateShadowViewMutationsFlattener( strTreeChildPairs.append(", "); } std::string strListChildPairs; - for (auto &unvisitedNode : unvisitedOtherNodes) { + for (auto& unvisitedNode : unvisitedOtherNodes) { strListChildPairs.append( std::to_string(unvisitedNode.second->shadowView.tag)); strListChildPairs.append(unvisitedNode.second->isConcreteView ? "" : "'"); @@ -650,8 +649,8 @@ static void calculateShadowViewMutationsFlattener( // Views in other tree that are visited by sub-flattening or // sub-unflattening - TinyMap subVisitedOtherNewNodes{}; - TinyMap subVisitedOtherOldNodes{}; + TinyMap subVisitedOtherNewNodes{}; + TinyMap subVisitedOtherOldNodes{}; auto subVisitedNewMap = (parentSubVisitedOtherNewNodes != nullptr ? parentSubVisitedOtherNewNodes : &subVisitedOtherNewNodes); @@ -661,12 +660,12 @@ static void calculateShadowViewMutationsFlattener( // Candidates for full tree creation or deletion at the end of this function auto deletionCreationCandidatePairs = - TinyMap{}; + TinyMap{}; for (size_t index = 0; index < treeChildren.size() && index < treeChildren.size(); index++) { - auto &treeChildPair = *treeChildren[index]; + auto& treeChildPair = *treeChildren[index]; // Try to find node in other tree auto unvisitedIt = unvisitedOtherNodes.find(treeChildPair.shadowView.tag); @@ -780,12 +779,12 @@ static void calculateShadowViewMutationsFlattener( // Find in other tree if (existsInOtherTree) { react_native_assert(otherTreeNodePairPtr != nullptr); - auto &otherTreeNodePair = *otherTreeNodePairPtr; + auto& otherTreeNodePair = *otherTreeNodePairPtr; - auto &newTreeNodePair = + auto& newTreeNodePair = (reparentMode == ReparentMode::Flatten ? otherTreeNodePair : treeChildPair); - auto &oldTreeNodePair = + auto& oldTreeNodePair = (reparentMode == ReparentMode::Flatten ? treeChildPair : otherTreeNodePair); @@ -867,9 +866,9 @@ static void calculateShadowViewMutationsFlattener( true); // Construct unvisited nodes map auto unvisitedRecursiveChildPairs = - TinyMap{}; - for (auto &flattenedNode : flattenedNodes) { - auto &newChild = *flattenedNode; + TinyMap{}; + for (auto& flattenedNode : flattenedNodes) { + auto& newChild = *flattenedNode; auto unvisitedOtherNodesIt = unvisitedOtherNodes.find(newChild.shadowView.tag); @@ -918,12 +917,12 @@ static void calculateShadowViewMutationsFlattener( // If old nodes were not visited, we know that we can delete them // now. They will be removed from the hierarchy by the outermost // loop of this function. - for (auto &unvisitedRecursiveChildPair : + for (auto& unvisitedRecursiveChildPair : unvisitedRecursiveChildPairs) { if (unvisitedRecursiveChildPair.first == 0) { continue; } - auto &oldFlattenedNode = *unvisitedRecursiveChildPair.second; + auto& oldFlattenedNode = *unvisitedRecursiveChildPair.second; // Node unvisited - mark the entire subtree for deletion if (oldFlattenedNode.isConcreteView && @@ -983,11 +982,11 @@ static void calculateShadowViewMutationsFlattener( // Final step: go through creation/deletion candidates and delete/create // subtrees if they were never visited during the execution of the above // loop and recursions. - for (auto &deletionCreationCandidatePair : deletionCreationCandidatePairs) { + for (auto& deletionCreationCandidatePair : deletionCreationCandidatePairs) { if (deletionCreationCandidatePair.first == 0) { continue; } - auto &treeChildPair = *deletionCreationCandidatePair.second; + auto& treeChildPair = *deletionCreationCandidatePair.second; // If node was visited during a flattening/unflattening recursion, // and the node in the other tree is concrete, that means it was @@ -1031,11 +1030,11 @@ static void calculateShadowViewMutationsFlattener( } static void calculateShadowViewMutationsV2( - ViewNodePairScope &scope, - ShadowViewMutation::List &mutations, - const ShadowView &parentShadowView, - ShadowViewNodePair::NonOwningList &&oldChildPairs, - ShadowViewNodePair::NonOwningList &&newChildPairs, + ViewNodePairScope& scope, + ShadowViewMutation::List& mutations, + const ShadowView& parentShadowView, + ShadowViewNodePair::NonOwningList&& oldChildPairs, + ShadowViewNodePair::NonOwningList&& newChildPairs, bool isRecursionRedundant) { if (oldChildPairs.empty() && newChildPairs.empty()) { return; @@ -1074,8 +1073,8 @@ static void calculateShadowViewMutationsV2( // Stage 1: Collecting `Update` mutations for (index = 0; index < oldChildPairs.size() && index < newChildPairs.size(); index++) { - auto &oldChildPair = *oldChildPairs[index]; - auto &newChildPair = *newChildPairs[index]; + auto& oldChildPair = *oldChildPairs[index]; + auto& newChildPair = *newChildPairs[index]; if (oldChildPair.shadowView.tag != newChildPair.shadowView.tag) { DEBUG_LOGS({ @@ -1142,7 +1141,7 @@ static void calculateShadowViewMutationsV2( // We've reached the end of the new children. We can delete+remove the // rest. for (; index < oldChildPairs.size(); index++) { - const auto &oldChildPair = *oldChildPairs[index]; + const auto& oldChildPair = *oldChildPairs[index]; DEBUG_LOGS({ LOG(ERROR) << "Differ Branch 2: Deleting Tag/Tree: [" @@ -1204,7 +1203,7 @@ static void calculateShadowViewMutationsV2( // If we don't have any more existing children we can choose a fast path // since the rest will all be create+insert. for (; index < newChildPairs.size(); index++) { - const auto &newChildPair = *newChildPairs[index]; + const auto& newChildPair = *newChildPairs[index]; DEBUG_LOGS({ LOG(ERROR) << "Differ Branch 3: Creating Tag/Tree: [" @@ -1235,11 +1234,11 @@ static void calculateShadowViewMutationsV2( } } else { // Collect map of tags in the new list - auto newRemainingPairs = TinyMap{}; - auto newInsertedPairs = TinyMap{}; - auto deletionCandidatePairs = TinyMap{}; + auto newRemainingPairs = TinyMap{}; + auto newInsertedPairs = TinyMap{}; + auto deletionCandidatePairs = TinyMap{}; for (; index < newChildPairs.size(); index++) { - auto &newChildPair = *newChildPairs[index]; + auto& newChildPair = *newChildPairs[index]; newRemainingPairs.insert({newChildPair.shadowView.tag, &newChildPair}); } @@ -1256,8 +1255,8 @@ static void calculateShadowViewMutationsV2( // Advance both pointers if pointing to the same element if (haveNewPair && haveOldPair) { - const auto &oldChildPair = *oldChildPairs[oldIndex]; - const auto &newChildPair = *newChildPairs[newIndex]; + const auto& oldChildPair = *oldChildPairs[oldIndex]; + const auto& newChildPair = *newChildPairs[newIndex]; Tag newTag = newChildPair.shadowView.tag; Tag oldTag = oldChildPair.shadowView.tag; @@ -1301,7 +1300,7 @@ static void calculateShadowViewMutationsV2( // We have an old pair, but we either don't have any remaining new pairs // or we have one but it's not matched up with the old pair if (haveOldPair) { - const auto &oldChildPair = *oldChildPairs[oldIndex]; + const auto& oldChildPair = *oldChildPairs[oldIndex]; Tag oldTag = oldChildPair.shadowView.tag; @@ -1311,7 +1310,7 @@ static void calculateShadowViewMutationsV2( // subtree. const auto insertedIt = newInsertedPairs.find(oldTag); if (insertedIt != newInsertedPairs.end()) { - const auto &newChildPair = *insertedIt->second; + const auto& newChildPair = *insertedIt->second; updateMatchedPair( mutationContainer, @@ -1366,7 +1365,7 @@ static void calculateShadowViewMutationsV2( // concrete. if (oldChildPair.inOtherTree() && oldChildPair.otherTreePair->isConcreteView) { - const ShadowView &otherTreeView = + const ShadowView& otherTreeView = oldChildPair.otherTreePair->shadowView; // Remove, but remove using the *new* node, since we know @@ -1402,7 +1401,7 @@ static void calculateShadowViewMutationsV2( // At this point, oldTag is -1 or is in the new list, and hasn't been // inserted or matched yet. We're not sure yet if the new node is in the // old list - generate an insert instruction for the new node. - auto &newChildPair = *newChildPairs[newIndex]; + auto& newChildPair = *newChildPairs[newIndex]; DEBUG_LOGS({ LOG(ERROR) << "Differ Branch 10: Inserting tag/tree that was not (yet?) removed from hierarchy: " @@ -1436,12 +1435,12 @@ static void calculateShadowViewMutationsV2( // subtrees/nodes. We do this here because we need to traverse the entire // list to make sure that a node was not reparented into an unflattened // node that occurs *after* it in the hierarchy, due to zIndex ordering. - for (auto &deletionCandidatePair : deletionCandidatePairs) { + for (auto& deletionCandidatePair : deletionCandidatePairs) { if (deletionCandidatePair.first == 0) { continue; } - const auto &oldChildPair = *deletionCandidatePair.second; + const auto& oldChildPair = *deletionCandidatePair.second; DEBUG_LOGS({ LOG(ERROR) @@ -1474,7 +1473,7 @@ static void calculateShadowViewMutationsV2( // Final step: generate Create instructions for entirely new // subtrees/nodes that are not the result of flattening or unflattening. - for (auto &newInsertedPair : newInsertedPairs) { + for (auto& newInsertedPair : newInsertedPairs) { // Erased elements of a TinyMap will have a Tag/key of 0 - skip those // These *should* be removed by the map; there are currently no KNOWN // cases where TinyMap will do the wrong thing, but there are not yet @@ -1483,7 +1482,7 @@ static void calculateShadowViewMutationsV2( continue; } - const auto &newChildPair = *newInsertedPair.second; + const auto& newChildPair = *newInsertedPair.second; DEBUG_LOGS({ LOG(ERROR) @@ -1551,11 +1550,11 @@ static void calculateShadowViewMutationsV2( * Only used by unit tests currently. */ static void sliceChildShadowNodeViewPairsRecursivelyLegacy( - ShadowViewNodePair::OwningList &pairList, + ShadowViewNodePair::OwningList& pairList, Point layoutOffset, - const ShadowNode &shadowNode) { - for (const auto &sharedChildShadowNode : shadowNode.getChildren()) { - auto &childShadowNode = *sharedChildShadowNode; + const ShadowNode& shadowNode) { + for (const auto& sharedChildShadowNode : shadowNode.getChildren()) { + auto& childShadowNode = *sharedChildShadowNode; #ifndef ANDROID // Temporary disabled on Android because the mounting infrastructure @@ -1591,7 +1590,7 @@ static void sliceChildShadowNodeViewPairsRecursivelyLegacy( * Only used by unit tests currently. */ ShadowViewNodePair::OwningList sliceChildShadowNodeViewPairsLegacy( - const ShadowNode &shadowNode) { + const ShadowNode& shadowNode) { auto pairList = ShadowViewNodePair::OwningList{}; if (!shadowNode.getTraits().check( @@ -1606,8 +1605,8 @@ ShadowViewNodePair::OwningList sliceChildShadowNodeViewPairsLegacy( } ShadowViewMutation::List calculateShadowViewMutations( - const ShadowNode &oldRootShadowNode, - const ShadowNode &newRootShadowNode) { + const ShadowNode& oldRootShadowNode, + const ShadowNode& newRootShadowNode) { SystraceSection s("calculateShadowViewMutations"); // Root shadow nodes must be belong the same family. diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h index 9f644278ade..1aaa5760ca0 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/Differentiator.h @@ -45,8 +45,8 @@ using ViewNodePairScope = std::deque; * The list of mutations might be and might not be optimal. */ ShadowViewMutation::List calculateShadowViewMutations( - const ShadowNode &oldRootShadowNode, - const ShadowNode &newRootShadowNode); + const ShadowNode& oldRootShadowNode, + const ShadowNode& newRootShadowNode); /** * Generates a list of `ShadowViewNodePair`s that represents a layer of a @@ -54,8 +54,8 @@ ShadowViewMutation::List calculateShadowViewMutations( * not form views and their children are flattened. */ ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2( - const ShadowNode &shadowNode, - ViewNodePairScope &viewNodePairScope, + const ShadowNode& shadowNode, + ViewNodePairScope& viewNodePairScope, bool allowFlattened = false, Point layoutOffset = {0, 0}); @@ -64,6 +64,6 @@ ShadowViewNodePair::NonOwningList sliceChildShadowNodeViewPairsV2( * flattened view hierarchy. This is *only* used by unit tests currently. */ ShadowViewNodePair::OwningList sliceChildShadowNodeViewPairsLegacy( - const ShadowNode &shadowNode); + const ShadowNode& shadowNode); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp index 7532db9e64b..9a8a36e7a7a 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp @@ -20,7 +20,7 @@ namespace facebook::react { -MountingCoordinator::MountingCoordinator(const ShadowTreeRevision &baseRevision) +MountingCoordinator::MountingCoordinator(const ShadowTreeRevision& baseRevision) : surfaceId_(baseRevision.rootShadowNode->getSurfaceId()), baseRevision_(baseRevision), telemetryController_(*this) { @@ -67,7 +67,7 @@ bool MountingCoordinator::waitForTransaction( } void MountingCoordinator::updateBaseRevision( - const ShadowTreeRevision &baseRevision) const { + const ShadowTreeRevision& baseRevision) const { baseRevision_ = baseRevision; } @@ -182,11 +182,11 @@ bool MountingCoordinator::hasPendingTransactions() const { return lastRevision_.has_value(); } -const TelemetryController &MountingCoordinator::getTelemetryController() const { +const TelemetryController& MountingCoordinator::getTelemetryController() const { return telemetryController_; } -const ShadowTreeRevision &MountingCoordinator::getBaseRevision() const { +const ShadowTreeRevision& MountingCoordinator::getBaseRevision() const { return baseRevision_; } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h index 2271eb4f1c2..e733fe59240 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingCoordinator.h @@ -40,7 +40,7 @@ class MountingCoordinator final { * The constructor is meant to be used only inside `ShadowTree`, and it's * `public` only to enable using with `std::make_shared<>`. */ - MountingCoordinator(const ShadowTreeRevision &baseRevision); + MountingCoordinator(const ShadowTreeRevision& baseRevision); /* * Returns the id of the surface that the coordinator belongs to. @@ -77,16 +77,16 @@ class MountingCoordinator final { */ bool waitForTransaction(std::chrono::duration timeout) const; - const TelemetryController &getTelemetryController() const; + const TelemetryController& getTelemetryController() const; - const ShadowTreeRevision &getBaseRevision() const; + const ShadowTreeRevision& getBaseRevision() const; /* * Methods from this section are meant to be used by * `MountingOverrideDelegate` only. */ public: - void updateBaseRevision(const ShadowTreeRevision &baseRevision) const; + void updateBaseRevision(const ShadowTreeRevision& baseRevision) const; void resetLatestRevision() const; void setMountingOverrideDelegate( diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h b/packages/react-native/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h index 237e7f9dedc..6bed003963a 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingOverrideDelegate.h @@ -38,7 +38,7 @@ class MountingOverrideDelegate { virtual std::optional pullTransaction( SurfaceId surfaceId, MountingTransaction::Number number, - const TransactionTelemetry &telemetry, + const TransactionTelemetry& telemetry, ShadowViewMutationList mutations) const = 0; }; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.cpp index d80a21c2ee7..f858acafc6d 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.cpp @@ -14,14 +14,14 @@ using Number = MountingTransaction::Number; MountingTransaction::MountingTransaction( SurfaceId surfaceId, Number number, - ShadowViewMutationList &&mutations, + ShadowViewMutationList&& mutations, TransactionTelemetry telemetry) : surfaceId_(surfaceId), number_(number), mutations_(std::move(mutations)), telemetry_(std::move(telemetry)) {} -const ShadowViewMutationList &MountingTransaction::getMutations() const & { +const ShadowViewMutationList& MountingTransaction::getMutations() const& { return mutations_; } @@ -29,7 +29,7 @@ ShadowViewMutationList MountingTransaction::getMutations() && { return std::move(mutations_); } -TransactionTelemetry &MountingTransaction::getTelemetry() const { +TransactionTelemetry& MountingTransaction::getTelemetry() const { return telemetry_; } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.h b/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.h index 7694c1f29e9..3d90076ce8b 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/MountingTransaction.h @@ -35,7 +35,7 @@ class MountingTransaction final { MountingTransaction( SurfaceId surfaceId, Number number, - ShadowViewMutationList &&mutations, + ShadowViewMutationList&& mutations, TransactionTelemetry telemetry); /* @@ -43,28 +43,28 @@ class MountingTransaction final { * Copying of MountingTransaction is expensive, so copy-constructor is * explicit and copy-assignment is deleted to prevent accidental copying. */ - explicit MountingTransaction(const MountingTransaction &mountingTransaction) = + explicit MountingTransaction(const MountingTransaction& mountingTransaction) = default; - MountingTransaction &operator=(const MountingTransaction &other) = delete; + MountingTransaction& operator=(const MountingTransaction& other) = delete; /* * Move semantic. */ - MountingTransaction(MountingTransaction &&mountingTransaction) noexcept = + MountingTransaction(MountingTransaction&& mountingTransaction) noexcept = default; - MountingTransaction &operator=(MountingTransaction &&other) = default; + MountingTransaction& operator=(MountingTransaction&& other) = default; /* * Returns a list of mutations that represent the transaction. The list can be * empty (theoretically). */ - const ShadowViewMutationList &getMutations() const &; + const ShadowViewMutationList& getMutations() const&; ShadowViewMutationList getMutations() &&; /* * Returns telemetry associated with this transaction. */ - TransactionTelemetry &getTelemetry() const; + TransactionTelemetry& getTelemetry() const; /* * Returns the id of the surface that the transaction belongs to. diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp index 75ed9bd668d..fef4a975e22 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.cpp @@ -31,7 +31,7 @@ using CommitMode = ShadowTree::CommitMode; * of calling, the function returns `nullptr` (as an indication that no * additional work is required). */ -static ShadowNode::Unshared progressState(const ShadowNode &shadowNode) { +static ShadowNode::Unshared progressState(const ShadowNode& shadowNode) { auto isStateChanged = false; auto areChildrenChanged = false; @@ -46,7 +46,7 @@ static ShadowNode::Unshared progressState(const ShadowNode &shadowNode) { auto newChildren = ShadowNode::ListOfShared{}; if (!shadowNode.getChildren().empty()) { auto index = size_t{0}; - for (const auto &childNode : shadowNode.getChildren()) { + for (const auto& childNode : shadowNode.getChildren()) { auto newChildNode = progressState(*childNode); if (newChildNode) { if (!areChildrenChanged) { @@ -79,8 +79,8 @@ static ShadowNode::Unshared progressState(const ShadowNode &shadowNode) { * of the three from the traversing. */ static ShadowNode::Unshared progressState( - const ShadowNode &shadowNode, - const ShadowNode &baseShadowNode) { + const ShadowNode& shadowNode, + const ShadowNode& baseShadowNode) { // The intuition behind the complexity: // - A very few nodes have associated state, therefore it's mostly reading and // it only writes when state objects were found obsolete; @@ -100,8 +100,8 @@ static ShadowNode::Unshared progressState( } } - auto &children = shadowNode.getChildren(); - auto &baseChildren = baseShadowNode.getChildren(); + auto& children = shadowNode.getChildren(); + auto& baseChildren = baseShadowNode.getChildren(); auto newChildren = ShadowNode::ListOfShared{}; auto childrenSize = children.size(); @@ -110,8 +110,8 @@ static ShadowNode::Unshared progressState( // Stage 1: Aligned part. for (index = 0; index < childrenSize && index < baseChildrenSize; index++) { - const auto &childNode = *children[index]; - const auto &baseChildNode = *baseChildren[index]; + const auto& childNode = *children[index]; + const auto& baseChildNode = *baseChildren[index]; if (&childNode == &baseChildNode) { // Nodes are identical, skipping. @@ -161,8 +161,8 @@ static ShadowNode::Unshared progressState( } static void updateMountedFlag( - const ShadowNode::ListOfShared &oldChildren, - const ShadowNode::ListOfShared &newChildren) { + const ShadowNode::ListOfShared& oldChildren, + const ShadowNode::ListOfShared& newChildren) { // This is a simplified version of Diffing algorithm that only updates // `mounted` flag on `ShadowNode`s. The algorithm sets "mounted" flag before // "unmounted" to allow `ShadowNode` detect a situation where the node was @@ -183,8 +183,8 @@ static void updateMountedFlag( // Stage 1: Mount and unmount "updated" children. for (index = 0; index < oldChildren.size() && index < newChildren.size(); index++) { - const auto &oldChild = oldChildren[index]; - const auto &newChild = newChildren[index]; + const auto& oldChild = oldChildren[index]; + const auto& newChild = newChildren[index]; if (oldChild == newChild) { // Nodes are identical, skipping the subtree. @@ -206,14 +206,14 @@ static void updateMountedFlag( // State 2: Mount new children. for (index = lastIndexAfterFirstStage; index < newChildren.size(); index++) { - const auto &newChild = newChildren[index]; + const auto& newChild = newChildren[index]; newChild->setMounted(true); updateMountedFlag({}, newChild->getChildren()); } // State 3: Unmount old children. for (index = lastIndexAfterFirstStage; index < oldChildren.size(); index++) { - const auto &oldChild = oldChildren[index]; + const auto& oldChild = oldChildren[index]; oldChild->setMounted(false); updateMountedFlag(oldChild->getChildren(), {}); } @@ -221,10 +221,10 @@ static void updateMountedFlag( ShadowTree::ShadowTree( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext, - const ShadowTreeDelegate &delegate, - const ContextContainer &contextContainer) + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext, + const ShadowTreeDelegate& delegate, + const ContextContainer& contextContainer) : surfaceId_(surfaceId), delegate_(delegate) { static auto globalRootComponentDescriptor = std::make_unique( @@ -294,8 +294,8 @@ MountingCoordinator::Shared ShadowTree::getMountingCoordinator() const { } CommitStatus ShadowTree::commit( - const ShadowTreeCommitTransaction &transaction, - const CommitOptions &commitOptions) const { + const ShadowTreeCommitTransaction& transaction, + const CommitOptions& commitOptions) const { SystraceSection s("ShadowTree::commit"); int attempts = 0; @@ -315,8 +315,8 @@ CommitStatus ShadowTree::commit( } CommitStatus ShadowTree::tryCommit( - const ShadowTreeCommitTransaction &transaction, - const CommitOptions &commitOptions) const { + const ShadowTreeCommitTransaction& transaction, + const CommitOptions& commitOptions) const { SystraceSection s("ShadowTree::tryCommit"); auto telemetry = TransactionTelemetry{}; @@ -335,7 +335,7 @@ CommitStatus ShadowTree::tryCommit( lastRevisionNumberWithNewState = lastRevisionNumberWithNewState_; } - const auto &oldRootShadowNode = oldRevision.rootShadowNode; + const auto& oldRootShadowNode = oldRevision.rootShadowNode; auto newRootShadowNode = transaction(*oldRevision.rootShadowNode); if (!newRootShadowNode || @@ -362,7 +362,7 @@ CommitStatus ShadowTree::tryCommit( } // Layout nodes. - std::vector affectedLayoutableNodes{}; + std::vector affectedLayoutableNodes{}; affectedLayoutableNodes.reserve(1024); telemetry.willLayout(); @@ -441,7 +441,7 @@ void ShadowTree::mount(ShadowTreeRevision revision, bool mountSynchronously) void ShadowTree::commitEmptyTree() const { commit( - [](const RootShadowNode &oldRootShadowNode) -> RootShadowNode::Unshared { + [](const RootShadowNode& oldRootShadowNode) -> RootShadowNode::Unshared { return std::make_shared( oldRootShadowNode, ShadowNodeFragment{ @@ -453,23 +453,23 @@ void ShadowTree::commitEmptyTree() const { } void ShadowTree::emitLayoutEvents( - std::vector &affectedLayoutableNodes) const { + std::vector& affectedLayoutableNodes) const { SystraceSection s( "ShadowTree::emitLayoutEvents", "affectedLayoutableNodes", affectedLayoutableNodes.size()); - for (const auto *layoutableNode : affectedLayoutableNodes) { + for (const auto* layoutableNode : affectedLayoutableNodes) { // Only instances of `ViewShadowNode` (and subclasses) are supported. - const auto &viewShadowNode = - static_cast(*layoutableNode); - const auto &viewEventEmitter = static_cast( - *viewShadowNode.getEventEmitter()); + const auto& viewShadowNode = + static_cast(*layoutableNode); + const auto& viewEventEmitter = + static_cast(*viewShadowNode.getEventEmitter()); // Checking if the `onLayout` event was requested for the particular Shadow // Node. - const auto &viewProps = - static_cast(*viewShadowNode.getProps()); + const auto& viewProps = + static_cast(*viewShadowNode.getProps()); if (!viewProps.onLayout) { continue; } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h index 43f28397903..874e31f9d5a 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTree.h @@ -23,7 +23,7 @@ namespace facebook::react { using ShadowTreeCommitTransaction = std::function; + const RootShadowNode& oldRootShadowNode)>; /* * Represents the shadow tree and its lifecycle. @@ -77,10 +77,10 @@ class ShadowTree final { */ ShadowTree( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext, - const ShadowTreeDelegate &delegate, - const ContextContainer &contextContainer); + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext, + const ShadowTreeDelegate& delegate, + const ContextContainer& contextContainer); ~ShadowTree(); @@ -103,15 +103,15 @@ class ShadowTree final { * The `transaction` function can cancel commit returning `nullptr`. */ CommitStatus tryCommit( - const ShadowTreeCommitTransaction &transaction, - const CommitOptions &commitOptions) const; + const ShadowTreeCommitTransaction& transaction, + const CommitOptions& commitOptions) const; /* * Calls `tryCommit` in a loop until it finishes successfully. */ CommitStatus commit( - const ShadowTreeCommitTransaction &transaction, - const CommitOptions &commitOptions) const; + const ShadowTreeCommitTransaction& transaction, + const CommitOptions& commitOptions) const; /* * Returns a `ShadowTreeRevision` representing the momentary state of @@ -139,10 +139,10 @@ class ShadowTree final { void mount(ShadowTreeRevision revision, bool mountSynchronously) const; void emitLayoutEvents( - std::vector &affectedLayoutableNodes) const; + std::vector& affectedLayoutableNodes) const; const SurfaceId surfaceId_; - const ShadowTreeDelegate &delegate_; + const ShadowTreeDelegate& delegate_; mutable std::shared_mutex commitMutex_; mutable CommitMode commitMode_{ CommitMode::Normal}; // Protected by `commitMutex_`. diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h index 67164295dc3..a260c5f1c29 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeDelegate.h @@ -25,9 +25,9 @@ class ShadowTreeDelegate { * Returning a `nullptr` cancels the commit. */ virtual RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) const = 0; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) const = 0; /* * Called right after Shadow Tree commit a new state of the tree. diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp index 5c855177045..55caa0c0b13 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.cpp @@ -16,7 +16,7 @@ ShadowTreeRegistry::~ShadowTreeRegistry() { registry_.empty() && "Deallocation of non-empty `ShadowTreeRegistry`."); } -void ShadowTreeRegistry::add(std::unique_ptr &&shadowTree) const { +void ShadowTreeRegistry::add(std::unique_ptr&& shadowTree) const { std::unique_lock lock(mutex_); registry_.emplace(shadowTree->getSurfaceId(), std::move(shadowTree)); @@ -38,7 +38,7 @@ std::unique_ptr ShadowTreeRegistry::remove( bool ShadowTreeRegistry::visit( SurfaceId surfaceId, - const std::function &callback) const { + const std::function& callback) const { std::shared_lock lock(mutex_); auto iterator = registry_.find(surfaceId); @@ -52,11 +52,11 @@ bool ShadowTreeRegistry::visit( } void ShadowTreeRegistry::enumerate( - const std::function - &callback) const { + const std::function& + callback) const { std::shared_lock lock(mutex_); auto stop = false; - for (const auto &pair : registry_) { + for (const auto& pair : registry_) { callback(*pair.second, stop); if (stop) { return; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h index 9f1e948cb72..c2cfadb7ca2 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowTreeRegistry.h @@ -29,7 +29,7 @@ class ShadowTreeRegistry final { * The ownership of the instance is also transferred to the registry. * Can be called from any thread. */ - void add(std::unique_ptr &&shadowTree) const; + void add(std::unique_ptr&& shadowTree) const; /* * Removes a `ShadowTree` instance with given `surfaceId` from the registry @@ -50,7 +50,7 @@ class ShadowTreeRegistry final { */ bool visit( SurfaceId surfaceId, - const std::function &callback) const; + const std::function& callback) const; /* * Enumerates all stored shadow trees. @@ -58,8 +58,8 @@ class ShadowTreeRegistry final { * Can be called from any thread. */ void enumerate( - const std::function - &callback) const; + const std::function& + callback) const; private: mutable std::shared_mutex mutex_; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp index 2373fd7232f..f191dd644eb 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.cpp @@ -13,15 +13,15 @@ namespace facebook::react { -static LayoutMetrics layoutMetricsFromShadowNode(const ShadowNode &shadowNode) { +static LayoutMetrics layoutMetricsFromShadowNode(const ShadowNode& shadowNode) { auto layoutableShadowNode = - traitCast(&shadowNode); + traitCast(&shadowNode); return layoutableShadowNode != nullptr ? layoutableShadowNode->getLayoutMetrics() : EmptyLayoutMetrics; } -ShadowView::ShadowView(const ShadowNode &shadowNode) +ShadowView::ShadowView(const ShadowNode& shadowNode) : componentName(shadowNode.getComponentName()), componentHandle(shadowNode.getComponentHandle()), surfaceId(shadowNode.getSurfaceId()), @@ -32,7 +32,7 @@ ShadowView::ShadowView(const ShadowNode &shadowNode) layoutMetrics(layoutMetricsFromShadowNode(shadowNode)), state(shadowNode.getState()) {} -bool ShadowView::operator==(const ShadowView &rhs) const { +bool ShadowView::operator==(const ShadowView& rhs) const { return std::tie( this->surfaceId, this->tag, @@ -51,18 +51,18 @@ bool ShadowView::operator==(const ShadowView &rhs) const { rhs.state); } -bool ShadowView::operator!=(const ShadowView &rhs) const { +bool ShadowView::operator!=(const ShadowView& rhs) const { return !(*this == rhs); } #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const ShadowView &object) { +std::string getDebugName(const ShadowView& object) { return object.componentHandle == 0 ? "Invalid" : object.componentName; } std::vector getDebugProps( - const ShadowView &object, + const ShadowView& object, DebugStringConvertibleOptions options) { return { {"surfaceId", getDebugDescription(object.surfaceId, options)}, @@ -78,21 +78,21 @@ std::vector getDebugProps( #endif -bool ShadowViewNodePair::operator==(const ShadowViewNodePair &rhs) const { +bool ShadowViewNodePair::operator==(const ShadowViewNodePair& rhs) const { return this->shadowNode == rhs.shadowNode; } -bool ShadowViewNodePair::operator!=(const ShadowViewNodePair &rhs) const { +bool ShadowViewNodePair::operator!=(const ShadowViewNodePair& rhs) const { return !(*this == rhs); } bool ShadowViewNodePairLegacy::operator==( - const ShadowViewNodePairLegacy &rhs) const { + const ShadowViewNodePairLegacy& rhs) const { return this->shadowNode == rhs.shadowNode; } bool ShadowViewNodePairLegacy::operator!=( - const ShadowViewNodePairLegacy &rhs) const { + const ShadowViewNodePairLegacy& rhs) const { return !(*this == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h index 46e78840e65..863f0af8bd1 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowView.h @@ -24,19 +24,19 @@ namespace facebook::react { */ struct ShadowView final { ShadowView() = default; - ShadowView(const ShadowView &shadowView) = default; - ShadowView(ShadowView &&shadowView) noexcept = default; + ShadowView(const ShadowView& shadowView) = default; + ShadowView(ShadowView&& shadowView) noexcept = default; /* * Constructs a `ShadowView` from given `ShadowNode`. */ - explicit ShadowView(const ShadowNode &shadowNode); + explicit ShadowView(const ShadowNode& shadowNode); - ShadowView &operator=(const ShadowView &other) = default; - ShadowView &operator=(ShadowView &&other) = default; + ShadowView& operator=(const ShadowView& other) = default; + ShadowView& operator=(ShadowView&& other) = default; - bool operator==(const ShadowView &rhs) const; - bool operator!=(const ShadowView &rhs) const; + bool operator==(const ShadowView& rhs) const; + bool operator!=(const ShadowView& rhs) const; ComponentName componentName{}; ComponentHandle componentHandle{}; @@ -51,9 +51,9 @@ struct ShadowView final { #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const ShadowView &object); +std::string getDebugName(const ShadowView& object); std::vector getDebugProps( - const ShadowView &object, + const ShadowView& object, DebugStringConvertibleOptions options); #endif @@ -65,12 +65,12 @@ std::vector getDebugProps( */ struct ShadowViewNodePair final { using NonOwningList = butter:: - small_vector; + small_vector; using OwningList = butter:: small_vector; ShadowView shadowView; - const ShadowNode *shadowNode; + const ShadowNode* shadowNode; bool flattened{false}; bool isConcreteView{true}; Point contextOrigin{0, 0}; @@ -83,13 +83,13 @@ struct ShadowViewNodePair final { * rely on this more heavily to simplify the diffing algorithm * overall? */ - mutable const ShadowViewNodePair *otherTreePair{nullptr}; + mutable const ShadowViewNodePair* otherTreePair{nullptr}; /* * The stored pointer to `ShadowNode` represents an identity of the pair. */ - bool operator==(const ShadowViewNodePair &rhs) const; - bool operator!=(const ShadowViewNodePair &rhs) const; + bool operator==(const ShadowViewNodePair& rhs) const; + bool operator!=(const ShadowViewNodePair& rhs) const; bool inOtherTree() const { return this->otherTreePair != nullptr; @@ -107,7 +107,7 @@ struct ShadowViewNodePairLegacy final { kShadowNodeChildrenSmallVectorSize>; ShadowView shadowView; - const ShadowNode *shadowNode; + const ShadowNode* shadowNode; bool flattened{false}; bool isConcreteView{true}; @@ -118,8 +118,8 @@ struct ShadowViewNodePairLegacy final { /* * The stored pointer to `ShadowNode` represents an identity of the pair. */ - bool operator==(const ShadowViewNodePairLegacy &rhs) const; - bool operator!=(const ShadowViewNodePairLegacy &rhs) const; + bool operator==(const ShadowViewNodePairLegacy& rhs) const; + bool operator!=(const ShadowViewNodePairLegacy& rhs) const; }; } // namespace facebook::react @@ -128,7 +128,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::ShadowView &shadowView) const { + size_t operator()(const facebook::react::ShadowView& shadowView) const { return folly::hash::hash_combine( 0, shadowView.surfaceId, diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp index fec17d28a07..25445b1badc 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.cpp @@ -126,7 +126,7 @@ ShadowViewMutation::ShadowViewMutation( #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const ShadowViewMutation &mutation) { +std::string getDebugName(const ShadowViewMutation& mutation) { switch (mutation.type) { case ShadowViewMutation::Create: return "Create"; @@ -144,7 +144,7 @@ std::string getDebugName(const ShadowViewMutation &mutation) { } std::vector getDebugProps( - const ShadowViewMutation &mutation, + const ShadowViewMutation& mutation, DebugStringConvertibleOptions options) { return { mutation.oldChildShadowView.componentHandle != 0 diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h index 5429f056b97..de399dfe1c6 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/ShadowViewMutation.h @@ -124,9 +124,9 @@ using ShadowViewMutationList = std::vector; #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const ShadowViewMutation &mutation); +std::string getDebugName(const ShadowViewMutation& mutation); std::vector getDebugProps( - const ShadowViewMutation &mutation, + const ShadowViewMutation& mutation, DebugStringConvertibleOptions options); #endif diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubView.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/StubView.cpp index 6b591408f33..93475ccfacd 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/StubView.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubView.cpp @@ -26,7 +26,7 @@ StubView::operator ShadowView() const { return shadowView; } -void StubView::update(const ShadowView &shadowView) { +void StubView::update(const ShadowView& shadowView) { componentName = shadowView.componentName; componentHandle = shadowView.componentHandle; surfaceId = shadowView.surfaceId; @@ -37,7 +37,7 @@ void StubView::update(const ShadowView &shadowView) { state = shadowView.state; } -bool operator==(const StubView &lhs, const StubView &rhs) { +bool operator==(const StubView& lhs, const StubView& rhs) { if (lhs.props != rhs.props) { #ifdef STUB_VIEW_TREE_VERBOSE LOG(ERROR) << "StubView: props do not match. lhs hash: " @@ -57,20 +57,20 @@ bool operator==(const StubView &lhs, const StubView &rhs) { return true; } -bool operator!=(const StubView &lhs, const StubView &rhs) { +bool operator!=(const StubView& lhs, const StubView& rhs) { return !(lhs == rhs); } #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const StubView &stubView) { +std::string getDebugName(const StubView& stubView) { return std::string{"Stub"} + std::string{ stubView.componentHandle != 0 ? stubView.componentName : "[invalid]"}; } std::vector getDebugProps( - const StubView &stubView, + const StubView& stubView, DebugStringConvertibleOptions options) { return { {"surfaceId", getDebugDescription(stubView.surfaceId, options)}, @@ -83,10 +83,10 @@ std::vector getDebugProps( } std::vector getDebugChildren( - const StubView &stubView, + const StubView& stubView, DebugStringConvertibleOptions /*options*/) { std::vector result; - for (const auto &child : stubView.children) { + for (const auto& child : stubView.children) { result.push_back(*child); } return result; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubView.h b/packages/react-native/ReactCommon/react/renderer/mounting/StubView.h index 45a97eefe60..c689ff5803c 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/StubView.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubView.h @@ -24,11 +24,11 @@ class StubView final { using Shared = std::shared_ptr; StubView() = default; - StubView(const StubView &stubView) = default; + StubView(const StubView& stubView) = default; operator ShadowView() const; - void update(const ShadowView &shadowView); + void update(const ShadowView& shadowView); ComponentName componentName; ComponentHandle componentHandle; @@ -42,18 +42,18 @@ class StubView final { Tag parentTag{NO_VIEW_TAG}; }; -bool operator==(const StubView &lhs, const StubView &rhs); -bool operator!=(const StubView &lhs, const StubView &rhs); +bool operator==(const StubView& lhs, const StubView& rhs); +bool operator!=(const StubView& lhs, const StubView& rhs); #if RN_DEBUG_STRING_CONVERTIBLE -std::string getDebugName(const StubView &stubView); +std::string getDebugName(const StubView& stubView); std::vector getDebugProps( - const StubView &stubView, + const StubView& stubView, DebugStringConvertibleOptions options); std::vector getDebugChildren( - const StubView &stubView, + const StubView& stubView, DebugStringConvertibleOptions options); #endif diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp index 2e743c8c733..2e12a01b0f8 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.cpp @@ -18,18 +18,18 @@ namespace facebook::react { -StubViewTree::StubViewTree(const ShadowView &shadowView) { +StubViewTree::StubViewTree(const ShadowView& shadowView) { auto view = std::make_shared(); view->update(shadowView); rootTag_ = shadowView.tag; registry_[shadowView.tag] = view; } -const StubView &StubViewTree::getRootStubView() const { +const StubView& StubViewTree::getRootStubView() const { return *registry_.at(rootTag_); } -const StubView &StubViewTree::getStubView(Tag tag) const { +const StubView& StubViewTree::getStubView(Tag tag) const { return *registry_.at(tag); } @@ -37,9 +37,9 @@ size_t StubViewTree::size() const { return registry_.size(); } -void StubViewTree::mutate(const ShadowViewMutationList &mutations) { +void StubViewTree::mutate(const ShadowViewMutationList& mutations) { STUB_VIEW_LOG({ LOG(ERROR) << "StubView: Mutating Begin"; }); - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { switch (mutation.type) { case ShadowViewMutation::Create: { react_native_assert(mutation.parentShadowView == ShadowView{}); @@ -182,7 +182,7 @@ void StubViewTree::mutate(const ShadowViewMutationList &mutations) { STUB_VIEW_LOG({ std::string strChildList = ""; int i = 0; - for (auto const &child : parentStubView->children) { + for (auto const& child : parentStubView->children) { strChildList.append(std::to_string(i)); strChildList.append(":"); strChildList.append(std::to_string(child->tag)); @@ -262,16 +262,16 @@ void StubViewTree::mutate(const ShadowViewMutationList &mutations) { google::FlushLogFiles(google::GLOG_INFO); } -std::ostream &StubViewTree::dumpTags(std::ostream &stream) { - for (const auto &pair : registry_) { - auto &stubView = *registry_.at(pair.first); +std::ostream& StubViewTree::dumpTags(std::ostream& stream) { + for (const auto& pair : registry_) { + auto& stubView = *registry_.at(pair.first); stream << "[" << stubView.tag << "]##" << std::hash{}((ShadowView)stubView) << " "; } return stream; } -bool operator==(const StubViewTree &lhs, const StubViewTree &rhs) { +bool operator==(const StubViewTree& lhs, const StubViewTree& rhs) { if (lhs.registry_.size() != rhs.registry_.size()) { STUB_VIEW_LOG({ LOG(ERROR) << "Registry sizes are different. Sizes: LHS: " @@ -287,9 +287,9 @@ bool operator==(const StubViewTree &lhs, const StubViewTree &rhs) { return false; } - for (const auto &pair : lhs.registry_) { - auto &lhsStubView = *lhs.registry_.at(pair.first); - auto &rhsStubView = *rhs.registry_.at(pair.first); + for (const auto& pair : lhs.registry_) { + auto& lhsStubView = *lhs.registry_.at(pair.first); + auto& rhsStubView = *rhs.registry_.at(pair.first); if (lhsStubView != rhsStubView) { STUB_VIEW_LOG({ @@ -306,7 +306,7 @@ bool operator==(const StubViewTree &lhs, const StubViewTree &rhs) { return true; } -bool operator!=(const StubViewTree &lhs, const StubViewTree &rhs) { +bool operator!=(const StubViewTree& lhs, const StubViewTree& rhs) { return !(lhs == rhs); } diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.h b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.h index 0d09b950bd2..c10fb9cf51f 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/StubViewTree.h @@ -18,16 +18,16 @@ namespace facebook::react { class StubViewTree { public: StubViewTree() = default; - StubViewTree(const ShadowView &shadowView); + StubViewTree(const ShadowView& shadowView); - void mutate(const ShadowViewMutationList &mutations); + void mutate(const ShadowViewMutationList& mutations); - const StubView &getRootStubView() const; + const StubView& getRootStubView() const; /* * Returns a view with given tag. */ - const StubView &getStubView(Tag tag) const; + const StubView& getStubView(Tag tag) const; /* * Returns the total amount of views in the tree. @@ -38,17 +38,17 @@ class StubViewTree { Tag rootTag_{}; std::unordered_map registry_{}; - friend bool operator==(const StubViewTree &lhs, const StubViewTree &rhs); - friend bool operator!=(const StubViewTree &lhs, const StubViewTree &rhs); + friend bool operator==(const StubViewTree& lhs, const StubViewTree& rhs); + friend bool operator!=(const StubViewTree& lhs, const StubViewTree& rhs); - std::ostream &dumpTags(std::ostream &stream); + std::ostream& dumpTags(std::ostream& stream); bool hasTag(Tag tag) const { return registry_.find(tag) != registry_.end(); } }; -bool operator==(const StubViewTree &lhs, const StubViewTree &rhs); -bool operator!=(const StubViewTree &lhs, const StubViewTree &rhs); +bool operator==(const StubViewTree& lhs, const StubViewTree& rhs); +bool operator!=(const StubViewTree& lhs, const StubViewTree& rhs); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.cpp index 1171791e906..c684b9f6120 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.cpp @@ -12,13 +12,13 @@ namespace facebook::react { TelemetryController::TelemetryController( - const MountingCoordinator &mountingCoordinator) noexcept + const MountingCoordinator& mountingCoordinator) noexcept : mountingCoordinator_(mountingCoordinator) {} bool TelemetryController::pullTransaction( - const MountingTransactionCallback &willMount, - const MountingTransactionCallback &doMount, - const MountingTransactionCallback &didMount) const { + const MountingTransactionCallback& willMount, + const MountingTransactionCallback& doMount, + const MountingTransactionCallback& didMount) const { auto optional = mountingCoordinator_.pullTransaction(); if (!optional.has_value()) { return false; @@ -26,7 +26,7 @@ bool TelemetryController::pullTransaction( auto transaction = std::move(*optional); - auto &telemetry = transaction.getTelemetry(); + auto& telemetry = transaction.getTelemetry(); auto numberOfMutations = static_cast(transaction.getMutations().size()); mutex_.lock(); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.h b/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.h index ab1e5d9a03f..f28af1a1d9f 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/TelemetryController.h @@ -18,8 +18,8 @@ namespace facebook::react { class MountingCoordinator; using MountingTransactionCallback = std::function; + const MountingTransaction& transaction, + const SurfaceTelemetry& surfaceTelemetry)>; /* * Provides convenient tools for aggregating and accessing telemetry data @@ -31,13 +31,13 @@ class TelemetryController final { /* * To be used by `MountingCoordinator`. */ - TelemetryController(const MountingCoordinator &mountingCoordinator) noexcept; + TelemetryController(const MountingCoordinator& mountingCoordinator) noexcept; /* * Not copyable. */ - TelemetryController(const TelemetryController &other) noexcept = delete; - TelemetryController &operator=(const TelemetryController &other) noexcept = + TelemetryController(const TelemetryController& other) noexcept = delete; + TelemetryController& operator=(const TelemetryController& other) noexcept = delete; public: @@ -45,12 +45,12 @@ class TelemetryController final { * Calls `MountingCoordinator::pullTransaction()` and aggregates telemetry. */ bool pullTransaction( - const MountingTransactionCallback &willMount, - const MountingTransactionCallback &doMount, - const MountingTransactionCallback &didMount) const; + const MountingTransactionCallback& willMount, + const MountingTransactionCallback& doMount, + const MountingTransactionCallback& didMount) const; private: - const MountingCoordinator &mountingCoordinator_; + const MountingCoordinator& mountingCoordinator_; mutable SurfaceTelemetry compoundTelemetry_{}; mutable std::mutex mutex_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/stubs.cpp index af09ff8641e..59867f48c0e 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs.cpp @@ -17,8 +17,8 @@ namespace facebook::react { * Sorting comparator for `reorderInPlaceIfNeeded`. */ static bool shouldFirstPairComesBeforeSecondOne( - const ShadowViewNodePair &lhs, - const ShadowViewNodePair &rhs) noexcept { + const ShadowViewNodePair& lhs, + const ShadowViewNodePair& rhs) noexcept { return lhs.shadowNode->getOrderIndex() < rhs.shadowNode->getOrderIndex(); } @@ -26,7 +26,7 @@ static bool shouldFirstPairComesBeforeSecondOne( * Reorders pairs in-place based on `orderIndex` using a stable sort algorithm. */ static void reorderInPlaceIfNeeded( - ShadowViewNodePair::OwningList &pairs) noexcept { + ShadowViewNodePair::OwningList& pairs) noexcept { // This is a simplified version of the function intentionally copied from // `Differentiator.cpp`. std::stable_sort( @@ -40,14 +40,14 @@ static void reorderInPlaceIfNeeded( * an empty tree with some other one. */ static void calculateShadowViewMutationsForNewTree( - ShadowViewMutation::List &mutations, - const ShadowView &parentShadowView, + ShadowViewMutation::List& mutations, + const ShadowView& parentShadowView, ShadowViewNodePair::OwningList newChildPairs) { // Sorting pairs based on `orderIndex` if needed. reorderInPlaceIfNeeded(newChildPairs); for (size_t index = 0; index < newChildPairs.size(); index++) { - const auto &newChildPair = newChildPairs[index]; + const auto& newChildPair = newChildPairs[index]; mutations.push_back( ShadowViewMutation::CreateMutation(newChildPair.shadowView)); @@ -63,7 +63,7 @@ static void calculateShadowViewMutationsForNewTree( } StubViewTree buildStubViewTreeWithoutUsingDifferentiator( - const ShadowNode &rootShadowNode) { + const ShadowNode& rootShadowNode) { auto mutations = ShadowViewMutation::List{}; mutations.reserve(256); @@ -82,7 +82,7 @@ StubViewTree buildStubViewTreeWithoutUsingDifferentiator( } StubViewTree buildStubViewTreeUsingDifferentiator( - const ShadowNode &rootShadowNode) { + const ShadowNode& rootShadowNode) { auto emptyRootShadowNode = rootShadowNode.clone(ShadowNodeFragment{ ShadowNodeFragment::propsPlaceholder(), ShadowNode::emptySharedShadowNodeSharedList()}); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/stubs.h b/packages/react-native/ReactCommon/react/renderer/mounting/stubs.h index a8300977072..2f3cd3740df 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/stubs.h +++ b/packages/react-native/ReactCommon/react/renderer/mounting/stubs.h @@ -18,13 +18,13 @@ namespace facebook::react { * implementation (*without* using Differentiator). */ StubViewTree buildStubViewTreeWithoutUsingDifferentiator( - const ShadowNode &rootShadowNode); + const ShadowNode& rootShadowNode); /* * Builds a ShadowView tree from given root ShadowNode using Differentiator by * generating mutation instructions between empty and final trees. */ StubViewTree buildStubViewTreeUsingDifferentiator( - const ShadowNode &rootShadowNode); + const ShadowNode& rootShadowNode); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp index 32499ecfa07..29fb13e0c26 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/MountingTest.cpp @@ -21,7 +21,7 @@ namespace facebook::react { static SharedViewProps nonFlattenedDefaultProps( - const ComponentDescriptor &componentDescriptor) { + const ComponentDescriptor& componentDescriptor) { folly::dynamic dynamic = folly::dynamic::object(); dynamic["position"] = "absolute"; dynamic["top"] = 0; @@ -43,9 +43,9 @@ static SharedViewProps nonFlattenedDefaultProps( } static ShadowNode::Shared makeNode( - const ComponentDescriptor &componentDescriptor, + const ComponentDescriptor& componentDescriptor, int tag, - const ShadowNode::ListOfShared &children, + const ShadowNode::ListOfShared& children, bool flattened = false) { auto props = flattened ? generateDefaultProps(componentDescriptor) : nonFlattenedDefaultProps(componentDescriptor); @@ -191,37 +191,37 @@ TEST(MountingTest, testReorderingInstructionGeneration) { ShadowNode::ListOfShared{shadowNodeV7})})); // Layout - std::vector affectedLayoutableNodesV1{}; + std::vector affectedLayoutableNodesV1{}; affectedLayoutableNodesV1.reserve(1024); std::const_pointer_cast(rootNodeV1) ->layoutIfNeeded(&affectedLayoutableNodesV1); rootNodeV1->sealRecursive(); - std::vector affectedLayoutableNodesV2{}; + std::vector affectedLayoutableNodesV2{}; affectedLayoutableNodesV2.reserve(1024); std::const_pointer_cast(rootNodeV2) ->layoutIfNeeded(&affectedLayoutableNodesV2); rootNodeV2->sealRecursive(); - std::vector affectedLayoutableNodesV3{}; + std::vector affectedLayoutableNodesV3{}; affectedLayoutableNodesV3.reserve(1024); std::const_pointer_cast(rootNodeV3) ->layoutIfNeeded(&affectedLayoutableNodesV3); rootNodeV3->sealRecursive(); - std::vector affectedLayoutableNodesV4{}; + std::vector affectedLayoutableNodesV4{}; affectedLayoutableNodesV4.reserve(1024); std::const_pointer_cast(rootNodeV4) ->layoutIfNeeded(&affectedLayoutableNodesV4); rootNodeV4->sealRecursive(); - std::vector affectedLayoutableNodesV5{}; + std::vector affectedLayoutableNodesV5{}; affectedLayoutableNodesV5.reserve(1024); std::const_pointer_cast(rootNodeV5) ->layoutIfNeeded(&affectedLayoutableNodesV5); rootNodeV5->sealRecursive(); - std::vector affectedLayoutableNodesV6{}; + std::vector affectedLayoutableNodesV6{}; affectedLayoutableNodesV6.reserve(1024); std::const_pointer_cast(rootNodeV6) ->layoutIfNeeded(&affectedLayoutableNodesV6); @@ -364,7 +364,7 @@ TEST(MountingTest, testReorderingInstructionGeneration) { // The actual nodes that should be created in this transaction have a tag > // 105. EXPECT_TRUE(mutations6.size() == 25); - for (auto &i : mutations6) { + for (auto& i : mutations6) { if (i.type == ShadowViewMutation::Create) { EXPECT_TRUE(i.newChildShadowView.tag > 105); } @@ -593,31 +593,31 @@ TEST(MountingTest, testViewReparentingInstructionGeneration) { ShadowNode::ListOfShared{shadowNodeV5})})); // Layout - std::vector affectedLayoutableNodesV1{}; + std::vector affectedLayoutableNodesV1{}; affectedLayoutableNodesV1.reserve(1024); std::const_pointer_cast(rootNodeV1) ->layoutIfNeeded(&affectedLayoutableNodesV1); rootNodeV1->sealRecursive(); - std::vector affectedLayoutableNodesV2{}; + std::vector affectedLayoutableNodesV2{}; affectedLayoutableNodesV2.reserve(1024); std::const_pointer_cast(rootNodeV2) ->layoutIfNeeded(&affectedLayoutableNodesV2); rootNodeV2->sealRecursive(); - std::vector affectedLayoutableNodesV3{}; + std::vector affectedLayoutableNodesV3{}; affectedLayoutableNodesV3.reserve(1024); std::const_pointer_cast(rootNodeV3) ->layoutIfNeeded(&affectedLayoutableNodesV3); rootNodeV3->sealRecursive(); - std::vector affectedLayoutableNodesV4{}; + std::vector affectedLayoutableNodesV4{}; affectedLayoutableNodesV4.reserve(1024); std::const_pointer_cast(rootNodeV4) ->layoutIfNeeded(&affectedLayoutableNodesV4); rootNodeV4->sealRecursive(); - std::vector affectedLayoutableNodesV5{}; + std::vector affectedLayoutableNodesV5{}; affectedLayoutableNodesV5.reserve(1024); std::const_pointer_cast(rootNodeV5) ->layoutIfNeeded(&affectedLayoutableNodesV5); diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp index d248081aa63..332c5e5aa49 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp @@ -96,7 +96,7 @@ static void testShadowNodeTreeLifeCycle( &messWithLayoutableOnlyFlag, }); - std::vector affectedLayoutableNodes{}; + std::vector affectedLayoutableNodes{}; affectedLayoutableNodes.reserve(1024); // Laying out the tree. @@ -114,12 +114,12 @@ static void testShadowNodeTreeLifeCycle( // view is not followed by a CREATE for the same view. { std::vector deletedTags{}; - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Delete) { deletedTags.push_back(mutation.oldChildShadowView.tag); } } - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Create) { if (std::find( deletedTags.begin(), @@ -248,7 +248,7 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening( alterShadowTree(entropy, nextRootNode, &messWithNodeFlattenednessFlags); alterShadowTree(entropy, nextRootNode, &messWithChildren); - std::vector affectedLayoutableNodes{}; + std::vector affectedLayoutableNodes{}; affectedLayoutableNodes.reserve(1024); // Laying out the tree. @@ -266,12 +266,12 @@ static void testShadowNodeTreeLifeCycleExtensiveFlatteningUnflattening( // view is not followed by a CREATE for the same view. { std::vector deletedTags{}; - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Delete) { deletedTags.push_back(mutation.oldChildShadowView.tag); } } - for (const auto &mutation : mutations) { + for (const auto& mutation : mutations) { if (mutation.type == ShadowViewMutation::Type::Create) { if (std::find( deletedTags.begin(), diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp index 7aa2faad2d4..e63eda57ba8 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StackingContextTest.cpp @@ -152,11 +152,11 @@ class StackingContextTest : public ::testing::Test { } void mutateViewShadowNodeProps_( - const std::shared_ptr &node, - std::function callback) { + const std::shared_ptr& node, + std::function callback) { rootShadowNode_ = std::static_pointer_cast(rootShadowNode_->cloneTree( - node->getFamily(), [&](const ShadowNode &oldShadowNode) { + node->getFamily(), [&](const ShadowNode& oldShadowNode) { auto viewProps = std::make_shared(); callback(*viewProps); return oldShadowNode.clone(ShadowNodeFragment{viewProps}); @@ -164,7 +164,7 @@ class StackingContextTest : public ::testing::Test { } void testViewTree_( - const std::function &callback) { + const std::function& callback) { rootShadowNode_->layoutIfNeeded(); callback(buildStubViewTreeUsingDifferentiator(*rootShadowNode_)); @@ -179,7 +179,7 @@ class StackingContextTest : public ::testing::Test { }; TEST_F(StackingContextTest, defaultPropsMakeEverythingFlattened) { - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 1 view in total. EXPECT_EQ(viewTree.size(), 1); @@ -249,8 +249,8 @@ TEST_F(StackingContextTest, mostPropsDoNotForceViewsToMaterialize) { // │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │ │ │ // └────────────────────────────────────┘ └─────────────────────────────┘ - mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeAA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.padding()[YGEdgeAll] = YGValue{42, YGUnitPoint}; yogaStyle.margin()[YGEdgeAll] = YGValue{42, YGUnitPoint}; yogaStyle.positionType() = YGPositionTypeAbsolute; @@ -259,28 +259,28 @@ TEST_F(StackingContextTest, mostPropsDoNotForceViewsToMaterialize) { props.backgroundColor = clearColor(); }); - mutateViewShadowNodeProps_(nodeBA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; props.zIndex = 42; yogaStyle.margin()[YGEdgeAll] = YGValue{42, YGUnitPoint}; props.shadowColor = clearColor(); props.shadowOpacity = 0.42; }); - mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.borderRadii.all = 42; props.borderColors.all = blackColor(); }); - mutateViewShadowNodeProps_(nodeBD_, [](ViewProps &props) { + mutateViewShadowNodeProps_(nodeBD_, [](ViewProps& props) { props.onLayout = true; props.hitSlop = EdgeInsets{42, 42, 42, 42}; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 1 view in total. EXPECT_EQ(viewTree.size(), 1); @@ -351,15 +351,15 @@ TEST_F(StackingContextTest, somePropsForceViewsToMaterialize1) { // └────────────────────────────────────┘ └─────────────────────────────┘ mutateViewShadowNodeProps_( - nodeAA_, [](ViewProps &props) { props.backgroundColor = blackColor(); }); + nodeAA_, [](ViewProps& props) { props.backgroundColor = blackColor(); }); mutateViewShadowNodeProps_( - nodeBA_, [](ViewProps &props) { props.backgroundColor = whiteColor(); }); + nodeBA_, [](ViewProps& props) { props.backgroundColor = whiteColor(); }); mutateViewShadowNodeProps_( - nodeBBA_, [](ViewProps &props) { props.shadowColor = blackColor(); }); + nodeBBA_, [](ViewProps& props) { props.shadowColor = blackColor(); }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 4 views in total. EXPECT_EQ(viewTree.size(), 4); @@ -435,38 +435,38 @@ TEST_F(StackingContextTest, somePropsForceViewsToMaterialize2) { // └────────────────────────────────────┘ └─────────────────────────────┘ mutateViewShadowNodeProps_( - nodeA_, [](ViewProps &props) { props.backgroundColor = blackColor(); }); + nodeA_, [](ViewProps& props) { props.backgroundColor = blackColor(); }); - mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) { + mutateViewShadowNodeProps_(nodeAA_, [](ViewProps& props) { props.pointerEvents = PointerEventsMode::None; }); mutateViewShadowNodeProps_( - nodeB_, [](ViewProps &props) { props.testId = "42"; }); + nodeB_, [](ViewProps& props) { props.testId = "42"; }); mutateViewShadowNodeProps_( - nodeBA_, [](ViewProps &props) { props.nativeId = "42"; }); + nodeBA_, [](ViewProps& props) { props.nativeId = "42"; }); mutateViewShadowNodeProps_( - nodeBB_, [](ViewProps &props) { props.backgroundColor = blackColor(); }); + nodeBB_, [](ViewProps& props) { props.backgroundColor = blackColor(); }); - mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) { + mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps& props) { props.transform = Transform::Scale(2, 2, 2); }); - mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 42; }); mutateViewShadowNodeProps_( - nodeBC_, [](ViewProps &props) { props.shadowColor = blackColor(); }); + nodeBC_, [](ViewProps& props) { props.shadowColor = blackColor(); }); mutateViewShadowNodeProps_( - nodeBD_, [](ViewProps &props) { props.opacity = 0.42; }); + nodeBD_, [](ViewProps& props) { props.opacity = 0.42; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 10 views in total. EXPECT_EQ(viewTree.size(), 10); @@ -536,43 +536,43 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) { // │ ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛ │ │ │ // └────────────────────────────────────┘ └─────────────────────────────┘ - mutateViewShadowNodeProps_(nodeAA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeAA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 9001; }); - mutateViewShadowNodeProps_(nodeBA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 9000; }); - mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBBA_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 8999; }); - mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBBB_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 8998; }); - mutateViewShadowNodeProps_(nodeBC_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBC_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 8997; }); - mutateViewShadowNodeProps_(nodeBD_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBD_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 8996; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 7 views in total. EXPECT_EQ(viewTree.size(), 7); @@ -650,13 +650,13 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) { // │ └────────────────────────────────┘ │ │ │ // └────────────────────────────────────┘ └────────────────────────────┘ - mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBB_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeRelative; props.zIndex = 42; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 8 views in total. EXPECT_EQ(viewTree.size(), 8); @@ -670,7 +670,7 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) { EXPECT_EQ(viewTree.getRootStubView().children.at(3)->tag, 5); EXPECT_EQ(viewTree.getRootStubView().children.at(4)->tag, 3); - auto &view6 = viewTree.getStubView(6); + auto& view6 = viewTree.getStubView(6); EXPECT_EQ(view6.children.size(), 2); EXPECT_EQ(view6.children.at(0)->tag, 8); EXPECT_EQ(view6.children.at(1)->tag, 7); @@ -678,13 +678,13 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) { // And now, let's revert it back. - mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBB_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.positionType() = YGPositionTypeStatic; props.zIndex = {}; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { // 7 views in total. EXPECT_EQ(viewTree.size(), 7); @@ -762,12 +762,12 @@ TEST_F(StackingContextTest, zIndexAndFlattenedNodes) { // │ └────────────────────────────────┘ │ │ │ // └────────────────────────────────────┘ └────────────────────────────┘ - mutateViewShadowNodeProps_(nodeBB_, [](ViewProps &props) { - auto &yogaStyle = props.yogaStyle; + mutateViewShadowNodeProps_(nodeBB_, [](ViewProps& props) { + auto& yogaStyle = props.yogaStyle; yogaStyle.display() = YGDisplayNone; }); - testViewTree_([](const StubViewTree &viewTree) { + testViewTree_([](const StubViewTree& viewTree) { #ifdef ANDROID // T153547836: Android still mounts views with // ShadowNodeTraits::Trait::Hidden diff --git a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp index 6f48dade41e..9b74efad03e 100644 --- a/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp @@ -25,9 +25,9 @@ using namespace facebook::react; class DummyShadowTreeDelegate : public ShadowTreeDelegate { public: RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree & /*shadowTree*/, - const RootShadowNode::Shared & /*oldRootShadowNode*/, - const RootShadowNode::Unshared &newRootShadowNode) const override { + const ShadowTree& /*shadowTree*/, + const RootShadowNode::Shared& /*oldRootShadowNode*/, + const RootShadowNode::Unshared& newRootShadowNode) const override { return newRootShadowNode; }; @@ -36,20 +36,20 @@ class DummyShadowTreeDelegate : public ShadowTreeDelegate { bool mountSynchronously) const override{}; }; -inline const ShadowNode *findDescendantNode( - const ShadowNode &shadowNode, - const ShadowNodeFamily &family) { - const ShadowNode *result = nullptr; - shadowNode.cloneTree(family, [&](const ShadowNode &oldShadowNode) { +inline const ShadowNode* findDescendantNode( + const ShadowNode& shadowNode, + const ShadowNodeFamily& family) { + const ShadowNode* result = nullptr; + shadowNode.cloneTree(family, [&](const ShadowNode& oldShadowNode) { result = &oldShadowNode; return oldShadowNode.clone({}); }); return result; } -inline const ShadowNode *findDescendantNode( - const ShadowTree &shadowTree, - const ShadowNodeFamily &family) { +inline const ShadowNode* findDescendantNode( + const ShadowTree& shadowTree, + const ShadowNodeFamily& family) { return findDescendantNode( *shadowTree.getCurrentRevision().rootShadowNode, family); } @@ -96,8 +96,8 @@ TEST(StateReconciliationTest, testStateReconciliation) { auto rootShadowNodeState1 = shadowNode->ShadowNode::clone({}); - auto &scrollViewComponentDescriptor = shadowNodeAB->getComponentDescriptor(); - auto &family = shadowNodeAB->getFamily(); + auto& scrollViewComponentDescriptor = shadowNodeAB->getComponentDescriptor(); + auto& family = shadowNodeAB->getFamily(); auto state1 = shadowNodeAB->getState(); auto shadowTreeDelegate = DummyShadowTreeDelegate{}; ShadowTree shadowTree{ @@ -108,7 +108,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { contextContainer}; shadowTree.commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) { + [&](const RootShadowNode& /*oldRootShadowNode*/) { return std::static_pointer_cast(rootShadowNodeState1); }, {true}); @@ -122,7 +122,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { family, std::make_shared()); auto rootShadowNodeState2 = - shadowNode->cloneTree(family, [&](const ShadowNode &oldShadowNode) { + shadowNode->cloneTree(family, [&](const ShadowNode& oldShadowNode) { return oldShadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), ShadowNodeFragment::childrenPlaceholder(), @@ -133,7 +133,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { findDescendantNode(*rootShadowNodeState2, family)->getState(), state2); shadowTree.commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) { + [&](const RootShadowNode& /*oldRootShadowNode*/) { return std::static_pointer_cast(rootShadowNodeState2); }, {true}); @@ -145,7 +145,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { family, std::make_shared()); auto rootShadowNodeState3 = rootShadowNodeState2->cloneTree( - family, [&](const ShadowNode &oldShadowNode) { + family, [&](const ShadowNode& oldShadowNode) { return oldShadowNode.clone( {ShadowNodeFragment::propsPlaceholder(), ShadowNodeFragment::childrenPlaceholder(), @@ -156,7 +156,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { findDescendantNode(*rootShadowNodeState3, family)->getState(), state3); shadowTree.commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) { + [&](const RootShadowNode& /*oldRootShadowNode*/) { return std::static_pointer_cast(rootShadowNodeState3); }, {true}); @@ -171,7 +171,7 @@ TEST(StateReconciliationTest, testStateReconciliation) { // Here we commit the old tree but we expect that the state associated with // the node will stay the same (newer that the old tree has). shadowTree.commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) { + [&](const RootShadowNode& /*oldRootShadowNode*/) { return std::static_pointer_cast(rootShadowNodeState2); }, {true}); diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp index 2a0147e0d80..2e478c78e35 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.cpp @@ -24,7 +24,7 @@ IntersectionObserver::IntersectionObserver( thresholds_(std::move(thresholds)) {} static Rect getRootBoundingRect( - const LayoutableShadowNode &layoutableRootShadowNode) { + const LayoutableShadowNode& layoutableRootShadowNode) { auto layoutMetrics = layoutableRootShadowNode.getLayoutMetrics(); if (layoutMetrics == EmptyLayoutMetrics || @@ -38,7 +38,7 @@ static Rect getRootBoundingRect( } static Rect getTargetBoundingRect( - const ShadowNodeFamily::AncestorList &targetAncestors) { + const ShadowNodeFamily::AncestorList& targetAncestors) { auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics( targetAncestors, {/* .includeTransform = */ true, @@ -47,7 +47,7 @@ static Rect getTargetBoundingRect( } static Rect getClippedTargetBoundingRect( - const ShadowNodeFamily::AncestorList &targetAncestors) { + const ShadowNodeFamily::AncestorList& targetAncestors) { auto layoutMetrics = LayoutableShadowNode::computeRelativeLayoutMetrics( targetAncestors, {/* .includeTransform = */ true, @@ -60,9 +60,9 @@ static Rect getClippedTargetBoundingRect( // Partially equivalent to // https://w3c.github.io/IntersectionObserver/#compute-the-intersection static Rect computeIntersection( - const Rect &rootBoundingRect, - const Rect &targetBoundingRect, - const ShadowNodeFamily::AncestorList &targetAncestors) { + const Rect& rootBoundingRect, + const Rect& targetBoundingRect, + const ShadowNodeFamily::AncestorList& targetAncestors) { auto absoluteIntersectionRect = Rect::intersect(rootBoundingRect, targetBoundingRect); @@ -90,10 +90,10 @@ static Rect computeIntersection( // https://w3c.github.io/IntersectionObserver/#update-intersection-observations-algo std::optional IntersectionObserver::updateIntersectionObservation( - const RootShadowNode &rootShadowNode, + const RootShadowNode& rootShadowNode, double mountTime) { const auto layoutableRootShadowNode = - traitCast(&rootShadowNode); + traitCast(&rootShadowNode); react_native_assert( layoutableRootShadowNode != nullptr && @@ -153,9 +153,9 @@ Float IntersectionObserver::getHighestThresholdCrossed( std::optional IntersectionObserver::setIntersectingState( - const Rect &rootBoundingRect, - const Rect &targetBoundingRect, - const Rect &intersectionRect, + const Rect& rootBoundingRect, + const Rect& targetBoundingRect, + const Rect& intersectionRect, Float threshold, double mountTime) { auto newState = IntersectionObserverState::Intersecting(threshold); @@ -179,8 +179,8 @@ IntersectionObserver::setIntersectingState( std::optional IntersectionObserver::setNotIntersectingState( - const Rect &rootBoundingRect, - const Rect &targetBoundingRect, + const Rect& rootBoundingRect, + const Rect& targetBoundingRect, double mountTime) { if (state_ != IntersectionObserverState::NotIntersecting()) { state_ = IntersectionObserverState::NotIntersecting(); diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h index 40015795451..5daba9023ef 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserver.h @@ -40,14 +40,14 @@ class IntersectionObserver { // Partially equivalent to // https://w3c.github.io/IntersectionObserver/#update-intersection-observations-algo std::optional updateIntersectionObservation( - const RootShadowNode &rootShadowNode, + const RootShadowNode& rootShadowNode, double mountTime); IntersectionObserverObserverId getIntersectionObserverId() const { return intersectionObserverId_; } - const ShadowNode &getTargetShadowNode() const { + const ShadowNode& getTargetShadowNode() const { return *targetShadowNode_; } @@ -59,15 +59,15 @@ class IntersectionObserver { Float getHighestThresholdCrossed(Float intersectionRatio); std::optional setIntersectingState( - const Rect &rootBoundingRect, - const Rect &targetBoundingRect, - const Rect &intersectionRect, + const Rect& rootBoundingRect, + const Rect& targetBoundingRect, + const Rect& intersectionRect, Float threshold, double mountTime); std::optional setNotIntersectingState( - const Rect &rootBoundingRect, - const Rect &targetBoundingRect, + const Rect& rootBoundingRect, + const Rect& targetBoundingRect, double mountTime); IntersectionObserverObserverId intersectionObserverId_; diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp index 2c5de60ac2e..2c992c64cb1 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.cpp @@ -17,22 +17,22 @@ IntersectionObserverManager::IntersectionObserverManager() = default; void IntersectionObserverManager::observe( IntersectionObserverObserverId intersectionObserverId, - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, std::vector thresholds, - const UIManager &uiManager) { + const UIManager& uiManager) { SystraceSection s("IntersectionObserverManager::observe"); auto surfaceId = shadowNode->getSurfaceId(); // The actual observer lives in the array, so we need to create it there and // then get a reference. Otherwise we only update its state in a copy. - IntersectionObserver *observer; + IntersectionObserver* observer; // Register observer { std::unique_lock lock(observersMutex_); - auto &observers = observersBySurfaceId_[surfaceId]; + auto& observers = observersBySurfaceId_[surfaceId]; observers.emplace_back(IntersectionObserver{ intersectionObserverId, shadowNode, std::move(thresholds)}); observer = &observers.back(); @@ -42,10 +42,10 @@ void IntersectionObserverManager::observe( // Ideally, we'd have well defined event loop step to notify observers // (like on the Web) and we'd send the initial notification there, but as // we don't have it we have to run this check once and manually dispatch. - auto &shadowTreeRegistry = uiManager.getShadowTreeRegistry(); + auto& shadowTreeRegistry = uiManager.getShadowTreeRegistry(); MountingCoordinator::Shared mountingCoordinator = nullptr; RootShadowNode::Shared rootShadowNode = nullptr; - shadowTreeRegistry.visit(surfaceId, [&](const ShadowTree &shadowTree) { + shadowTreeRegistry.visit(surfaceId, [&](const ShadowTree& shadowTree) { mountingCoordinator = shadowTree.getMountingCoordinator(); rootShadowNode = shadowTree.getCurrentRevision().rootShadowNode; }); @@ -67,7 +67,7 @@ void IntersectionObserverManager::observe( void IntersectionObserverManager::unobserve( IntersectionObserverObserverId intersectionObserverId, - const ShadowNode &shadowNode) { + const ShadowNode& shadowNode) { SystraceSection s("IntersectionObserverManager::unobserve"); std::unique_lock lock(observersMutex_); @@ -79,13 +79,13 @@ void IntersectionObserverManager::unobserve( return; } - auto &observers = observersIt->second; + auto& observers = observersIt->second; observers.erase( std::remove_if( observers.begin(), observers.end(), - [intersectionObserverId, &shadowNode](const auto &observer) { + [intersectionObserverId, &shadowNode](const auto& observer) { return observer.getIntersectionObserverId() == intersectionObserverId && ShadowNode::sameFamily( @@ -99,7 +99,7 @@ void IntersectionObserverManager::unobserve( } void IntersectionObserverManager::connect( - UIManager &uiManager, + UIManager& uiManager, std::function notifyIntersectionObserversCallback) { SystraceSection s("IntersectionObserverManager::connect"); notifyIntersectionObserversCallback_ = @@ -114,7 +114,7 @@ void IntersectionObserverManager::connect( mountHookRegistered_ = true; } -void IntersectionObserverManager::disconnect(UIManager &uiManager) { +void IntersectionObserverManager::disconnect(UIManager& uiManager) { SystraceSection s("IntersectionObserverManager::disconnect"); // Fail-safe in case the caller doesn't guarantee consistency. @@ -139,13 +139,13 @@ IntersectionObserverManager::takeRecords() { } void IntersectionObserverManager::shadowTreeDidMount( - const RootShadowNode::Shared &rootShadowNode, + const RootShadowNode::Shared& rootShadowNode, double mountTime) noexcept { updateIntersectionObservations(*rootShadowNode, mountTime); } void IntersectionObserverManager::updateIntersectionObservations( - const RootShadowNode &rootShadowNode, + const RootShadowNode& rootShadowNode, double mountTime) { SystraceSection s( "IntersectionObserverManager::updateIntersectionObservations"); @@ -163,8 +163,8 @@ void IntersectionObserverManager::updateIntersectionObservations( return; } - auto &observers = observersIt->second; - for (auto &observer : observers) { + auto& observers = observersIt->second; + for (auto& observer : observers) { auto entry = observer.updateIntersectionObservation(rootShadowNode, mountTime); if (entry) { diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h index 6fee80ba8f2..480f7f7f22d 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverManager.h @@ -22,26 +22,26 @@ class IntersectionObserverManager final : public UIManagerMountHook { void observe( IntersectionObserverObserverId intersectionObserverId, - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, std::vector thresholds, - const UIManager &uiManager); + const UIManager& uiManager); void unobserve( IntersectionObserverObserverId intersectionObserverId, - const ShadowNode &shadowNode); + const ShadowNode& shadowNode); void connect( - UIManager &uiManager, + UIManager& uiManager, std::function notifyIntersectionObserversCallback); - void disconnect(UIManager &uiManager); + void disconnect(UIManager& uiManager); std::vector takeRecords(); #pragma mark - UIManagerMountHook void shadowTreeDidMount( - const RootShadowNode::Shared &rootShadowNode, + const RootShadowNode::Shared& rootShadowNode, double mountTime) noexcept override; private: @@ -63,10 +63,10 @@ class IntersectionObserverManager final : public UIManagerMountHook { // Equivalent to // https://w3c.github.io/IntersectionObserver/#update-intersection-observations-algo void updateIntersectionObservations( - const RootShadowNode &rootShadowNode, + const RootShadowNode& rootShadowNode, double mountTime); - const IntersectionObserver &getRegisteredIntersectionObserver( + const IntersectionObserver& getRegisteredIntersectionObserver( SurfaceId surfaceId, IntersectionObserverObserverId observerId) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.cpp b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.cpp index 79feead1cac..43f2144886f 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.cpp @@ -41,7 +41,7 @@ bool IntersectionObserverState::isIntersecting() const { } bool IntersectionObserverState::operator==( - const IntersectionObserverState &other) const { + const IntersectionObserverState& other) const { if (state_ != other.state_) { return false; } @@ -54,7 +54,7 @@ bool IntersectionObserverState::operator==( } bool IntersectionObserverState::operator!=( - const IntersectionObserverState &other) const { + const IntersectionObserverState& other) const { return !(*this == other); } } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.h b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.h index 67ae4e98c93..18b10fe9707 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/intersection/IntersectionObserverState.h @@ -27,8 +27,8 @@ class IntersectionObserverState { bool isIntersecting() const; - bool operator==(const IntersectionObserverState &other) const; - bool operator!=(const IntersectionObserverState &other) const; + bool operator==(const IntersectionObserverState& other) const; + bool operator!=(const IntersectionObserverState& other) const; private: explicit IntersectionObserverState(IntersectionObserverStateType state); diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp index 9cb87507afb..c24db979c15 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.cpp @@ -24,7 +24,7 @@ void MutationObserver::observe( } } -void MutationObserver::unobserve(const ShadowNode &targetShadowNode) { +void MutationObserver::unobserve(const ShadowNode& targetShadowNode) { // We don't know if it's being observed deeply or not, so we need to check // both possibilities. deeplyObservedShadowNodes_.erase( @@ -52,8 +52,8 @@ bool MutationObserver::isObserving() const { } static ShadowNode::Shared getShadowNodeInTree( - const ShadowNode &shadowNode, - const ShadowNode &newTree) { + const ShadowNode& shadowNode, + const ShadowNode& newTree) { auto ancestors = shadowNode.getFamily().getAncestors(newTree); if (ancestors.empty()) { return nullptr; @@ -64,9 +64,9 @@ static ShadowNode::Shared getShadowNodeInTree( } static ShadowNode::Shared findNodeOfSameFamily( - const ShadowNode::ListOfShared &list, - const ShadowNode &node) { - for (auto ¤t : list) { + const ShadowNode::ListOfShared& list, + const ShadowNode& node) { + for (auto& current : list) { if (ShadowNode::sameFamily(node, *current)) { return current; } @@ -75,9 +75,9 @@ static ShadowNode::Shared findNodeOfSameFamily( } void MutationObserver::recordMutations( - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode, - std::vector &recordedMutations) const { + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode, + std::vector& recordedMutations) const { // This tracks the nodes that have already been processed by this observer, // so we avoid unnecessary work and duplicated entries. SetOfShadowNodePointers processedNodes; @@ -107,11 +107,11 @@ void MutationObserver::recordMutations( void MutationObserver::recordMutationsInTarget( ShadowNode::Shared targetShadowNode, - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode, + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode, bool observeSubtree, - std::vector &recordedMutations, - SetOfShadowNodePointers &processedNodes) const { + std::vector& recordedMutations, + SetOfShadowNodePointers& processedNodes) const { // If the node isnt't present in the old tree, it's either: // - A new node. In that case, the mutation happened in its parent, not in the // node itself. @@ -143,10 +143,10 @@ void MutationObserver::recordMutationsInTarget( void MutationObserver::recordMutationsInSubtrees( ShadowNode::Shared targetShadowNode, - const ShadowNode &oldNode, - const ShadowNode &newNode, + const ShadowNode& oldNode, + const ShadowNode& newNode, bool observeSubtree, - std::vector &recordedMutations, + std::vector& recordedMutations, SetOfShadowNodePointers processedNodes) const { bool isSameNode = &oldNode == &newNode; // If the nodes are referentially equal, their children are also the same. @@ -163,7 +163,7 @@ void MutationObserver::recordMutationsInSubtrees( std::vector removedNodes; // Check for removed nodes (and equal nodes for further inspection) - for (auto &oldChild : oldChildren) { + for (auto& oldChild : oldChildren) { auto newChild = findNodeOfSameFamily(newChildren, *oldChild); if (!newChild) { removedNodes.push_back(oldChild); @@ -181,7 +181,7 @@ void MutationObserver::recordMutationsInSubtrees( } // Check for added nodes - for (auto &newChild : newChildren) { + for (auto& newChild : newChildren) { auto oldChild = findNodeOfSameFamily(oldChildren, *newChild); if (!oldChild) { addedNodes.push_back(newChild); diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.h b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.h index 557564a30b2..02d539c85d3 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserver.h @@ -28,36 +28,36 @@ class MutationObserver { MutationObserver(MutationObserverId intersectionObserverId); void observe(ShadowNode::Shared targetShadowNode, bool observeSubtree); - void unobserve(const ShadowNode &targetShadowNode); + void unobserve(const ShadowNode& targetShadowNode); bool isObserving() const; void recordMutations( - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode, - std::vector &recordedMutations) const; + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode, + std::vector& recordedMutations) const; private: MutationObserverId mutationObserverId_; std::vector deeplyObservedShadowNodes_; std::vector shallowlyObservedShadowNodes_; - using SetOfShadowNodePointers = std::unordered_set; + using SetOfShadowNodePointers = std::unordered_set; void recordMutationsInTarget( ShadowNode::Shared targetShadowNode, - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode, + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode, bool observeSubtree, - std::vector &recordedMutations, - SetOfShadowNodePointers &processedNodes) const; + std::vector& recordedMutations, + SetOfShadowNodePointers& processedNodes) const; void recordMutationsInSubtrees( ShadowNode::Shared targetShadowNode, - const ShadowNode &oldNode, - const ShadowNode &newNode, + const ShadowNode& oldNode, + const ShadowNode& newNode, bool observeSubtree, - std::vector &recordedMutations, + std::vector& recordedMutations, SetOfShadowNodePointers processedNodes) const; }; diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp index b9375177477..681884ef40e 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.cpp @@ -18,12 +18,12 @@ void MutationObserverManager::observe( MutationObserverId mutationObserverId, ShadowNode::Shared shadowNode, bool observeSubtree, - const UIManager &uiManager) { + const UIManager& uiManager) { SystraceSection s("MutationObserverManager::observe"); auto surfaceId = shadowNode->getSurfaceId(); - auto &observers = observersBySurfaceId_[surfaceId]; + auto& observers = observersBySurfaceId_[surfaceId]; auto observerIt = observers.find(mutationObserverId); if (observerIt == observers.end()) { @@ -38,7 +38,7 @@ void MutationObserverManager::observe( void MutationObserverManager::unobserve( MutationObserverId mutationObserverId, - const ShadowNode &shadowNode) { + const ShadowNode& shadowNode) { SystraceSection s("MutationObserverManager::unobserve"); auto surfaceId = shadowNode.getSurfaceId(); @@ -48,14 +48,14 @@ void MutationObserverManager::unobserve( return; } - auto &observers = observersIt->second; + auto& observers = observersIt->second; auto observerIt = observers.find(mutationObserverId); if (observerIt == observers.end()) { return; } - auto &observer = observerIt->second; + auto& observer = observerIt->second; observer.unobserve(shadowNode); @@ -69,8 +69,8 @@ void MutationObserverManager::unobserve( } void MutationObserverManager::connect( - UIManager &uiManager, - std::function &)> onMutations) { + UIManager& uiManager, + std::function&)> onMutations) { SystraceSection s("MutationObserverManager::connect"); // Fail-safe in case the caller doesn't guarantee consistency. @@ -84,7 +84,7 @@ void MutationObserverManager::connect( commitHookRegistered_ = true; } -void MutationObserverManager::disconnect(UIManager &uiManager) { +void MutationObserverManager::disconnect(UIManager& uiManager) { SystraceSection s("MutationObserverManager::disconnect"); // Fail-safe in case the caller doesn't guarantee consistency. @@ -99,22 +99,22 @@ void MutationObserverManager::disconnect(UIManager &uiManager) { } void MutationObserverManager::commitHookWasRegistered( - const UIManager &uiManager) noexcept {} + const UIManager& uiManager) noexcept {} void MutationObserverManager::commitHookWasUnregistered( - const UIManager &uiManager) noexcept {} + const UIManager& uiManager) noexcept {} RootShadowNode::Unshared MutationObserverManager::shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) noexcept { + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) noexcept { runMutationObservations(shadowTree, *oldRootShadowNode, *newRootShadowNode); return newRootShadowNode; } void MutationObserverManager::runMutationObservations( - const ShadowTree &shadowTree, - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode) { + const ShadowTree& shadowTree, + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode) { SystraceSection s("MutationObserverManager::runMutationObservations"); auto surfaceId = shadowTree.getSurfaceId(); @@ -126,8 +126,8 @@ void MutationObserverManager::runMutationObservations( std::vector mutationRecords; - auto &observers = observersIt->second; - for (const auto &[mutationObserverId, observer] : observers) { + auto& observers = observersIt->second; + for (const auto& [mutationObserverId, observer] : observers) { observer.recordMutations( oldRootShadowNode, newRootShadowNode, mutationRecords); } diff --git a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.h b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.h index 0f4e5dde773..25c3751c89f 100644 --- a/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.h +++ b/packages/react-native/ReactCommon/react/renderer/observers/mutation/MutationObserverManager.h @@ -23,27 +23,27 @@ class MutationObserverManager final : public UIManagerCommitHook { MutationObserverId mutationObserverId, ShadowNode::Shared shadowNode, bool observeSubtree, - const UIManager &uiManager); + const UIManager& uiManager); void unobserve( MutationObserverId mutationObserverId, - const ShadowNode &shadowNode); + const ShadowNode& shadowNode); void connect( - UIManager &uiManager, - std::function &)> onMutations); + UIManager& uiManager, + std::function&)> onMutations); - void disconnect(UIManager &uiManager); + void disconnect(UIManager& uiManager); #pragma mark - UIManagerCommitHook - void commitHookWasRegistered(const UIManager &uiManager) noexcept override; - void commitHookWasUnregistered(const UIManager &uiManager) noexcept override; + void commitHookWasRegistered(const UIManager& uiManager) noexcept override; + void commitHookWasUnregistered(const UIManager& uiManager) noexcept override; RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) noexcept override; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) noexcept override; private: std::unordered_map< @@ -51,13 +51,13 @@ class MutationObserverManager final : public UIManagerCommitHook { std::unordered_map> observersBySurfaceId_; - std::function &)> onMutations_; + std::function&)> onMutations_; bool commitHookRegistered_{}; void runMutationObservations( - const ShadowTree &shadowTree, - const RootShadowNode &oldRootShadowNode, - const RootShadowNode &newRootShadowNode); + const ShadowTree& shadowTree, + const RootShadowNode& oldRootShadowNode, + const RootShadowNode& newRootShadowNode); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h index ee289f508ef..a73bb52ce3c 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/ErrorUtils.h @@ -10,8 +10,8 @@ namespace facebook::react { inline static void handleFatalError( - jsi::Runtime &runtime, - const jsi::JSError &error) { + jsi::Runtime& runtime, + const jsi::JSError& error) { auto reportFatalError = "reportFatalError"; auto errorUtils = runtime.global().getProperty(runtime, "ErrorUtils"); if (errorUtils.isUndefined() || !errorUtils.isObject() || diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp index 40b33fd7fad..1141ba9bbc2 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.cpp @@ -24,7 +24,7 @@ void RuntimeScheduler::scheduleWork(RawCallback callback) const { runtimeAccessRequests_ += 1; runtimeExecutor_( - [this, callback = std::move(callback)](jsi::Runtime &runtime) { + [this, callback = std::move(callback)](jsi::Runtime& runtime) { runtimeAccessRequests_ -= 1; callback(runtime); startWorkLoop(runtime); @@ -65,7 +65,7 @@ bool RuntimeScheduler::getIsSynchronous() const noexcept { return isSynchronous_; } -void RuntimeScheduler::cancelTask(Task &task) noexcept { +void RuntimeScheduler::cancelTask(Task& task) noexcept { task.callback.reset(); } @@ -81,7 +81,7 @@ void RuntimeScheduler::executeNowOnTheSameThread(RawCallback callback) { runtimeAccessRequests_ += 1; executeSynchronouslyOnSameThread_CAN_DEADLOCK( runtimeExecutor_, - [this, callback = std::move(callback)](jsi::Runtime &runtime) { + [this, callback = std::move(callback)](jsi::Runtime& runtime) { runtimeAccessRequests_ -= 1; isSynchronous_ = true; callback(runtime); @@ -94,7 +94,7 @@ void RuntimeScheduler::executeNowOnTheSameThread(RawCallback callback) { scheduleWorkLoopIfNecessary(); } -void RuntimeScheduler::callExpiredTasks(jsi::Runtime &runtime) { +void RuntimeScheduler::callExpiredTasks(jsi::Runtime& runtime) { auto previousPriority = currentPriority_; try { while (!taskQueue_.empty()) { @@ -118,7 +118,7 @@ void RuntimeScheduler::callExpiredTasks(jsi::Runtime &runtime) { } } } - } catch (jsi::JSError &error) { + } catch (jsi::JSError& error) { handleFatalError(runtime, error); } @@ -130,14 +130,14 @@ void RuntimeScheduler::callExpiredTasks(jsi::Runtime &runtime) { void RuntimeScheduler::scheduleWorkLoopIfNecessary() const { if (!isWorkLoopScheduled_ && !isPerformingWork_) { isWorkLoopScheduled_ = true; - runtimeExecutor_([this](jsi::Runtime &runtime) { + runtimeExecutor_([this](jsi::Runtime& runtime) { isWorkLoopScheduled_ = false; startWorkLoop(runtime); }); } } -void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const { +void RuntimeScheduler::startWorkLoop(jsi::Runtime& runtime) const { auto previousPriority = currentPriority_; isPerformingWork_ = true; try { @@ -163,7 +163,7 @@ void RuntimeScheduler::startWorkLoop(jsi::Runtime &runtime) const { } } } - } catch (jsi::JSError &error) { + } catch (jsi::JSError& error) { handleFatalError(runtime, error); } diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h index b6c0a595507..a209f2f36fe 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeScheduler.h @@ -25,14 +25,14 @@ class RuntimeScheduler final { /* * Not copyable. */ - RuntimeScheduler(const RuntimeScheduler &) = delete; - RuntimeScheduler &operator=(const RuntimeScheduler &) = delete; + RuntimeScheduler(const RuntimeScheduler&) = delete; + RuntimeScheduler& operator=(const RuntimeScheduler&) = delete; /* * Not movable. */ - RuntimeScheduler(RuntimeScheduler &&) = delete; - RuntimeScheduler &operator=(RuntimeScheduler &&) = delete; + RuntimeScheduler(RuntimeScheduler&&) = delete; + RuntimeScheduler& operator=(RuntimeScheduler&&) = delete; void scheduleWork(RawCallback callback) const; @@ -65,7 +65,7 @@ class RuntimeScheduler final { * Operates on JSI object. * Thread synchronization must be enforced externally. */ - void cancelTask(Task &task) noexcept; + void cancelTask(Task& task) noexcept; /* * Return value indicates if host platform has a pending access to the @@ -106,7 +106,7 @@ class RuntimeScheduler final { * * Thread synchronization must be enforced externally. */ - void callExpiredTasks(jsi::Runtime &runtime); + void callExpiredTasks(jsi::Runtime& runtime); private: mutable std::priority_queue< @@ -125,7 +125,7 @@ class RuntimeScheduler final { mutable std::atomic_bool isSynchronous_{false}; - void startWorkLoop(jsi::Runtime &runtime) const; + void startWorkLoop(jsi::Runtime& runtime) const; /* * Schedules a work loop unless it has been already scheduled diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp index c42d5b5d4e4..8bcb0420df9 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp @@ -19,8 +19,8 @@ namespace facebook::react { std::shared_ptr RuntimeSchedulerBinding::createAndInstallIfNeeded( - jsi::Runtime &runtime, - const std::shared_ptr &runtimeScheduler) { + jsi::Runtime& runtime, + const std::shared_ptr& runtimeScheduler) { auto runtimeSchedulerModuleName = "nativeRuntimeScheduler"; auto runtimeSchedulerValue = @@ -44,7 +44,7 @@ RuntimeSchedulerBinding::createAndInstallIfNeeded( } std::shared_ptr RuntimeSchedulerBinding::getBinding( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { auto runtimeSchedulerModuleName = "nativeRuntimeScheduler"; auto runtimeSchedulerValue = @@ -66,8 +66,8 @@ bool RuntimeSchedulerBinding::getIsSynchronous() const { } jsi::Value RuntimeSchedulerBinding::get( - jsi::Runtime &runtime, - const jsi::PropNameID &name) { + jsi::Runtime& runtime, + const jsi::PropNameID& name) { auto propertyName = name.utf8(runtime); if (propertyName == "unstable_scheduleCallback") { @@ -76,9 +76,9 @@ jsi::Value RuntimeSchedulerBinding::get( name, 3, [this]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* arguments, size_t) noexcept -> jsi::Value { SchedulerPriority priority = fromRawValue(arguments[0].getNumber()); auto callback = arguments[1].getObject(runtime).getFunction(runtime); @@ -96,9 +96,9 @@ jsi::Value RuntimeSchedulerBinding::get( name, 1, [this]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* arguments, size_t) noexcept -> jsi::Value { runtimeScheduler_->cancelTask(*taskFromValue(runtime, arguments[0])); return jsi::Value::undefined(); @@ -111,9 +111,9 @@ jsi::Value RuntimeSchedulerBinding::get( name, 0, [this]( - jsi::Runtime &, - const jsi::Value &, - const jsi::Value *, + jsi::Runtime&, + const jsi::Value&, + const jsi::Value*, size_t) noexcept -> jsi::Value { auto shouldYield = runtimeScheduler_->getShouldYield(); return {shouldYield}; @@ -125,10 +125,8 @@ jsi::Value RuntimeSchedulerBinding::get( runtime, name, 0, - [](jsi::Runtime &, - const jsi::Value &, - const jsi::Value *, - size_t) noexcept -> jsi::Value { + [](jsi::Runtime&, const jsi::Value&, const jsi::Value*, size_t) noexcept + -> jsi::Value { // RequestPaint is left empty by design. return jsi::Value::undefined(); }); @@ -140,9 +138,9 @@ jsi::Value RuntimeSchedulerBinding::get( name, 0, [this]( - jsi::Runtime &, - const jsi::Value &, - const jsi::Value *, + jsi::Runtime&, + const jsi::Value&, + const jsi::Value*, size_t) noexcept -> jsi::Value { auto now = runtimeScheduler_->now(); auto asDouble = @@ -159,9 +157,9 @@ jsi::Value RuntimeSchedulerBinding::get( name, 0, [this]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value*, size_t) noexcept -> jsi::Value { auto currentPriorityLevel = runtimeScheduler_->getCurrentPriorityLevel(); diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h index a97b04cca07..5058cb40252 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h @@ -27,20 +27,20 @@ class RuntimeSchedulerBinding : public jsi::HostObject { * installed, returns that. */ static std::shared_ptr createAndInstallIfNeeded( - jsi::Runtime &runtime, - const std::shared_ptr &runtimeScheduler); + jsi::Runtime& runtime, + const std::shared_ptr& runtimeScheduler); /* * Returns a shared pointer to RuntimeSchedulerBinding previously installed * into a runtime. Thread synchronization must be enforced externally. */ static std::shared_ptr getBinding( - jsi::Runtime &runtime); + jsi::Runtime& runtime); /* * `jsi::HostObject` specific overloads. */ - jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override; + jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override; bool getIsSynchronous() const; diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp index febf3ee0a6a..fedf53eeec9 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp @@ -16,26 +16,26 @@ RuntimeSchedulerCallInvoker::RuntimeSchedulerCallInvoker( std::weak_ptr runtimeScheduler) : runtimeScheduler_(std::move(runtimeScheduler)) {} -void RuntimeSchedulerCallInvoker::invokeAsync(CallFunc &&func) { +void RuntimeSchedulerCallInvoker::invokeAsync(CallFunc&& func) { if (auto runtimeScheduler = runtimeScheduler_.lock()) { runtimeScheduler->scheduleWork( - [func = std::move(func)](jsi::Runtime &) { func(); }); + [func = std::move(func)](jsi::Runtime&) { func(); }); } } -void RuntimeSchedulerCallInvoker::invokeSync(CallFunc &&func) { +void RuntimeSchedulerCallInvoker::invokeSync(CallFunc&& func) { if (auto runtimeScheduler = runtimeScheduler_.lock()) { runtimeScheduler->executeNowOnTheSameThread( - [func = std::move(func)](jsi::Runtime &) { func(); }); + [func = std::move(func)](jsi::Runtime&) { func(); }); } } void RuntimeSchedulerCallInvoker::invokeAsync( SchedulerPriority priority, - CallFunc &&func) { + CallFunc&& func) { if (auto runtimeScheduler = runtimeScheduler_.lock()) { runtimeScheduler->scheduleTask( - priority, [func = std::move(func)](jsi::Runtime &) { func(); }); + priority, [func = std::move(func)](jsi::Runtime&) { func(); }); } } diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h index 388ebb83331..e504fdce48d 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h @@ -20,9 +20,9 @@ class RuntimeSchedulerCallInvoker : public CallInvoker { public: RuntimeSchedulerCallInvoker(std::weak_ptr runtimeScheduler); - void invokeAsync(CallFunc &&func) override; - void invokeSync(CallFunc &&func) override; - void invokeAsync(SchedulerPriority priority, CallFunc &&func) override; + void invokeAsync(CallFunc&& func) override; + void invokeSync(CallFunc&& func) override; + void invokeAsync(SchedulerPriority priority, CallFunc&& func) override; private: /* diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.cpp index 7ac9cedae91..297cdb1d449 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.cpp @@ -25,14 +25,14 @@ Task::Task( callback(std::move(callback)), expirationTime(expirationTime) {} -jsi::Value Task::execute(jsi::Runtime &runtime, bool didUserCallbackTimeout) { +jsi::Value Task::execute(jsi::Runtime& runtime, bool didUserCallbackTimeout) { auto result = jsi::Value::undefined(); // Canceled task doesn't have a callback. if (!callback) { return result; } - auto &cbVal = callback.value(); + auto& cbVal = callback.value(); if (cbVal.index() == 0) { // Callback in JavaScript is expecting a single bool parameter. diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.h index ec7d9c1e520..0455bc1a009 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/Task.h @@ -19,7 +19,7 @@ namespace facebook::react { class RuntimeScheduler; class TaskPriorityComparer; -using RawCallback = std::function; +using RawCallback = std::function; struct Task final : public jsi::NativeState { Task( @@ -40,14 +40,14 @@ struct Task final : public jsi::NativeState { std::optional> callback; RuntimeSchedulerClock::time_point expirationTime; - jsi::Value execute(jsi::Runtime &runtime, bool didUserCallbackTimeout); + jsi::Value execute(jsi::Runtime& runtime, bool didUserCallbackTimeout); }; class TaskPriorityComparer { public: inline bool operator()( - const std::shared_ptr &lhs, - const std::shared_ptr &rhs) { + const std::shared_ptr& lhs, + const std::shared_ptr& rhs) { return lhs->expirationTime > rhs->expirationTime; } }; diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h index a14f493e12c..70422a08665 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h @@ -14,13 +14,13 @@ namespace facebook::react { struct TaskWrapper : public jsi::HostObject { - TaskWrapper(const std::shared_ptr &task) : task(task) {} + TaskWrapper(const std::shared_ptr& task) : task(task) {} std::shared_ptr task; }; inline static jsi::Value valueFromTask( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr task) { if (CoreFeatures::useNativeState) { jsi::Object obj(runtime); @@ -33,8 +33,8 @@ inline static jsi::Value valueFromTask( } inline static std::shared_ptr taskFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { if (value.isNull()) { return nullptr; } diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp index 7226e44e370..71a18928c87 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/RuntimeSchedulerTest.cpp @@ -29,7 +29,7 @@ class RuntimeSchedulerTest : public testing::Test { RuntimeExecutor runtimeExecutor = [this]( - std::function &&callback) { + std::function&& callback) { stubQueue_->runOnQueue([this, callback = std::move(callback)]() { callback(*runtime_); }); @@ -52,9 +52,9 @@ class RuntimeSchedulerTest : public testing::Test { jsi::PropNameID::forUtf8(*runtime_, ""), 3, [this, callback = std::move(callback)]( - jsi::Runtime & /*unused*/, - const jsi::Value & /*unused*/, - const jsi::Value *arguments, + jsi::Runtime& /*unused*/, + const jsi::Value& /*unused*/, + const jsi::Value* arguments, size_t /*unused*/) -> jsi::Value { ++hostFunctionCallCount_; auto didUserCallbackTimeout = arguments[0].getBool(); @@ -253,9 +253,9 @@ TEST_F(RuntimeSchedulerTest, continuationTask) { *runtime_, jsi::PropNameID::forUtf8(*runtime_, ""), 1, - [&](jsi::Runtime & /*runtime*/, - jsi::Value const & /*unused*/, - jsi::Value const * /*arguments*/, + [&](jsi::Runtime& /*runtime*/, + jsi::Value const& /*unused*/, + jsi::Value const* /*arguments*/, size_t /*unused*/) noexcept -> jsi::Value { didContinuationTask = true; return jsi::Value::undefined(); @@ -318,7 +318,7 @@ TEST_F(RuntimeSchedulerTest, getCurrentPriorityLevel) { TEST_F(RuntimeSchedulerTest, scheduleWorkWithYielding) { bool wasCalled = false; runtimeScheduler_->scheduleWork( - [&](const jsi::Runtime & /*unused*/) { wasCalled = true; }); + [&](const jsi::Runtime& /*unused*/) { wasCalled = true; }); EXPECT_FALSE(wasCalled); @@ -346,7 +346,7 @@ TEST_F(RuntimeSchedulerTest, normalTaskYieldsToPlatformEvent) { runtimeScheduler_->scheduleTask( SchedulerPriority::NormalPriority, std::move(callback)); - runtimeScheduler_->scheduleWork([&](const jsi::Runtime & /*unused*/) { + runtimeScheduler_->scheduleWork([&](const jsi::Runtime& /*unused*/) { didRunPlatformWork = true; EXPECT_FALSE(didRunJavaScriptTask); EXPECT_FALSE(runtimeScheduler_->getShouldYield()); @@ -373,7 +373,7 @@ TEST_F(RuntimeSchedulerTest, expiredTaskDoesntYieldToPlatformEvent) { runtimeScheduler_->scheduleTask( SchedulerPriority::NormalPriority, std::move(callback)); - runtimeScheduler_->scheduleWork([&](const jsi::Runtime & /*unused*/) { + runtimeScheduler_->scheduleWork([&](const jsi::Runtime& /*unused*/) { didRunPlatformWork = true; EXPECT_TRUE(didRunJavaScriptTask); }); @@ -401,7 +401,7 @@ TEST_F(RuntimeSchedulerTest, immediateTaskDoesntYieldToPlatformEvent) { runtimeScheduler_->scheduleTask( SchedulerPriority::ImmediatePriority, std::move(callback)); - runtimeScheduler_->scheduleWork([&](const jsi::Runtime & /*unused*/) { + runtimeScheduler_->scheduleWork([&](const jsi::Runtime& /*unused*/) { didRunPlatformWork = true; EXPECT_TRUE(didRunJavaScriptTask); }); @@ -474,7 +474,7 @@ TEST_F(RuntimeSchedulerTest, basicSameThreadExecution) { bool didRunSynchronousTask = false; std::thread t1([this, &didRunSynchronousTask]() { runtimeScheduler_->executeNowOnTheSameThread( - [this, &didRunSynchronousTask](jsi::Runtime & /*rt*/) { + [this, &didRunSynchronousTask](jsi::Runtime& /*rt*/) { EXPECT_TRUE(runtimeScheduler_->getIsSynchronous()); didRunSynchronousTask = true; }); @@ -500,7 +500,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesImmediatePriorityTask) { std::thread t1([this, &didRunSynchronousTask, &didRunSubsequentTask]() { runtimeScheduler_->executeNowOnTheSameThread( [this, &didRunSynchronousTask, &didRunSubsequentTask]( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { didRunSynchronousTask = true; auto callback = createHostFunctionFromLambda( @@ -538,7 +538,7 @@ TEST_F(RuntimeSchedulerTest, sameThreadTaskCreatesLowPriorityTask) { std::thread t1([this, &didRunSynchronousTask, &didRunSubsequentTask]() { runtimeScheduler_->executeNowOnTheSameThread( [this, &didRunSynchronousTask, &didRunSubsequentTask]( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { didRunSynchronousTask = true; auto callback = createHostFunctionFromLambda( @@ -584,11 +584,11 @@ TEST_F(RuntimeSchedulerTest, twoThreadsRequestAccessToTheRuntime) { bool didRunWork = false; runtimeScheduler_->scheduleWork( - [&didRunWork](jsi::Runtime & /*unused*/) { didRunWork = true; }); + [&didRunWork](jsi::Runtime& /*unused*/) { didRunWork = true; }); std::thread t1([this, &didRunSynchronousTask]() { runtimeScheduler_->executeNowOnTheSameThread( - [&didRunSynchronousTask](jsi::Runtime & /*runtime*/) { + [&didRunSynchronousTask](jsi::Runtime& /*runtime*/) { didRunSynchronousTask = true; }); }); diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubErrorUtils.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubErrorUtils.h index 39c10cc9e67..a0c838c0eb5 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubErrorUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubErrorUtils.h @@ -18,7 +18,7 @@ namespace facebook::react { class StubErrorUtils : public jsi::HostObject { public: static std::shared_ptr createAndInstallIfNeeded( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { auto errorUtilsModuleName = "ErrorUtils"; auto errorUtilsValue = runtime.global().getProperty(runtime, errorUtilsModuleName); @@ -38,7 +38,7 @@ class StubErrorUtils : public jsi::HostObject { /* * `jsi::HostObject` specific overloads. */ - jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override { + jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override { auto propertyName = name.utf8(runtime); if (propertyName == "reportFatalError") { @@ -47,9 +47,9 @@ class StubErrorUtils : public jsi::HostObject { name, 1, [this]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* arguments, size_t) noexcept -> jsi::Value { reportFatalCallCount_++; return jsi::Value::undefined(); diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h index c7a7c634ce3..1daecf37f7b 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/tests/StubQueue.h @@ -12,7 +12,7 @@ class StubQueue { public: - void runOnQueue(std::function &&func) { + void runOnQueue(std::function&& func) { { std::lock_guard lock(mutex_); callbackQueue_.push(func); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp index f98fb213abe..692aaa867d2 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.cpp @@ -22,7 +22,7 @@ AsynchronousEventBeat::AsynchronousEventBeat( } void AsynchronousEventBeat::activityDidChange( - const RunLoopObserver::Delegate *delegate, + const RunLoopObserver::Delegate* delegate, RunLoopObserver::Activity /*activity*/) const noexcept { react_native_assert(delegate == this); induce(); @@ -42,7 +42,7 @@ void AsynchronousEventBeat::induce() const { isBeatCallbackScheduled_ = true; - runtimeExecutor_([this, weakOwner](jsi::Runtime &runtime) { + runtimeExecutor_([this, weakOwner](jsi::Runtime& runtime) { isBeatCallbackScheduled_ = false; auto owner = weakOwner.lock(); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h b/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h index 9de879b40cc..3c8dfa068b9 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/AsynchronousEventBeat.h @@ -28,7 +28,7 @@ class AsynchronousEventBeat : public EventBeat, #pragma mark - RunLoopObserver::Delegate void activityDidChange( - const RunLoopObserver::Delegate *delegate, + const RunLoopObserver::Delegate* delegate, RunLoopObserver::Activity activity) const noexcept override; private: diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp index 8f5fb64573a..b381de0a826 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.cpp @@ -30,9 +30,9 @@ namespace facebook::react { Scheduler::Scheduler( - const SchedulerToolbox &schedulerToolbox, - UIManagerAnimationDelegate *animationDelegate, - SchedulerDelegate *delegate) { + const SchedulerToolbox& schedulerToolbox, + UIManagerAnimationDelegate* animationDelegate, + SchedulerDelegate* delegate) { runtimeExecutor_ = schedulerToolbox.runtimeExecutor; contextContainer_ = schedulerToolbox.contextContainer; @@ -56,13 +56,13 @@ Scheduler::Scheduler( : nullptr; auto eventPipe = [uiManager, runtimeScheduler = runtimeScheduler.get()]( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &payload) { + const EventPayload& payload) { uiManager->visitBinding( - [&](UIManagerBinding const &uiManagerBinding) { + [&](UIManagerBinding const& uiManagerBinding) { uiManagerBinding.dispatchEvent( runtime, eventTarget, type, priority, payload); }, @@ -77,14 +77,14 @@ Scheduler::Scheduler( }; auto eventPipeConclusion = - [runtimeScheduler = runtimeScheduler.get()](jsi::Runtime &runtime) { + [runtimeScheduler = runtimeScheduler.get()](jsi::Runtime& runtime) { if (CoreFeatures::enableDefaultAsyncBatchedPriority && runtimeScheduler != nullptr) { runtimeScheduler->callExpiredTasks(runtime); } }; - auto statePipe = [uiManager](const StateUpdate &stateUpdate) { + auto statePipe = [uiManager](const StateUpdate& stateUpdate) { uiManager->updateState(stateUpdate); }; @@ -110,7 +110,7 @@ Scheduler::Scheduler( schedulerToolbox.bridgelessBindingsExecutor.has_value() ? schedulerToolbox.bridgelessBindingsExecutor.value() : runtimeExecutor_; - bindingsExecutor([uiManager](jsi::Runtime &runtime) { + bindingsExecutor([uiManager](jsi::Runtime& runtime) { UIManagerBinding::createAndInstallIfNeeded(runtime, uiManager); }); @@ -126,7 +126,7 @@ Scheduler::Scheduler( commitHooks_ = schedulerToolbox.commitHooks; uiManager_ = uiManager; - for (auto &commitHook : commitHooks_) { + for (auto& commitHook : commitHooks_) { uiManager->registerCommitHook(*commitHook); } @@ -163,7 +163,7 @@ Scheduler::~Scheduler() { LOG(WARNING) << "Scheduler::~Scheduler() was called (address: " << this << ")."; - for (auto &commitHook : commitHooks_) { + for (auto& commitHook : commitHooks_) { uiManager_->unregisterCommitHook(*commitHook); } @@ -178,7 +178,7 @@ Scheduler::~Scheduler() { // Then, let's verify that the requirement was satisfied. auto surfaceIds = std::vector{}; uiManager_->getShadowTreeRegistry().enumerate( - [&surfaceIds](const ShadowTree &shadowTree, bool &) { + [&surfaceIds](const ShadowTree& shadowTree, bool&) { surfaceIds.push_back(shadowTree.getSurfaceId()); }); @@ -204,7 +204,7 @@ Scheduler::~Scheduler() { for (auto surfaceId : surfaceIds) { uiManager_->getShadowTreeRegistry().visit( surfaceId, - [](const ShadowTree &shadowTree) { shadowTree.commitEmptyTree(); }); + [](const ShadowTree& shadowTree) { shadowTree.commitEmptyTree(); }); // Removing surfaces is gated because it acquires mutex waiting for commits // in flight; in theory, it can deadlock. @@ -215,15 +215,15 @@ Scheduler::~Scheduler() { } void Scheduler::registerSurface( - const SurfaceHandler &surfaceHandler) const noexcept { + const SurfaceHandler& surfaceHandler) const noexcept { surfaceHandler.setContextContainer(getContextContainer()); surfaceHandler.setUIManager(uiManager_.get()); } InspectorData Scheduler::getInspectorDataForInstance( - const EventEmitter &eventEmitter) const noexcept { + const EventEmitter& eventEmitter) const noexcept { return executeSynchronouslyOnSameThread_CAN_DEADLOCK( - runtimeExecutor_, [=](jsi::Runtime &runtime) -> InspectorData { + runtimeExecutor_, [=](jsi::Runtime& runtime) -> InspectorData { auto uiManagerBinding = UIManagerBinding::getBinding(runtime); auto value = uiManagerBinding->getInspectorDataForInstance( runtime, eventEmitter); @@ -241,7 +241,7 @@ InspectorData Scheduler::getInspectorDataForInstance( // TODO T97216348: remove folly::dynamic from InspectorData struct result.props = dynamic["props"]; auto hierarchy = dynamic["hierarchy"]; - for (auto &i : hierarchy) { + for (auto& i : hierarchy) { auto viewHierarchyValue = i["name"]; if (!viewHierarchyValue.isNull()) { result.hierarchy.emplace_back(viewHierarchyValue.c_str()); @@ -252,13 +252,13 @@ InspectorData Scheduler::getInspectorDataForInstance( } void Scheduler::unregisterSurface( - const SurfaceHandler &surfaceHandler) const noexcept { + const SurfaceHandler& surfaceHandler) const noexcept { surfaceHandler.setUIManager(nullptr); } void Scheduler::renderTemplateToSurface( SurfaceId surfaceId, - const std::string &uiTemplate) { + const std::string& uiTemplate) { SystraceSection s("Scheduler::renderTemplateToSurface"); try { if (uiTemplate.empty()) { @@ -274,9 +274,9 @@ void Scheduler::renderTemplateToSurface( reactNativeConfig_); uiManager_->getShadowTreeRegistry().visit( - surfaceId, [=](const ShadowTree &shadowTree) { + surfaceId, [=](const ShadowTree& shadowTree) { return shadowTree.tryCommit( - [&](RootShadowNode const &oldRootShadowNode) { + [&](RootShadowNode const& oldRootShadowNode) { return std::make_shared( oldRootShadowNode, ShadowNodeFragment{ @@ -288,13 +288,13 @@ void Scheduler::renderTemplateToSurface( }, {/* default commit options */}); }); - } catch (const std::exception &e) { + } catch (const std::exception& e) { LOG(ERROR) << " >>>> EXCEPTION <<< rendering uiTemplate in " << "Scheduler::renderTemplateToSurface: " << e.what(); } } -const ComponentDescriptor * +const ComponentDescriptor* Scheduler::findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN( ComponentHandle handle) const { return componentDescriptorRegistry_ @@ -303,11 +303,11 @@ Scheduler::findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN( #pragma mark - Delegate -void Scheduler::setDelegate(SchedulerDelegate *delegate) { +void Scheduler::setDelegate(SchedulerDelegate* delegate) { delegate_ = delegate; } -SchedulerDelegate *Scheduler::getDelegate() const { +SchedulerDelegate* Scheduler::getDelegate() const { return delegate_; } @@ -337,7 +337,7 @@ void Scheduler::uiManagerDidFinishTransaction( SchedulerPriority::UserBlockingPriority, [delegate = delegate_, mountingCoordinator = - std::move(mountingCoordinator)](jsi::Runtime &) { + std::move(mountingCoordinator)](jsi::Runtime&) { delegate->schedulerDidFinishTransaction(mountingCoordinator); }); } else { @@ -348,7 +348,7 @@ void Scheduler::uiManagerDidFinishTransaction( } } } -void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) { +void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode& shadowNode) { SystraceSection s("Scheduler::uiManagerDidCreateShadowNode"); if (delegate_ != nullptr) { @@ -358,9 +358,9 @@ void Scheduler::uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) { } void Scheduler::uiManagerDidDispatchCommand( - const ShadowNode::Shared &shadowNode, - const std::string &commandName, - const folly::dynamic &args) { + const ShadowNode::Shared& shadowNode, + const std::string& commandName, + const folly::dynamic& args) { SystraceSection s("Scheduler::uiManagerDispatchCommand"); if (delegate_ != nullptr) { @@ -370,8 +370,8 @@ void Scheduler::uiManagerDidDispatchCommand( } void Scheduler::uiManagerDidSendAccessibilityEvent( - const ShadowNode::Shared &shadowNode, - const std::string &eventType) { + const ShadowNode::Shared& shadowNode, + const std::string& eventType) { SystraceSection s("Scheduler::uiManagerDidSendAccessibilityEvent"); if (delegate_ != nullptr) { @@ -384,7 +384,7 @@ void Scheduler::uiManagerDidSendAccessibilityEvent( * Set JS responder for a view. */ void Scheduler::uiManagerDidSetIsJSResponder( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, bool isJSResponder, bool blockNativeResponder) { if (delegate_ != nullptr) { @@ -406,14 +406,14 @@ std::shared_ptr Scheduler::getUIManager() const { } void Scheduler::addEventListener( - const std::shared_ptr &listener) { + const std::shared_ptr& listener) { if (eventDispatcher_->has_value()) { eventDispatcher_->value().addListener(listener); } } void Scheduler::removeEventListener( - const std::shared_ptr &listener) { + const std::shared_ptr& listener) { if (eventDispatcher_->has_value()) { eventDispatcher_->value().removeListener(listener); } diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h index 545e12ec77f..a784a09744a 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/Scheduler.h @@ -36,9 +36,9 @@ namespace facebook::react { class Scheduler final : public UIManagerDelegate { public: Scheduler( - const SchedulerToolbox &schedulerToolbox, - UIManagerAnimationDelegate *animationDelegate, - SchedulerDelegate *delegate); + const SchedulerToolbox& schedulerToolbox, + UIManagerAnimationDelegate* animationDelegate, + SchedulerDelegate* delegate); ~Scheduler() override; #pragma mark - Surface Management @@ -48,22 +48,22 @@ class Scheduler final : public UIManagerDelegate { * All registered `SurfaceHandler` objects must be unregistered * (with the same `Scheduler`) before their deallocation. */ - void registerSurface(const SurfaceHandler &surfaceHandler) const noexcept; - void unregisterSurface(const SurfaceHandler &surfaceHandler) const noexcept; + void registerSurface(const SurfaceHandler& surfaceHandler) const noexcept; + void unregisterSurface(const SurfaceHandler& surfaceHandler) const noexcept; InspectorData getInspectorDataForInstance( - const EventEmitter &eventEmitter) const noexcept; + const EventEmitter& eventEmitter) const noexcept; void renderTemplateToSurface( SurfaceId surfaceId, - const std::string &uiTemplate); + const std::string& uiTemplate); /* * This is broken. Please do not use. * `ComponentDescriptor`s are not designed to be used outside of `UIManager`, * there is no any guarantees about their lifetime. */ - const ComponentDescriptor * + const ComponentDescriptor* findComponentDescriptorByHandle_DO_NOT_USE_THIS_IS_BROKEN( ComponentHandle handle) const; @@ -74,8 +74,8 @@ class Scheduler final : public UIManagerDelegate { * If you requesting a ComponentDescriptor and unsure that it's there, you are * doing something wrong. */ - void setDelegate(SchedulerDelegate *delegate); - SchedulerDelegate *getDelegate() const; + void setDelegate(SchedulerDelegate* delegate); + SchedulerDelegate* getDelegate() const; #pragma mark - UIManagerAnimationDelegate // This is not needed on iOS or any platform that has a "pull" instead of @@ -89,16 +89,16 @@ class Scheduler final : public UIManagerDelegate { void uiManagerDidFinishTransaction( MountingCoordinator::Shared mountingCoordinator, bool mountSynchronously) override; - void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) override; + void uiManagerDidCreateShadowNode(const ShadowNode& shadowNode) override; void uiManagerDidDispatchCommand( - const ShadowNode::Shared &shadowNode, - const std::string &commandName, - const folly::dynamic &args) override; + const ShadowNode::Shared& shadowNode, + const std::string& commandName, + const folly::dynamic& args) override; void uiManagerDidSendAccessibilityEvent( - const ShadowNode::Shared &shadowNode, - const std::string &eventType) override; + const ShadowNode::Shared& shadowNode, + const std::string& eventType) override; void uiManagerDidSetIsJSResponder( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, bool isJSResponder, bool blockNativeResponder) override; @@ -111,14 +111,14 @@ class Scheduler final : public UIManagerDelegate { void reportMount(SurfaceId surfaceId) const; #pragma mark - Event listeners - void addEventListener(const std::shared_ptr &listener); + void addEventListener(const std::shared_ptr& listener); void removeEventListener( - const std::shared_ptr &listener); + const std::shared_ptr& listener); private: friend class SurfaceHandler; - SchedulerDelegate *delegate_; + SchedulerDelegate* delegate_; SharedComponentDescriptorRegistry componentDescriptorRegistry_; RuntimeExecutor runtimeExecutor_; std::shared_ptr uiManager_; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h index f08e7df8f83..d103bf850ec 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerDelegate.h @@ -26,29 +26,29 @@ class SchedulerDelegate { * to construct a new one. */ virtual void schedulerDidFinishTransaction( - const MountingCoordinator::Shared &mountingCoordinator) = 0; + const MountingCoordinator::Shared& mountingCoordinator) = 0; /* * Called right after a new ShadowNode was created. */ virtual void schedulerDidRequestPreliminaryViewAllocation( SurfaceId surfaceId, - const ShadowNode &shadowView) = 0; + const ShadowNode& shadowView) = 0; virtual void schedulerDidDispatchCommand( - const ShadowView &shadowView, - const std::string &commandName, - const folly::dynamic &args) = 0; + const ShadowView& shadowView, + const std::string& commandName, + const folly::dynamic& args) = 0; virtual void schedulerDidSendAccessibilityEvent( - const ShadowView &shadowView, - const std::string &eventType) = 0; + const ShadowView& shadowView, + const std::string& eventType) = 0; /* * Set JS responder for a view */ virtual void schedulerDidSetIsJSResponder( - const ShadowView &shadowView, + const ShadowView& shadowView, bool isJSResponder, bool blockNativeResponder) = 0; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp index 4b1265241ef..7c86d4c5998 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.cpp @@ -16,17 +16,17 @@ namespace facebook::react { using Status = SurfaceHandler::Status; SurfaceHandler::SurfaceHandler( - const std::string &moduleName, + const std::string& moduleName, SurfaceId surfaceId) noexcept { parameters_.moduleName = moduleName; parameters_.surfaceId = surfaceId; } -SurfaceHandler::SurfaceHandler(SurfaceHandler &&other) noexcept { +SurfaceHandler::SurfaceHandler(SurfaceHandler&& other) noexcept { operator=(std::move(other)); } -SurfaceHandler &SurfaceHandler::operator=(SurfaceHandler &&other) noexcept { +SurfaceHandler& SurfaceHandler::operator=(SurfaceHandler&& other) noexcept { std::unique_lock lock1(linkMutex_, std::defer_lock); std::unique_lock lock2(parametersMutex_, std::defer_lock); std::unique_lock lock3(other.linkMutex_, std::defer_lock); @@ -164,7 +164,7 @@ std::string SurfaceHandler::getModuleName() const noexcept { return parameters_.moduleName; } -void SurfaceHandler::setProps(const folly::dynamic &props) const noexcept { +void SurfaceHandler::setProps(const folly::dynamic& props) const noexcept { SystraceSection s("SurfaceHandler::setProps"); auto parameters = Parameters{}; { @@ -205,8 +205,8 @@ SurfaceHandler::getMountingCoordinator() const noexcept { #pragma mark - Layout Size SurfaceHandler::measure( - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept { + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept { std::shared_lock lock(linkMutex_); if (link_.status != Status::Running) { @@ -229,8 +229,8 @@ Size SurfaceHandler::measure( } void SurfaceHandler::constraintLayout( - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept { + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept { SystraceSection s("SurfaceHandler::constraintLayout"); { std::unique_lock lock(parametersMutex_); @@ -257,7 +257,7 @@ void SurfaceHandler::constraintLayout( react_native_assert( link_.shadowTree && "`link_.shadowTree` must not be null."); link_.shadowTree->commit( - [&](const RootShadowNode &oldRootShadowNode) { + [&](const RootShadowNode& oldRootShadowNode) { return oldRootShadowNode.clone( propsParserContext, layoutConstraints, layoutContext); }, @@ -302,7 +302,7 @@ void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept { // Committing the current revision back. It will be mounted only when // `DisplayMode` is changed back to `Normal`. link_.shadowTree->commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) { + [&](const RootShadowNode& /*oldRootShadowNode*/) { return std::static_pointer_cast( revision.rootShadowNode->ShadowNode::clone({})); }, @@ -311,7 +311,7 @@ void SurfaceHandler::applyDisplayMode(DisplayMode displayMode) const noexcept { } } -void SurfaceHandler::setUIManager(const UIManager *uiManager) const noexcept { +void SurfaceHandler::setUIManager(const UIManager* uiManager) const noexcept { std::unique_lock lock(linkMutex_); react_native_assert( diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h index 9eb0859f6d4..4963e237950 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceHandler.h @@ -61,16 +61,16 @@ class SurfaceHandler { /* * Can be constructed anytime with a `moduleName` and a `surfaceId`. */ - SurfaceHandler(const std::string &moduleName, SurfaceId surfaceId) noexcept; + SurfaceHandler(const std::string& moduleName, SurfaceId surfaceId) noexcept; virtual ~SurfaceHandler() noexcept; /* * Movable-only. */ - SurfaceHandler(SurfaceHandler &&other) noexcept; - SurfaceHandler(const SurfaceHandler &SurfaceHandler) noexcept = delete; - SurfaceHandler &operator=(SurfaceHandler &&other) noexcept; - SurfaceHandler &operator=(const SurfaceHandler &other) noexcept = delete; + SurfaceHandler(SurfaceHandler&& other) noexcept; + SurfaceHandler(const SurfaceHandler& SurfaceHandler) noexcept = delete; + SurfaceHandler& operator=(SurfaceHandler&& other) noexcept; + SurfaceHandler& operator=(const SurfaceHandler& other) noexcept = delete; #pragma mark - Surface Life-Cycle Management @@ -111,7 +111,7 @@ class SurfaceHandler { * Provides access for surface props. * Props can be changed anytime (even for `Unregistered` surface). */ - void setProps(const folly::dynamic &props) const noexcept; + void setProps(const folly::dynamic& props) const noexcept; folly::dynamic getProps() const noexcept; /* @@ -129,15 +129,15 @@ class SurfaceHandler { * Returns zero size if called on the stopped or unregistered surface. */ Size measure( - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept; + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept; /* * Sets layout constraints and layout context for the surface. */ void constraintLayout( - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept; + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept; /* * Returns layout constraints and layout context associated with the surface. @@ -151,7 +151,7 @@ class SurfaceHandler { /* * Must be called by `Scheduler` during registration process. */ - void setUIManager(const UIManager *uiManager) const noexcept; + void setUIManager(const UIManager* uiManager) const noexcept; void applyDisplayMode(DisplayMode displayMode) const noexcept; @@ -188,8 +188,8 @@ class SurfaceHandler { */ struct Link { Status status{Status::Unregistered}; - const UIManager *uiManager{}; - const ShadowTree *shadowTree{}; + const UIManager* uiManager{}; + const ShadowTree* shadowTree{}; }; /* diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp index 5b3d62ff0b5..45e6d6924b5 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.cpp @@ -11,15 +11,15 @@ namespace facebook::react { -SurfaceManager::SurfaceManager(const Scheduler &scheduler) noexcept +SurfaceManager::SurfaceManager(const Scheduler& scheduler) noexcept : scheduler_(scheduler) {} void SurfaceManager::startSurface( SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &props, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept { + const std::string& moduleName, + const folly::dynamic& props, + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept { { std::unique_lock lock(mutex_); auto surfaceHandler = SurfaceHandler{moduleName, surfaceId}; @@ -27,7 +27,7 @@ void SurfaceManager::startSurface( registry_.emplace(surfaceId, std::move(surfaceHandler)); } - visit(surfaceId, [&](const SurfaceHandler &surfaceHandler) { + visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) { surfaceHandler.setProps(props); surfaceHandler.constraintLayout(layoutConstraints, layoutContext); @@ -38,7 +38,7 @@ void SurfaceManager::startSurface( } void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept { - visit(surfaceId, [&](const SurfaceHandler &surfaceHandler) { + visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) { surfaceHandler.stop(); scheduler_.unregisterSurface(surfaceHandler); }); @@ -53,11 +53,11 @@ void SurfaceManager::stopSurface(SurfaceId surfaceId) const noexcept { Size SurfaceManager::measureSurface( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept { + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept { auto size = Size{}; - visit(surfaceId, [&](const SurfaceHandler &surfaceHandler) { + visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) { size = surfaceHandler.measure(layoutConstraints, layoutContext); }); @@ -68,7 +68,7 @@ MountingCoordinator::Shared SurfaceManager::findMountingCoordinator( SurfaceId surfaceId) const noexcept { auto mountingCoordinator = MountingCoordinator::Shared{}; - visit(surfaceId, [&](const SurfaceHandler &surfaceHandler) { + visit(surfaceId, [&](const SurfaceHandler& surfaceHandler) { mountingCoordinator = surfaceHandler.getMountingCoordinator(); }); @@ -77,16 +77,16 @@ MountingCoordinator::Shared SurfaceManager::findMountingCoordinator( void SurfaceManager::constraintSurfaceLayout( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept { - visit(surfaceId, [=](const SurfaceHandler &surfaceHandler) { + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept { + visit(surfaceId, [=](const SurfaceHandler& surfaceHandler) { surfaceHandler.constraintLayout(layoutConstraints, layoutContext); }); } void SurfaceManager::visit( SurfaceId surfaceId, - const std::function &callback) + const std::function& callback) const noexcept { std::shared_lock lock(mutex_); diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h index a567f372fcd..b44e6b0a4a6 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SurfaceManager.h @@ -26,28 +26,28 @@ namespace facebook::react { */ class SurfaceManager final { public: - explicit SurfaceManager(const Scheduler &scheduler) noexcept; + explicit SurfaceManager(const Scheduler& scheduler) noexcept; #pragma mark - Surface Management void startSurface( SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &props, - const LayoutConstraints &layoutConstraints = {}, - const LayoutContext &layoutContext = {}) const noexcept; + const std::string& moduleName, + const folly::dynamic& props, + const LayoutConstraints& layoutConstraints = {}, + const LayoutContext& layoutContext = {}) const noexcept; void stopSurface(SurfaceId surfaceId) const noexcept; Size measureSurface( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept; + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept; void constraintSurfaceLayout( SurfaceId surfaceId, - const LayoutConstraints &layoutConstraints, - const LayoutContext &layoutContext) const noexcept; + const LayoutConstraints& layoutConstraints, + const LayoutContext& layoutContext) const noexcept; MountingCoordinator::Shared findMountingCoordinator( SurfaceId surfaceId) const noexcept; @@ -55,10 +55,10 @@ class SurfaceManager final { private: void visit( SurfaceId surfaceId, - const std::function &callback) + const std::function& callback) const noexcept; - const Scheduler &scheduler_; + const Scheduler& scheduler_; mutable std::shared_mutex mutex_; // Protects `registry_`. mutable butter::map registry_{}; }; diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp b/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp index b2f9427a932..2591a0dbd52 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.cpp @@ -26,7 +26,7 @@ SynchronousEventBeat::SynchronousEventBeat( } void SynchronousEventBeat::activityDidChange( - const RunLoopObserver::Delegate *delegate, + const RunLoopObserver::Delegate* delegate, RunLoopObserver::Activity /*activity*/) const noexcept { react_native_assert(delegate == this); lockExecutorAndBeat(); @@ -49,10 +49,10 @@ void SynchronousEventBeat::lockExecutorAndBeat() const { if (runtimeScheduler_) { runtimeScheduler_->executeNowOnTheSameThread( - [this](jsi::Runtime &runtime) { beat(runtime); }); + [this](jsi::Runtime& runtime) { beat(runtime); }); } else { executeSynchronouslyOnSameThread_CAN_DEADLOCK( - runtimeExecutor_, [this](jsi::Runtime &runtime) { beat(runtime); }); + runtimeExecutor_, [this](jsi::Runtime& runtime) { beat(runtime); }); } } diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h index 6ad952e3c10..d2e57dde3d4 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SynchronousEventBeat.h @@ -31,7 +31,7 @@ class SynchronousEventBeat final : public EventBeat, #pragma mark - RunLoopObserver::Delegate void activityDidChange( - const RunLoopObserver::Delegate *delegate, + const RunLoopObserver::Delegate* delegate, RunLoopObserver::Activity activity) const noexcept override; private: diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp b/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp index b9eaa3aa18f..6b4845f6468 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.cpp @@ -12,7 +12,7 @@ namespace facebook::react { void SurfaceTelemetry::incorporate( - const TransactionTelemetry &telemetry, + const TransactionTelemetry& telemetry, int numberOfMutations) { layoutTime_ += telemetry.getLayoutEndTime() - telemetry.getLayoutStartTime(); textMeasureTime_ += telemetry.getTextMeasureTime(); diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h b/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h index 23b23a62cd6..4e6a2a0d6f0 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/SurfaceTelemetry.h @@ -44,7 +44,7 @@ class SurfaceTelemetry final { * for the Surface. */ void incorporate( - const TransactionTelemetry &telemetry, + const TransactionTelemetry& telemetry, int numberOfMutations); private: diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp b/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp index cd23b4d12d8..11eab3f6134 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.cpp @@ -13,7 +13,7 @@ namespace facebook::react { -thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr; +thread_local TransactionTelemetry* threadLocalTransactionTelemetry = nullptr; TransactionTelemetry::TransactionTelemetry() : TransactionTelemetry(telemetryTimePointNow) {} @@ -22,7 +22,7 @@ TransactionTelemetry::TransactionTelemetry( std::function now) : now_{std::move(now)} {} -TransactionTelemetry *TransactionTelemetry::threadLocalTelemetry() { +TransactionTelemetry* TransactionTelemetry::threadLocalTelemetry() { return threadLocalTransactionTelemetry; } diff --git a/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h b/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h index 4d3c7947170..26674c0c2d2 100644 --- a/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h +++ b/packages/react-native/ReactCommon/react/renderer/telemetry/TransactionTelemetry.h @@ -24,7 +24,7 @@ class TransactionTelemetry final { /* * Thread-local Telemetry instance */ - static TransactionTelemetry *threadLocalTelemetry(); + static TransactionTelemetry* threadLocalTelemetry(); TransactionTelemetry(); TransactionTelemetry(std::function now); diff --git a/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp b/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp index 72cf9d2c3a4..79d54b5ee04 100644 --- a/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.cpp @@ -24,34 +24,34 @@ bool constexpr DEBUG_FLY = false; struct RBCContext { const Tag rootTag; - const std::vector &nodes; - const std::vector ®isters; - const ComponentDescriptorRegistry &componentDescriptorRegistry; - const NativeModuleRegistry &nativeModuleRegistry; + const std::vector& nodes; + const std::vector& registers; + const ComponentDescriptorRegistry& componentDescriptorRegistry; + const NativeModuleRegistry& nativeModuleRegistry; }; // TODO: use RBCContext instead of all the separate arguments. ShadowNode::Shared UITemplateProcessor::runCommand( - const folly::dynamic &command, + const folly::dynamic& command, SurfaceId surfaceId, - std::vector &nodes, - std::vector ®isters, - const ComponentDescriptorRegistry &componentDescriptorRegistry, - const NativeModuleRegistry &nativeModuleRegistry, - const std::shared_ptr &reactNativeConfig) { - const std::string &opcode = command[0].asString(); + std::vector& nodes, + std::vector& registers, + const ComponentDescriptorRegistry& componentDescriptorRegistry, + const NativeModuleRegistry& nativeModuleRegistry, + const std::shared_ptr& reactNativeConfig) { + const std::string& opcode = command[0].asString(); const int tagOffset = 420000; // TODO: change to integer codes and a switch statement if (opcode == "createNode") { Tag tag = static_cast(command[1].asInt()); - const auto &type = command[2].asString(); + const auto& type = command[2].asString(); const auto parentTag = command[3].asInt(); - const auto &props = command[4]; + const auto& props = command[4]; nodes[tag] = componentDescriptorRegistry.createNode( tag + tagOffset, type, surfaceId, props, nullptr); if (parentTag > -1) { // parentTag == -1 indicates root node auto parentShadowNode = nodes[static_cast(parentTag)]; - const auto &componentDescriptor = componentDescriptorRegistry.at( + const auto& componentDescriptor = componentDescriptorRegistry.at( parentShadowNode->getComponentHandle()); componentDescriptor.appendChild(parentShadowNode, nodes[tag]); } @@ -81,9 +81,9 @@ ShadowNode::Shared UITemplateProcessor::runCommand( "' but needs to be 'boolean' for conditionals"); throw err; } - const auto &nextCommands = + const auto& nextCommands = conditionDynamic.asBool() ? command[2] : command[3]; - for (const auto &nextCommand : nextCommands) { + for (const auto& nextCommand : nextCommands) { runCommand( nextCommand, surfaceId, @@ -100,20 +100,20 @@ ShadowNode::Shared UITemplateProcessor::runCommand( } ShadowNode::Shared UITemplateProcessor::buildShadowTree( - const std::string &jsonStr, + const std::string& jsonStr, SurfaceId surfaceId, - const folly::dynamic ¶ms, - const ComponentDescriptorRegistry &componentDescriptorRegistry, - const NativeModuleRegistry &nativeModuleRegistry, - const std::shared_ptr &reactNativeConfig) { + const folly::dynamic& params, + const ComponentDescriptorRegistry& componentDescriptorRegistry, + const NativeModuleRegistry& nativeModuleRegistry, + const std::shared_ptr& reactNativeConfig) { if (DEBUG_FLY) { LOG(INFO) << "(strt) UITemplateProcessor inject hardcoded 'server rendered' view tree"; } std::string content = jsonStr; - for (const auto ¶m : params.items()) { - const auto &key = param.first.asString(); + for (const auto& param : params.items()) { + const auto& key = param.first.asString(); size_t start_pos = content.find(key); if (start_pos != std::string::npos) { content.replace(start_pos, key.length(), param.second.asString()); @@ -123,7 +123,7 @@ ShadowNode::Shared UITemplateProcessor::buildShadowTree( auto commands = parsed["commands"]; std::vector nodes(commands.size() * 2); std::vector registers(32); - for (const auto &command : commands) { + for (const auto& command : commands) { try { if (DEBUG_FLY) { LOG(INFO) << "try to run command " << folly::toJson(command); @@ -139,7 +139,7 @@ ShadowNode::Shared UITemplateProcessor::buildShadowTree( if (ret != nullptr) { return ret; } - } catch (const std::exception &e) { + } catch (const std::exception& e) { LOG(ERROR) << " >>> Exception <<< running previous command '" << folly::toJson(command) << "': '" << e.what() << "'"; } diff --git a/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h b/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h index a377ae7ffc3..791a6a02b47 100644 --- a/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h +++ b/packages/react-native/ReactCommon/react/renderer/templateprocessor/UITemplateProcessor.h @@ -20,20 +20,20 @@ namespace facebook::react { // Temporary NativeModuleRegistry definition using NativeModuleCallFn = - std::function; + std::function; class NativeModuleRegistry { public: void registerModule( - const std::string &moduleName, + const std::string& moduleName, NativeModuleCallFn callFn) { modules_.emplace(moduleName, callFn); } folly::dynamic call( - const std::string &moduleName, - const std::string &methodName, - const folly::dynamic &args) const { + const std::string& moduleName, + const std::string& methodName, + const folly::dynamic& args) const { return modules_.at(moduleName)(methodName, args); } @@ -44,21 +44,21 @@ class NativeModuleRegistry { class UITemplateProcessor { public: static ShadowNode::Shared buildShadowTree( - const std::string &jsonStr, + const std::string& jsonStr, int surfaceId, - const folly::dynamic ¶ms, - const ComponentDescriptorRegistry &componentDescriptorRegistry, - const NativeModuleRegistry &nativeModuleRegistry, - const std::shared_ptr &reactNativeConfig); + const folly::dynamic& params, + const ComponentDescriptorRegistry& componentDescriptorRegistry, + const NativeModuleRegistry& nativeModuleRegistry, + const std::shared_ptr& reactNativeConfig); private: static ShadowNode::Shared runCommand( - const folly::dynamic &command, + const folly::dynamic& command, Tag surfaceId, - std::vector &nodes, - std::vector ®isters, - const ComponentDescriptorRegistry &componentDescriptorRegistry, - const NativeModuleRegistry &nativeModuleRegistry, - const std::shared_ptr &reactNativeConfig); + std::vector& nodes, + std::vector& registers, + const ComponentDescriptorRegistry& componentDescriptorRegistry, + const NativeModuleRegistry& nativeModuleRegistry, + const std::shared_ptr& reactNativeConfig); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp b/packages/react-native/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp index db73f34f1a1..b0b4ddbd925 100644 --- a/packages/react-native/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp +++ b/packages/react-native/ReactCommon/react/renderer/templateprocessor/tests/UITemplateProcessorTest.cpp @@ -26,8 +26,8 @@ using namespace facebook::react; namespace facebook::react { static ComponentRegistryFactory getComponentRegistryFactory() { - return [](const EventDispatcher::Weak &eventDispatcher, - const ContextContainer::Shared &contextContainer) { + return [](const EventDispatcher::Weak& eventDispatcher, + const ContextContainer::Shared& contextContainer) { ComponentDescriptorProviderRegistry providerRegistry{}; providerRegistry.add( concreteComponentDescriptorProvider()); @@ -48,7 +48,7 @@ NativeModuleRegistry buildNativeModuleRegistry() { NativeModuleRegistry nMR; nMR.registerModule( "MobileConfig", - [&](const std::string & /*unused*/, const folly::dynamic & /*unused*/) { + [&](const std::string& /*unused*/, const folly::dynamic& /*unused*/) { return mockSimpleTestValue_; }); return nMR; @@ -57,19 +57,19 @@ NativeModuleRegistry buildNativeModuleRegistry() { class MockReactNativeConfig : public ReactNativeConfig { public: MockReactNativeConfig() = default; - bool getBool(const std::string & /*param*/) const override { + bool getBool(const std::string& /*param*/) const override { return mockSimpleTestValue_; } - std::string getString(const std::string & /*param*/) const override { + std::string getString(const std::string& /*param*/) const override { return ""; } - int64_t getInt64(const std::string & /*param*/) const override { + int64_t getInt64(const std::string& /*param*/) const override { return 0; } - double getDouble(const std::string & /*param*/) const override { + double getDouble(const std::string& /*param*/) const override { return 0.0; } }; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp index ee9efa6e985..f671544e325 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp @@ -11,7 +11,7 @@ namespace facebook::react { -static Rect rectFromDynamic(const folly::dynamic &data) { +static Rect rectFromDynamic(const folly::dynamic& data) { Point origin; origin.x = static_cast(data.getDefault("x", 0).getDouble()); origin.y = static_cast(data.getDefault("y", 0).getDouble()); @@ -38,7 +38,7 @@ LineMeasurement::LineMeasurement( ascender(ascender), xHeight(xHeight) {} -LineMeasurement::LineMeasurement(const folly::dynamic &data) +LineMeasurement::LineMeasurement(const folly::dynamic& data) : text(data.getDefault("text", "").getString()), frame(rectFromDynamic(data)), descender( @@ -48,7 +48,7 @@ LineMeasurement::LineMeasurement(const folly::dynamic &data) ascender(static_cast(data.getDefault("ascender", 0).getDouble())), xHeight(static_cast(data.getDefault("xHeight", 0).getDouble())) {} -bool LineMeasurement::operator==(const LineMeasurement &rhs) const { +bool LineMeasurement::operator==(const LineMeasurement& rhs) const { return std::tie( this->text, this->frame, diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h index 10e14f45a15..8e0d4b062fd 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h @@ -32,9 +32,9 @@ struct LineMeasurement { Float ascender, Float xHeight); - LineMeasurement(const folly::dynamic &data); + LineMeasurement(const folly::dynamic& data); - bool operator==(const LineMeasurement &rhs) const; + bool operator==(const LineMeasurement& rhs) const; }; using LinesMeasurements = std::vector; @@ -83,8 +83,8 @@ using TextMeasureCache = SimpleThreadSafeCache< kSimpleThreadSafeCacheSizeCap>; inline bool areTextAttributesEquivalentLayoutWise( - const TextAttributes &lhs, - const TextAttributes &rhs) { + const TextAttributes& lhs, + const TextAttributes& rhs) { // Here we check all attributes that affect layout metrics and don't check any // attributes that affect only a decorative aspect of displayed text (like // colors). @@ -111,7 +111,7 @@ inline bool areTextAttributesEquivalentLayoutWise( } inline size_t textAttributesHashLayoutWise( - const TextAttributes &textAttributes) { + const TextAttributes& textAttributes) { // Taking into account the same props as // `areTextAttributesEquivalentLayoutWise` mentions. return folly::hash::hash_combine( @@ -130,8 +130,8 @@ inline size_t textAttributesHashLayoutWise( } inline bool areAttributedStringFragmentsEquivalentLayoutWise( - const AttributedString::Fragment &lhs, - const AttributedString::Fragment &rhs) { + const AttributedString::Fragment& lhs, + const AttributedString::Fragment& rhs) { return lhs.string == rhs.string && areTextAttributesEquivalentLayoutWise( lhs.textAttributes, rhs.textAttributes) && @@ -143,7 +143,7 @@ inline bool areAttributedStringFragmentsEquivalentLayoutWise( } inline size_t textAttributesHashLayoutWise( - const AttributedString::Fragment &fragment) { + const AttributedString::Fragment& fragment) { // Here we are not taking `isAttachment` and `layoutMetrics` into account // because they are logically interdependent and this can break an invariant // between hash and equivalence functions (and cause cache misses). @@ -154,10 +154,10 @@ inline size_t textAttributesHashLayoutWise( } inline bool areAttributedStringsEquivalentLayoutWise( - const AttributedString &lhs, - const AttributedString &rhs) { - auto &lhsFragment = lhs.getFragments(); - auto &rhsFragment = rhs.getFragments(); + const AttributedString& lhs, + const AttributedString& rhs) { + auto& lhsFragment = lhs.getFragments(); + auto& rhsFragment = rhs.getFragments(); if (lhsFragment.size() != rhsFragment.size()) { return false; @@ -175,10 +175,10 @@ inline bool areAttributedStringsEquivalentLayoutWise( } inline size_t textAttributedStringHashLayoutWise( - const AttributedString &attributedString) { + const AttributedString& attributedString) { auto seed = size_t{0}; - for (const auto &fragment : attributedString.getFragments()) { + for (const auto& fragment : attributedString.getFragments()) { seed = folly::hash::hash_combine(seed, textAttributesHashLayoutWise(fragment)); } @@ -187,8 +187,8 @@ inline size_t textAttributedStringHashLayoutWise( } inline bool operator==( - const TextMeasureCacheKey &lhs, - const TextMeasureCacheKey &rhs) { + const TextMeasureCacheKey& lhs, + const TextMeasureCacheKey& rhs) { return areAttributedStringsEquivalentLayoutWise( lhs.attributedString, rhs.attributedString) && lhs.paragraphAttributes == rhs.paragraphAttributes && @@ -197,8 +197,8 @@ inline bool operator==( } inline bool operator!=( - const TextMeasureCacheKey &lhs, - const TextMeasureCacheKey &rhs) { + const TextMeasureCacheKey& lhs, + const TextMeasureCacheKey& rhs) { return !(lhs == rhs); } @@ -208,7 +208,7 @@ namespace std { template <> struct hash { - size_t operator()(const facebook::react::TextMeasureCacheKey &key) const { + size_t operator()(const facebook::react::TextMeasureCacheKey& key) const { return folly::hash::hash_combine( 0, textAttributedStringHashLayoutWise(key.attributedString), diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp index f1c62004ed4..cb5844b2420 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp @@ -23,9 +23,9 @@ using namespace facebook::jni; namespace facebook::react { Size measureAndroidComponent( - const ContextContainer::Shared &contextContainer, + const ContextContainer::Shared& contextContainer, Tag rootTag, - const std::string &componentName, + const std::string& componentName, folly::dynamic localData, folly::dynamic props, folly::dynamic state, @@ -34,7 +34,7 @@ Size measureAndroidComponent( float minHeight, float maxHeight, jfloatArray attachmentPositions) { - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer->at>("FabricUIManager"); static auto measure = @@ -92,9 +92,9 @@ Size measureAndroidComponent( } Size measureAndroidComponentMapBuffer( - const ContextContainer::Shared &contextContainer, + const ContextContainer::Shared& contextContainer, Tag rootTag, - const std::string &componentName, + const std::string& componentName, MapBuffer localData, MapBuffer props, float minWidth, @@ -102,7 +102,7 @@ Size measureAndroidComponentMapBuffer( float minHeight, float maxHeight, jfloatArray attachmentPositions) { - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer->at>("FabricUIManager"); auto componentNameRef = make_jstring(componentName); @@ -145,27 +145,27 @@ Size measureAndroidComponentMapBuffer( } TextLayoutManager::TextLayoutManager( - const ContextContainer::Shared &contextContainer) + const ContextContainer::Shared& contextContainer) : contextContainer_(contextContainer), measureCache_( CoreFeatures::cacheLastTextMeasurement ? 8096 : kSimpleThreadSafeCacheSizeCap) {} -void *TextLayoutManager::getNativeTextLayoutManager() const { +void* TextLayoutManager::getNativeTextLayoutManager() const { return self_; } TextMeasurement TextLayoutManager::measure( - const AttributedStringBox &attributedStringBox, - const ParagraphAttributes ¶graphAttributes, + const AttributedStringBox& attributedStringBox, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints, std::shared_ptr /* hostTextStorage */) const { - auto &attributedString = attributedStringBox.getValue(); + auto& attributedString = attributedStringBox.getValue(); auto measurement = measureCache_.get( {attributedString, paragraphAttributes, layoutConstraints}, - [&](const TextMeasureCacheKey & /*key*/) { + [&](const TextMeasureCacheKey& /*key*/) { auto telemetry = TransactionTelemetry::threadLocalTelemetry(); if (telemetry != nullptr) { telemetry->willMeasureText(); @@ -185,15 +185,15 @@ TextMeasurement TextLayoutManager::measure( return measurement; } std::shared_ptr TextLayoutManager::getHostTextStorage( - const AttributedString & /* attributedStringBox */, - const ParagraphAttributes & /* paragraphAttributes */, + const AttributedString& /* attributedStringBox */, + const ParagraphAttributes& /* paragraphAttributes */, LayoutConstraints /* layoutConstraints */) const { return nullptr; } TextMeasurement TextLayoutManager::measureCachedSpannableById( int64_t cacheId, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const { auto env = Environment::current(); auto attachmentPositions = env->NewFloatArray(0); @@ -227,10 +227,10 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById( } LinesMeasurements TextLayoutManager::measureLines( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, Size size) const { - const jni::global_ref &fabricUIManager = + const jni::global_ref& fabricUIManager = contextContainer_->at>("FabricUIManager"); static auto measureLines = jni::findClassStatic("com/facebook/react/fabric/FabricUIManager") @@ -256,7 +256,7 @@ LinesMeasurements TextLayoutManager::measureLines( LinesMeasurements lineMeasurements; lineMeasurements.reserve(dynamicArray.size()); - for (const auto &data : dynamicArray) { + for (const auto& data : dynamicArray) { lineMeasurements.push_back(LineMeasurement(data)); } @@ -269,12 +269,12 @@ LinesMeasurements TextLayoutManager::measureLines( TextMeasurement TextLayoutManager::doMeasure( AttributedString attributedString, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const { layoutConstraints.maximumSize.height = std::numeric_limits::infinity(); int attachmentsCount = 0; - for (const auto &fragment : attributedString.getFragments()) { + for (const auto& fragment : attributedString.getFragments()) { if (fragment.isAttachment()) { attachmentsCount++; } @@ -299,14 +299,14 @@ TextMeasurement TextLayoutManager::doMeasure( maximumSize.height, attachmentPositions); - jfloat *attachmentData = + jfloat* attachmentData = env->GetFloatArrayElements(attachmentPositions, nullptr); auto attachments = TextMeasurement::Attachments{}; if (attachmentsCount > 0) { - const folly::dynamic &fragments = serializedAttributedString["fragments"]; + const folly::dynamic& fragments = serializedAttributedString["fragments"]; int attachmentIndex = 0; - for (const auto &fragment : fragments) { + for (const auto& fragment : fragments) { auto isAttachment = fragment.find("isAttachment"); if (isAttachment != fragment.items().end() && isAttachment->second.getBool()) { @@ -333,12 +333,12 @@ TextMeasurement TextLayoutManager::doMeasure( TextMeasurement TextLayoutManager::doMeasureMapBuffer( AttributedString attributedString, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const { layoutConstraints.maximumSize.height = std::numeric_limits::infinity(); int attachmentsCount = 0; - for (const auto &fragment : attributedString.getFragments()) { + for (const auto& fragment : attributedString.getFragments()) { if (fragment.isAttachment()) { attachmentsCount++; } @@ -364,13 +364,13 @@ TextMeasurement TextLayoutManager::doMeasureMapBuffer( maximumSize.height, attachmentPositions); - jfloat *attachmentData = + jfloat* attachmentData = env->GetFloatArrayElements(attachmentPositions, nullptr); auto attachments = TextMeasurement::Attachments{}; if (attachmentsCount > 0) { int attachmentIndex = 0; - for (const auto &fragment : attributedString.getFragments()) { + for (const auto& fragment : attributedString.getFragments()) { if (fragment.isAttachment()) { float top = attachmentData[attachmentIndex * 2]; float left = attachmentData[attachmentIndex * 2 + 1]; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h index ecc8ebffd88..640baaa289e 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -25,32 +25,32 @@ using SharedTextLayoutManager = std::shared_ptr; */ class TextLayoutManager { public: - TextLayoutManager(const ContextContainer::Shared &contextContainer); + TextLayoutManager(const ContextContainer::Shared& contextContainer); /* * Not copyable. */ - TextLayoutManager(const TextLayoutManager &) = delete; - TextLayoutManager &operator=(const TextLayoutManager &) = delete; + TextLayoutManager(const TextLayoutManager&) = delete; + TextLayoutManager& operator=(const TextLayoutManager&) = delete; /* * Not movable. */ - TextLayoutManager(TextLayoutManager &&) = delete; - TextLayoutManager &operator=(TextLayoutManager &&) = delete; + TextLayoutManager(TextLayoutManager&&) = delete; + TextLayoutManager& operator=(TextLayoutManager&&) = delete; /* * Measures `attributedString` using native text rendering infrastructure. */ TextMeasurement measure( - const AttributedStringBox &attributedStringBox, - const ParagraphAttributes ¶graphAttributes, + const AttributedStringBox& attributedStringBox, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints, std::shared_ptr /* hostTextStorage */) const; std::shared_ptr getHostTextStorage( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; /** @@ -59,7 +59,7 @@ class TextLayoutManager { */ TextMeasurement measureCachedSpannableById( int64_t cacheId, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; /* @@ -67,33 +67,33 @@ class TextLayoutManager { * infrastructure. */ LinesMeasurements measureLines( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, Size size) const; /* * Returns an opaque pointer to platform-specific TextLayoutManager. * Is used on a native views layer to delegate text rendering to the manager. */ - void *getNativeTextLayoutManager() const; + void* getNativeTextLayoutManager() const; private: TextMeasurement doMeasure( AttributedString attributedString, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; TextMeasurement doMeasureMapBuffer( AttributedString attributedString, - const ParagraphAttributes ¶graphAttributes, + const ParagraphAttributes& paragraphAttributes, LayoutConstraints layoutConstraints) const; LinesMeasurements measureLinesMapBuffer( - const AttributedString &attributedString, - const ParagraphAttributes ¶graphAttributes, + const AttributedString& attributedString, + const ParagraphAttributes& paragraphAttributes, Size size) const; - void *self_{}; + void* self_{}; ContextContainer::Shared contextContainer_; TextMeasureCache measureCache_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp index 39a815016ce..1a2aed80a69 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp @@ -9,8 +9,8 @@ namespace facebook::react { -void *TextLayoutManager::getNativeTextLayoutManager() const { - return (void *)this; +void* TextLayoutManager::getNativeTextLayoutManager() const { + return (void*)this; } TextMeasurement TextLayoutManager::measure( @@ -19,7 +19,7 @@ TextMeasurement TextLayoutManager::measure( LayoutConstraints layoutConstraints, std::shared_ptr) const { TextMeasurement::Attachments attachments; - for (const auto &fragment : attributedStringBox.getValue().getFragments()) { + for (const auto& fragment : attributedStringBox.getValue().getFragments()) { if (fragment.isAttachment()) { attachments.push_back( TextMeasurement::Attachment{{{0, 0}, {0, 0}}, false}); diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h index b9ce01f5b16..a8b454814b5 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h @@ -27,7 +27,7 @@ using SharedTextLayoutManager = std::shared_ptr; */ class TextLayoutManager { public: - TextLayoutManager(const ContextContainer::Shared &contextContainer) {} + TextLayoutManager(const ContextContainer::Shared& contextContainer) {} /* * Measures `attributedStringBox` using native text rendering infrastructure. @@ -51,7 +51,7 @@ class TextLayoutManager { * Returns an opaque pointer to platform-specific TextLayoutManager. * Is used on a native views layer to delegate text rendering to the manager. */ - void *getNativeTextLayoutManager() const; + void* getNativeTextLayoutManager() const; std::shared_ptr getHostTextStorage( AttributedString attributedStringBox, diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h index ad4d7af3dd9..5a37f1f6f99 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.h @@ -14,6 +14,6 @@ NS_ASSUME_NONNULL_BEGIN /** * Returns UIFont instance corresponded to given font properties. */ -UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties); +UIFont* RCTFontWithFontProperties(RCTFontProperties fontProperties); NS_ASSUME_NONNULL_END diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h index b23eadfc3f4..67ca50820f9 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/TextLayoutManager.h @@ -24,7 +24,7 @@ class TextLayoutManager; */ class TextLayoutManager { public: - TextLayoutManager(const ContextContainer::Shared &contextContainer); + TextLayoutManager(const ContextContainer::Shared& contextContainer); /* * Measures `attributedString` using native text rendering infrastructure. diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.cpp b/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.cpp index 815e9a4852c..28c6128343e 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.cpp +++ b/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.cpp @@ -11,7 +11,7 @@ namespace facebook::react { -Timeline::Timeline(const ShadowTree &shadowTree) : shadowTree_(&shadowTree) { +Timeline::Timeline(const ShadowTree& shadowTree) : shadowTree_(&shadowTree) { record(shadowTree.getCurrentRevision().rootShadowNode); }; @@ -48,7 +48,7 @@ TimelineFrame::List Timeline::getFrames() const noexcept { auto frames = TimelineFrame::List{}; frames.reserve(snapshots_.size()); - for (const auto &snapshot : snapshots_) { + for (const auto& snapshot : snapshots_) { frames.push_back(snapshot.getFrame()); } return frames; @@ -59,15 +59,15 @@ TimelineFrame Timeline::getCurrentFrame() const noexcept { return snapshots_.at(currentSnapshotIndex_).getFrame(); } -void Timeline::rewind(const TimelineFrame &frame) const noexcept { +void Timeline::rewind(const TimelineFrame& frame) const noexcept { std::scoped_lock lock(mutex_); rewind(snapshots_.at(frame.getIndex())); } RootShadowNode::Unshared Timeline::shadowTreeWillCommit( - const ShadowTree & /*shadowTree*/, - const RootShadowNode::Shared & /*oldRootShadowNode*/, - const RootShadowNode::Unshared &newRootShadowNode) const noexcept { + const ShadowTree& /*shadowTree*/, + const RootShadowNode::Shared& /*oldRootShadowNode*/, + const RootShadowNode::Unshared& newRootShadowNode) const noexcept { std::scoped_lock lock(mutex_); if (rewinding_) { @@ -86,7 +86,7 @@ RootShadowNode::Unshared Timeline::shadowTreeWillCommit( #pragma mark - Private & Internal void Timeline::record( - const RootShadowNode::Shared &rootShadowNode) const noexcept { + const RootShadowNode::Shared& rootShadowNode) const noexcept { auto index = (int)snapshots_.size(); snapshots_.push_back(TimelineSnapshot{rootShadowNode, index}); @@ -95,7 +95,7 @@ void Timeline::record( } } -void Timeline::rewind(const TimelineSnapshot &snapshot) const noexcept { +void Timeline::rewind(const TimelineSnapshot& snapshot) const noexcept { std::scoped_lock lock(mutex_); currentSnapshotIndex_ = snapshot.getFrame().getIndex(); @@ -106,7 +106,7 @@ void Timeline::rewind(const TimelineSnapshot &snapshot) const noexcept { auto rootShadowNode = snapshot.getRootShadowNode(); shadowTree_->commit( - [&](const RootShadowNode & /*oldRootShadowNode*/) + [&](const RootShadowNode& /*oldRootShadowNode*/) -> RootShadowNode::Unshared { return std::static_pointer_cast( rootShadowNode->ShadowNode::clone({})); diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.h b/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.h index 7a98d153305..523f66d4aa0 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.h +++ b/packages/react-native/ReactCommon/react/renderer/timeline/Timeline.h @@ -24,7 +24,7 @@ class Timeline final { friend class TimelineController; public: - Timeline(const ShadowTree &shadowTree); + Timeline(const ShadowTree& shadowTree); private: #pragma mark - Private methods to be used by `TimelineHandler`. @@ -34,23 +34,23 @@ class Timeline final { bool isPaused() const noexcept; TimelineFrame::List getFrames() const noexcept; TimelineFrame getCurrentFrame() const noexcept; - void rewind(const TimelineFrame &frame) const noexcept; + void rewind(const TimelineFrame& frame) const noexcept; SurfaceId getSurfaceId() const noexcept; #pragma mark - Private methods to be used by `TimelineController`. RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) const noexcept; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) const noexcept; #pragma mark - Private & Internal - void record(const RootShadowNode::Shared &rootShadowNode) const noexcept; - void rewind(const TimelineSnapshot &snapshot) const noexcept; + void record(const RootShadowNode::Shared& rootShadowNode) const noexcept; + void rewind(const TimelineSnapshot& snapshot) const noexcept; mutable std::recursive_mutex mutex_; - mutable const ShadowTree *shadowTree_{nullptr}; + mutable const ShadowTree* shadowTree_{nullptr}; mutable int currentSnapshotIndex_{0}; mutable TimelineSnapshot::List snapshots_{}; mutable bool paused_{false}; diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.cpp b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.cpp index 71bd1988626..3994e99edf3 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.cpp +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.cpp @@ -15,10 +15,10 @@ namespace facebook::react { TimelineHandler TimelineController::enable(SurfaceId surfaceId) const { assert(uiManager_); - const ShadowTree *shadowTreePtr = nullptr; + const ShadowTree* shadowTreePtr = nullptr; uiManager_->getShadowTreeRegistry().visit( surfaceId, - [&](const ShadowTree &shadowTree) { shadowTreePtr = &shadowTree; }); + [&](const ShadowTree& shadowTree) { shadowTreePtr = &shadowTree; }); assert(shadowTreePtr); @@ -32,7 +32,7 @@ TimelineHandler TimelineController::enable(SurfaceId surfaceId) const { } } -void TimelineController::disable(TimelineHandler &&handler) const { +void TimelineController::disable(TimelineHandler&& handler) const { std::unique_lock lock(timelinesMutex_); auto iterator = timelines_.find(handler.getSurfaceId()); @@ -42,19 +42,19 @@ void TimelineController::disable(TimelineHandler &&handler) const { } void TimelineController::commitHookWasRegistered( - const UIManager &uiManager) noexcept { + const UIManager& uiManager) noexcept { uiManager_ = &uiManager; } void TimelineController::commitHookWasUnregistered( - const UIManager & /*uiManager*/) noexcept { + const UIManager& /*uiManager*/) noexcept { uiManager_ = nullptr; } RootShadowNode::Unshared TimelineController::shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) noexcept { + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) noexcept { std::shared_lock lock(timelinesMutex_); assert(uiManager_ && "`uiManager_` must not be `nullptr`."); @@ -66,7 +66,7 @@ RootShadowNode::Unshared TimelineController::shadowTreeWillCommit( return newRootShadowNode; } - auto &timeline = *iterator->second; + auto& timeline = *iterator->second; return timeline.shadowTreeWillCommit( shadowTree, oldRootShadowNode, newRootShadowNode); } diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h index c1788ac7de4..a1415a061c1 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineController.h @@ -38,7 +38,7 @@ class TimelineController final : public UIManagerCommitHook { * destruction of all associated resources and stopping the introspection * process. */ - void disable(TimelineHandler &&handler) const; + void disable(TimelineHandler&& handler) const; /* * TO BE DELETED. @@ -50,13 +50,13 @@ class TimelineController final : public UIManagerCommitHook { #pragma mark - UIManagerCommitHook RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) noexcept override; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) noexcept override; - void commitHookWasRegistered(const UIManager &uiManager) noexcept override; + void commitHookWasRegistered(const UIManager& uiManager) noexcept override; - void commitHookWasUnregistered(const UIManager &uiManager) noexcept override; + void commitHookWasUnregistered(const UIManager& uiManager) noexcept override; private: /* @@ -69,7 +69,7 @@ class TimelineController final : public UIManagerCommitHook { */ mutable butter::map> timelines_; - mutable const UIManager *uiManager_; + mutable const UIManager* uiManager_; mutable SurfaceId lastUpdatedSurface_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineFrame.h b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineFrame.h index f68b6e4ed64..f36b0bd60e9 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineFrame.h +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineFrame.h @@ -30,8 +30,8 @@ class TimelineFrame final { using List = std::vector; TimelineFrame() = delete; - TimelineFrame(const TimelineFrame &timelineFrame) noexcept = default; - TimelineFrame &operator=(const TimelineFrame &other) noexcept = default; + TimelineFrame(const TimelineFrame& timelineFrame) noexcept = default; + TimelineFrame& operator=(const TimelineFrame& other) noexcept = default; int getIndex() const noexcept; TelemetryTimePoint getTimePoint() const noexcept; diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.cpp b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.cpp index fba15200b1d..2bc96b636c8 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.cpp +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.cpp @@ -13,10 +13,10 @@ namespace facebook::react { -TimelineHandler::TimelineHandler(const Timeline &timeline) noexcept +TimelineHandler::TimelineHandler(const Timeline& timeline) noexcept : timeline_(&timeline) {} -TimelineHandler::TimelineHandler(TimelineHandler &&other) noexcept { +TimelineHandler::TimelineHandler(TimelineHandler&& other) noexcept { this->operator=(std::move(other)); } @@ -27,7 +27,7 @@ TimelineHandler::~TimelineHandler() noexcept { } } -TimelineHandler &TimelineHandler::operator=(TimelineHandler &&other) noexcept { +TimelineHandler& TimelineHandler::operator=(TimelineHandler&& other) noexcept { assert(other.timeline_ && "Moving from an empty `TimelineHandler`."); timeline_ = other.timeline_; other.timeline_ = nullptr; @@ -61,7 +61,7 @@ TimelineFrame::List TimelineHandler::getFrames() const noexcept { return timeline_->getFrames(); } -void TimelineHandler::rewind(const TimelineFrame &frame) const noexcept { +void TimelineHandler::rewind(const TimelineFrame& frame) const noexcept { ensureNotEmpty(); return timeline_->rewind(frame); } diff --git a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.h b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.h index faebc9feb40..f9cb7eb90e5 100644 --- a/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.h +++ b/packages/react-native/ReactCommon/react/renderer/timeline/TimelineHandler.h @@ -22,10 +22,10 @@ class TimelineHandler final { /* * Movable, not copyable. */ - TimelineHandler(TimelineHandler &&other) noexcept; - TimelineHandler(const TimelineHandler &timelineHandler) = delete; - TimelineHandler &operator=(TimelineHandler &&other) noexcept; - TimelineHandler &operator=(const TimelineHandler &other) = delete; + TimelineHandler(TimelineHandler&& other) noexcept; + TimelineHandler(const TimelineHandler& timelineHandler) = delete; + TimelineHandler& operator=(TimelineHandler&& other) noexcept; + TimelineHandler& operator=(const TimelineHandler& other) = delete; /* * Stops (or resumes) mounting of new commits. @@ -44,7 +44,7 @@ class TimelineHandler final { /* * Rewinds the UI to a given frame. */ - void rewind(const TimelineFrame &frame) const noexcept; + void rewind(const TimelineFrame& frame) const noexcept; /* * Rewinds the UI for a given number of frames back or forward. @@ -57,7 +57,7 @@ class TimelineHandler final { /* * Can only be constructed by `TimelineController`. */ - TimelineHandler(const Timeline &timeline) noexcept; + TimelineHandler(const Timeline& timeline) noexcept; /* * Must be called before deallocation to make it not crash. @@ -72,7 +72,7 @@ class TimelineHandler final { void ensureNotEmpty() const noexcept; - const Timeline *timeline_{}; + const Timeline* timeline_{}; }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp index 8d4eeaec94b..d1f48491f43 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.cpp @@ -10,8 +10,8 @@ namespace facebook::react { static ShadowNode::Shared getShadowNodeFromEventTarget( - jsi::Runtime &runtime, - const EventTarget &target) { + jsi::Runtime& runtime, + const EventTarget& target) { auto instanceHandle = target.getInstanceHandle(runtime); if (instanceHandle.isObject()) { auto handleObj = instanceHandle.asObject(runtime); @@ -30,11 +30,11 @@ static ShadowNode::Shared getShadowNodeFromEventTarget( } static bool isViewListeningToEvents( - const ShadowNode &shadowNode, + const ShadowNode& shadowNode, std::initializer_list eventTypes) { if (shadowNode.getTraits().check(ShadowNodeTraits::Trait::ViewKind)) { auto props = shadowNode.getProps(); - auto viewProps = static_cast(*props); + auto viewProps = static_cast(*props); for (const ViewEvents::Offset eventType : eventTypes) { if (viewProps.events[eventType]) { @@ -46,8 +46,8 @@ static bool isViewListeningToEvents( } static bool isAnyViewInPathToRootListeningToEvents( - const UIManager &uiManager, - const ShadowNode &shadowNode, + const UIManager& uiManager, + const ShadowNode& shadowNode, std::initializer_list eventTypes) { // Check the target view first if (isViewListeningToEvents(shadowNode, eventTypes)) { @@ -58,7 +58,7 @@ static bool isAnyViewInPathToRootListeningToEvents( auto owningRootShadowNode = ShadowNode::Shared{}; uiManager.getShadowTreeRegistry().visit( shadowNode.getSurfaceId(), - [&owningRootShadowNode](const ShadowTree &shadowTree) { + [&owningRootShadowNode](const ShadowTree& shadowTree) { owningRootShadowNode = shadowTree.getCurrentRevision().rootShadowNode; }); @@ -66,12 +66,12 @@ static bool isAnyViewInPathToRootListeningToEvents( return false; } - auto &nodeFamily = shadowNode.getFamily(); + auto& nodeFamily = shadowNode.getFamily(); auto ancestors = nodeFamily.getAncestors(*owningRootShadowNode); // Check for listeners from the target's parent to the root for (auto it = ancestors.rbegin(); it != ancestors.rend(); it++) { - auto ¤tNode = it->first.get(); + auto& currentNode = it->first.get(); if (isViewListeningToEvents(currentNode, eventTypes)) { return true; } @@ -81,9 +81,9 @@ static bool isAnyViewInPathToRootListeningToEvents( } static PointerEventTarget retargetPointerEvent( - const PointerEvent &event, - const ShadowNode &nodeToTarget, - const UIManager &uiManager) { + const PointerEvent& event, + const ShadowNode& nodeToTarget, + const UIManager& uiManager) { PointerEvent retargetedEvent(event); // TODO: is dereferencing latestNodeToTarget without null checking safe? @@ -113,7 +113,7 @@ static PointerEventTarget retargetPointerEvent( static ShadowNode::Shared getCaptureTargetOverride( PointerIdentifier pointerId, - CaptureTargetOverrideRegistry ®istry) { + CaptureTargetOverrideRegistry& registry) { auto pendingPointerItr = registry.find(pointerId); if (pendingPointerItr == registry.end()) { return nullptr; @@ -135,9 +135,9 @@ static ShadowNode::Shared getCaptureTargetOverride( * inspecing the listeners in the target's view path. */ static bool shouldEmitPointerEvent( - const ShadowNode &targetNode, - const std::string &type, - const UIManager &uiManager) { + const ShadowNode& targetNode, + const std::string& type, + const UIManager& uiManager) { if (type == "topPointerDown") { return isAnyViewInPathToRootListeningToEvents( uiManager, @@ -197,18 +197,18 @@ static bool shouldEmitPointerEvent( } void PointerEventsProcessor::interceptPointerEvent( - jsi::Runtime &runtime, - const EventTarget *target, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* target, + const std::string& type, ReactEventPriority priority, - const PointerEvent &event, - const DispatchEvent &eventDispatcher, - const UIManager &uiManager) { + const PointerEvent& event, + const DispatchEvent& eventDispatcher, + const UIManager& uiManager) { // Process all pending pointer capture assignments processPendingPointerCapture(event, runtime, eventDispatcher, uiManager); PointerEvent pointerEvent(event); - const EventTarget *eventTarget = target; + const EventTarget* eventTarget = target; // Retarget the event if it has a pointer capture override target auto overrideTarget = getCaptureTargetOverride( @@ -255,7 +255,7 @@ void PointerEventsProcessor::interceptPointerEvent( void PointerEventsProcessor::setPointerCapture( PointerIdentifier pointerId, - const ShadowNode::Shared &shadowNode) { + const ShadowNode::Shared& shadowNode) { if (auto activePointer = getActivePointer(pointerId)) { // As per the spec this method should silently fail if the pointer in // question does not have any active buttons @@ -272,7 +272,7 @@ void PointerEventsProcessor::setPointerCapture( void PointerEventsProcessor::releasePointerCapture( PointerIdentifier pointerId, - const ShadowNode *shadowNode) { + const ShadowNode* shadowNode) { if (getActivePointer(pointerId) != nullptr) { // We only clear the pointer's capture target override if release was called // on the shadowNode which has the capture override, otherwise the result @@ -291,7 +291,7 @@ void PointerEventsProcessor::releasePointerCapture( bool PointerEventsProcessor::hasPointerCapture( PointerIdentifier pointerId, - const ShadowNode *shadowNode) { + const ShadowNode* shadowNode) { ShadowNode::Shared pendingTarget = getCaptureTargetOverride( pointerId, pendingPointerCaptureTargetOverrides_); if (pendingTarget != nullptr) { @@ -300,20 +300,20 @@ bool PointerEventsProcessor::hasPointerCapture( return false; } -ActivePointer *PointerEventsProcessor::getActivePointer( +ActivePointer* PointerEventsProcessor::getActivePointer( PointerIdentifier pointerId) { auto it = activePointers_.find(pointerId); return (it == activePointers_.end()) ? nullptr : &it->second; } -void PointerEventsProcessor::registerActivePointer(const PointerEvent &event) { +void PointerEventsProcessor::registerActivePointer(const PointerEvent& event) { ActivePointer activePointer = {}; activePointer.event = event; activePointers_[event.pointerId] = activePointer; } -void PointerEventsProcessor::updateActivePointer(const PointerEvent &event) { +void PointerEventsProcessor::updateActivePointer(const PointerEvent& event) { if (auto activePointer = getActivePointer(event.pointerId)) { activePointer->event = event; } else { @@ -323,7 +323,7 @@ void PointerEventsProcessor::updateActivePointer(const PointerEvent &event) { } void PointerEventsProcessor::unregisterActivePointer( - const PointerEvent &event) { + const PointerEvent& event) { if (getActivePointer(event.pointerId) != nullptr) { activePointers_.erase(event.pointerId); } else { @@ -333,10 +333,10 @@ void PointerEventsProcessor::unregisterActivePointer( } void PointerEventsProcessor::processPendingPointerCapture( - const PointerEvent &event, - jsi::Runtime &runtime, - const DispatchEvent &eventDispatcher, - const UIManager &uiManager) { + const PointerEvent& event, + jsi::Runtime& runtime, + const DispatchEvent& eventDispatcher, + const UIManager& uiManager) { auto pendingOverride = getCaptureTargetOverride( event.pointerId, pendingPointerCaptureTargetOverrides_); bool hasPendingOverride = pendingOverride != nullptr; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h index 0be59f76353..054296a1ccb 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/PointerEventsProcessor.h @@ -28,11 +28,11 @@ struct ActivePointer { }; using DispatchEvent = std::function; + const EventPayload& payload)>; using PointerIdentifier = int32_t; using CaptureTargetOverrideRegistry = @@ -44,36 +44,36 @@ using ActivePointerRegistry = class PointerEventsProcessor final { public: void interceptPointerEvent( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const PointerEvent &event, - const DispatchEvent &eventDispatcher, - const UIManager &uiManager); + const PointerEvent& event, + const DispatchEvent& eventDispatcher, + const UIManager& uiManager); void setPointerCapture( PointerIdentifier pointerId, - const ShadowNode::Shared &shadowNode); + const ShadowNode::Shared& shadowNode); void releasePointerCapture( PointerIdentifier pointerId, - const ShadowNode *shadowNode); + const ShadowNode* shadowNode); bool hasPointerCapture( PointerIdentifier pointerId, - const ShadowNode *shadowNode); + const ShadowNode* shadowNode); private: - ActivePointer *getActivePointer(PointerIdentifier pointerId); + ActivePointer* getActivePointer(PointerIdentifier pointerId); - void registerActivePointer(const PointerEvent &event); - void updateActivePointer(const PointerEvent &event); - void unregisterActivePointer(const PointerEvent &event); + void registerActivePointer(const PointerEvent& event); + void updateActivePointer(const PointerEvent& event); + void unregisterActivePointer(const PointerEvent& event); void processPendingPointerCapture( - const PointerEvent &event, - jsi::Runtime &runtime, - const DispatchEvent &eventDispatcher, - const UIManager &uiManager); + const PointerEvent& event, + jsi::Runtime& runtime, + const DispatchEvent& eventDispatcher, + const UIManager& uiManager); ActivePointerRegistry activePointers_; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp index 2685b778504..6612a6918d2 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.cpp @@ -16,9 +16,9 @@ namespace facebook::react { namespace { void throwIfBridgeless( - jsi::Runtime &runtime, - jsi::Object &global, - const char *methodName) { + jsi::Runtime& runtime, + jsi::Object& global, + const char* methodName) { auto isBridgeless = global.getProperty(runtime, "RN$Bridgeless"); if (isBridgeless.isBool() && isBridgeless.asBool()) { throw std::runtime_error( @@ -30,10 +30,10 @@ void throwIfBridgeless( } // namespace void SurfaceRegistryBinding::startSurface( - jsi::Runtime &runtime, + jsi::Runtime& runtime, SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &initialProps, + const std::string& moduleName, + const folly::dynamic& initialProps, DisplayMode displayMode) { SystraceSection s("SurfaceRegistryBinding::startSurface"); jsi::Object parameters(runtime); @@ -65,10 +65,10 @@ void SurfaceRegistryBinding::startSurface( } void SurfaceRegistryBinding::setSurfaceProps( - jsi::Runtime &runtime, + jsi::Runtime& runtime, SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &initialProps, + const std::string& moduleName, + const folly::dynamic& initialProps, DisplayMode displayMode) { SystraceSection s("UIManagerBinding::setSurfaceProps"); jsi::Object parameters(runtime); @@ -100,7 +100,7 @@ void SurfaceRegistryBinding::setSurfaceProps( } void SurfaceRegistryBinding::stopSurface( - jsi::Runtime &runtime, + jsi::Runtime& runtime, SurfaceId surfaceId) { auto global = runtime.global(); auto stopFunction = global.getProperty(runtime, "RN$stopSurface"); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h index 61da5e6cb3f..b31ef1ed3a9 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/SurfaceRegistryBinding.h @@ -21,10 +21,10 @@ class SurfaceRegistryBinding final { * Thread synchronization must be enforced externally. */ static void startSurface( - jsi::Runtime &runtime, + jsi::Runtime& runtime, SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &initialProps, + const std::string& moduleName, + const folly::dynamic& initialProps, DisplayMode displayMode); /* @@ -33,17 +33,17 @@ class SurfaceRegistryBinding final { * Thread synchronization must be enforced externally. */ static void setSurfaceProps( - jsi::Runtime &runtime, + jsi::Runtime& runtime, SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &initialProps, + const std::string& moduleName, + const folly::dynamic& initialProps, DisplayMode displayMode); /* * Stops React Native Surface with given id. * Thread synchronization must be enforced externally. */ - static void stopSurface(jsi::Runtime &runtime, SurfaceId surfaceId); + static void stopSurface(jsi::Runtime& runtime, SurfaceId surfaceId); }; } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp index 48605e4258d..4a434560a4f 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.cpp @@ -41,7 +41,7 @@ ShadowNodeWrapper::~ShadowNodeWrapper() = default; ShadowNodeListWrapper::~ShadowNodeListWrapper() = default; static std::unique_ptr constructLeakCheckerIfNeeded( - const RuntimeExecutor &runtimeExecutor) { + const RuntimeExecutor& runtimeExecutor) { #ifdef REACT_NATIVE_DEBUG return std::make_unique(runtimeExecutor); #else @@ -50,7 +50,7 @@ static std::unique_ptr constructLeakCheckerIfNeeded( } UIManager::UIManager( - const RuntimeExecutor &runtimeExecutor, + const RuntimeExecutor& runtimeExecutor, BackgroundExecutor backgroundExecutor, ContextContainer::Shared contextContainer) : runtimeExecutor_(runtimeExecutor), @@ -65,13 +65,13 @@ UIManager::~UIManager() { ShadowNode::Shared UIManager::createNode( Tag tag, - const std::string &name, + const std::string& name, SurfaceId surfaceId, - const RawProps &rawProps, - const InstanceHandle::Shared &instanceHandle) const { + const RawProps& rawProps, + const InstanceHandle::Shared& instanceHandle) const { SystraceSection s("UIManager::createNode", "componentName", name); - auto &componentDescriptor = componentDescriptorRegistry_->at(name); + auto& componentDescriptor = componentDescriptorRegistry_->at(name); auto fallbackDescriptor = componentDescriptorRegistry_->getFallbackComponentDescriptor(); @@ -111,17 +111,17 @@ ShadowNode::Shared UIManager::createNode( } ShadowNode::Shared UIManager::cloneNode( - const ShadowNode &shadowNode, - const ShadowNode::SharedListOfShared &children, - const RawProps *rawProps) const { + const ShadowNode& shadowNode, + const ShadowNode::SharedListOfShared& children, + const RawProps* rawProps) const { SystraceSection s( "UIManager::cloneNode", "componentName", shadowNode.getComponentName()); PropsParserContext propsParserContext{ shadowNode.getFamily().getSurfaceId(), *contextContainer_.get()}; - auto &componentDescriptor = shadowNode.getComponentDescriptor(); - auto &family = shadowNode.getFamily(); + auto& componentDescriptor = shadowNode.getComponentDescriptor(); + auto& family = shadowNode.getFamily(); auto props = ShadowNodeFragment::propsPlaceholder(); if (rawProps != nullptr) { @@ -155,23 +155,23 @@ ShadowNode::Shared UIManager::cloneNode( } void UIManager::appendChild( - const ShadowNode::Shared &parentShadowNode, - const ShadowNode::Shared &childShadowNode) const { + const ShadowNode::Shared& parentShadowNode, + const ShadowNode::Shared& childShadowNode) const { SystraceSection s("UIManager::appendChild"); - auto &componentDescriptor = parentShadowNode->getComponentDescriptor(); + auto& componentDescriptor = parentShadowNode->getComponentDescriptor(); componentDescriptor.appendChild(parentShadowNode, childShadowNode); } void UIManager::completeSurface( SurfaceId surfaceId, - const ShadowNode::UnsharedListOfShared &rootChildren, + const ShadowNode::UnsharedListOfShared& rootChildren, ShadowTree::CommitOptions commitOptions) const { SystraceSection s("UIManager::completeSurface", "surfaceId", surfaceId); - shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree &shadowTree) { + shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree& shadowTree) { shadowTree.commit( - [&](RootShadowNode const &oldRootShadowNode) { + [&](RootShadowNode const& oldRootShadowNode) { return std::make_shared( oldRootShadowNode, ShadowNodeFragment{ @@ -184,7 +184,7 @@ void UIManager::completeSurface( } void UIManager::setIsJSResponder( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, bool isJSResponder, bool blockNativeResponder) const { if (delegate_ != nullptr) { @@ -194,16 +194,16 @@ void UIManager::setIsJSResponder( } void UIManager::startSurface( - ShadowTree::Unique &&shadowTree, - const std::string &moduleName, - const folly::dynamic &props, + ShadowTree::Unique&& shadowTree, + const std::string& moduleName, + const folly::dynamic& props, DisplayMode displayMode) const { SystraceSection s("UIManager::startSurface"); auto surfaceId = shadowTree->getSurfaceId(); shadowTreeRegistry_.add(std::move(shadowTree)); - runtimeExecutor_([=](jsi::Runtime &runtime) { + runtimeExecutor_([=](jsi::Runtime& runtime) { SystraceSection s("UIManager::startSurface::onRuntime"); SurfaceRegistryBinding::startSurface( runtime, surfaceId, moduleName, props, displayMode); @@ -212,12 +212,12 @@ void UIManager::startSurface( void UIManager::setSurfaceProps( SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &props, + const std::string& moduleName, + const folly::dynamic& props, DisplayMode displayMode) const { SystraceSection s("UIManager::setSurfaceProps"); - runtimeExecutor_([=](jsi::Runtime &runtime) { + runtimeExecutor_([=](jsi::Runtime& runtime) { SurfaceRegistryBinding::setSurfaceProps( runtime, surfaceId, moduleName, props, displayMode); }); @@ -237,7 +237,7 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const { // minimize any visible side-effects of stopping the Surface. Any possible // commits from the JavaScript side will not be able to reference a // `ShadowTree` and will fail silently. - runtimeExecutor_([=](jsi::Runtime &runtime) { + runtimeExecutor_([=](jsi::Runtime& runtime) { SurfaceRegistryBinding::stopSurface(runtime, surfaceId); }); @@ -249,10 +249,10 @@ ShadowTree::Unique UIManager::stopSurface(SurfaceId surfaceId) const { } ShadowNode::Shared UIManager::getNewestCloneOfShadowNode( - const ShadowNode &shadowNode) const { + const ShadowNode& shadowNode) const { auto ancestorShadowNode = ShadowNode::Shared{}; shadowTreeRegistry_.visit( - shadowNode.getSurfaceId(), [&](const ShadowTree &shadowTree) { + shadowNode.getSurfaceId(), [&](const ShadowTree& shadowTree) { ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode; }); @@ -271,10 +271,10 @@ ShadowNode::Shared UIManager::getNewestCloneOfShadowNode( } ShadowNode::Shared UIManager::getNewestParentOfShadowNode( - const ShadowNode &shadowNode) const { + const ShadowNode& shadowNode) const { auto ancestorShadowNode = ShadowNode::Shared{}; shadowTreeRegistry_.visit( - shadowNode.getSurfaceId(), [&](const ShadowTree &shadowTree) { + shadowNode.getSurfaceId(), [&](const ShadowTree& shadowTree) { ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode; }); @@ -299,7 +299,7 @@ ShadowNode::Shared UIManager::getNewestParentOfShadowNode( } std::string UIManager::getTextContentInNewestCloneOfShadowNode( - const ShadowNode &shadowNode) const { + const ShadowNode& shadowNode) const { auto newestCloneOfShadowNode = getNewestCloneOfShadowNode(shadowNode); std::string result; getTextContentInShadowNode(*newestCloneOfShadowNode, result); @@ -307,8 +307,8 @@ std::string UIManager::getTextContentInNewestCloneOfShadowNode( } int UIManager::compareDocumentPosition( - const ShadowNode &shadowNode, - const ShadowNode &otherShadowNode) const { + const ShadowNode& shadowNode, + const ShadowNode& otherShadowNode) const { // Quick check for node vs. itself if (&shadowNode == &otherShadowNode) { return 0; @@ -320,7 +320,7 @@ int UIManager::compareDocumentPosition( auto ancestorShadowNode = ShadowNode::Shared{}; shadowTreeRegistry_.visit( - shadowNode.getSurfaceId(), [&](const ShadowTree &shadowTree) { + shadowNode.getSurfaceId(), [&](const ShadowTree& shadowTree) { ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode; }); if (!ancestorShadowNode) { @@ -361,15 +361,15 @@ int UIManager::compareDocumentPosition( } ShadowNode::Shared UIManager::findNodeAtPoint( - const ShadowNode::Shared &node, + const ShadowNode::Shared& node, Point point) const { return LayoutableShadowNode::findNodeAtPoint( getNewestCloneOfShadowNode(*node), point); } LayoutMetrics UIManager::getRelativeLayoutMetrics( - const ShadowNode &shadowNode, - const ShadowNode *ancestorShadowNode, + const ShadowNode& shadowNode, + const ShadowNode* ancestorShadowNode, LayoutableShadowNode::LayoutInspectingPolicy policy) const { SystraceSection s("UIManager::getRelativeLayoutMetrics"); @@ -379,7 +379,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics( if (ancestorShadowNode == nullptr) { shadowTreeRegistry_.visit( - shadowNode.getSurfaceId(), [&](const ShadowTree &shadowTree) { + shadowNode.getSurfaceId(), [&](const ShadowTree& shadowTree) { owningAncestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode; ancestorShadowNode = owningAncestorShadowNode.get(); @@ -393,7 +393,7 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics( } auto layoutableAncestorShadowNode = - traitCast(ancestorShadowNode); + traitCast(ancestorShadowNode); if (layoutableAncestorShadowNode == nullptr) { return EmptyLayoutMetrics; @@ -403,23 +403,23 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics( shadowNode.getFamily(), *layoutableAncestorShadowNode, policy); } -void UIManager::updateState(const StateUpdate &stateUpdate) const { +void UIManager::updateState(const StateUpdate& stateUpdate) const { SystraceSection s( "UIManager::updateState", "componentName", stateUpdate.family->getComponentName()); - auto &callback = stateUpdate.callback; - auto &family = stateUpdate.family; - auto &componentDescriptor = family->getComponentDescriptor(); + auto& callback = stateUpdate.callback; + auto& family = stateUpdate.family; + auto& componentDescriptor = family->getComponentDescriptor(); shadowTreeRegistry_.visit( - family->getSurfaceId(), [&](const ShadowTree &shadowTree) { + family->getSurfaceId(), [&](const ShadowTree& shadowTree) { shadowTree.commit( - [&](RootShadowNode const &oldRootShadowNode) { + [&](RootShadowNode const& oldRootShadowNode) { auto isValid = true; auto rootNode = oldRootShadowNode.cloneTree( - *family, [&](ShadowNode const &oldShadowNode) { + *family, [&](ShadowNode const& oldShadowNode) { auto newData = callback(oldShadowNode.getState()->getDataPointer()); @@ -449,18 +449,18 @@ void UIManager::updateState(const StateUpdate &stateUpdate) const { } void UIManager::dispatchCommand( - const ShadowNode::Shared &shadowNode, - const std::string &commandName, - const folly::dynamic &args) const { + const ShadowNode::Shared& shadowNode, + const std::string& commandName, + const folly::dynamic& args) const { if (delegate_ != nullptr) { delegate_->uiManagerDidDispatchCommand(shadowNode, commandName, args); } } void UIManager::setNativeProps_DEPRECATED( - const ShadowNode::Shared &shadowNode, - const RawProps &rawProps) const { - auto &family = shadowNode->getFamily(); + const ShadowNode::Shared& shadowNode, + const RawProps& rawProps) const { + auto& family = shadowNode->getFamily(); if (family.nativeProps_DEPRECATED) { // Values in `rawProps` patch (take precedence over) // `nativeProps_DEPRECATED`. For example, if both `nativeProps_DEPRECATED` @@ -475,12 +475,12 @@ void UIManager::setNativeProps_DEPRECATED( } shadowTreeRegistry_.visit( - family.getSurfaceId(), [&](const ShadowTree &shadowTree) { + family.getSurfaceId(), [&](const ShadowTree& shadowTree) { shadowTree.commit( - [&](RootShadowNode const &oldRootShadowNode) { + [&](RootShadowNode const& oldRootShadowNode) { auto rootNode = oldRootShadowNode.cloneTree( - family, [&](ShadowNode const &oldShadowNode) { - auto &componentDescriptor = + family, [&](ShadowNode const& oldShadowNode) { + auto& componentDescriptor = componentDescriptorRegistry_->at( shadowNode->getComponentHandle()); PropsParserContext propsParserContext{ @@ -500,18 +500,18 @@ void UIManager::setNativeProps_DEPRECATED( } void UIManager::sendAccessibilityEvent( - const ShadowNode::Shared &shadowNode, - const std::string &eventType) { + const ShadowNode::Shared& shadowNode, + const std::string& eventType) { if (delegate_ != nullptr) { delegate_->uiManagerDidSendAccessibilityEvent(shadowNode, eventType); } } void UIManager::configureNextLayoutAnimation( - jsi::Runtime &runtime, - const RawValue &config, - const jsi::Value &successCallback, - const jsi::Value &failureCallback) const { + jsi::Runtime& runtime, + const RawValue& config, + const jsi::Value& successCallback, + const jsi::Value& failureCallback) const { if (animationDelegate_ != nullptr) { animationDelegate_->uiManagerDidConfigureNextLayoutAnimation( runtime, @@ -528,7 +528,7 @@ static ShadowNode::Shared findShadowNodeByTagRecursively( return parentShadowNode; } - for (const ShadowNode::Shared &shadowNode : parentShadowNode->getChildren()) { + for (const ShadowNode::Shared& shadowNode : parentShadowNode->getChildren()) { auto result = findShadowNodeByTagRecursively(shadowNode, tag); if (result) { return result; @@ -541,8 +541,8 @@ static ShadowNode::Shared findShadowNodeByTagRecursively( ShadowNode::Shared UIManager::findShadowNodeByTag_DEPRECATED(Tag tag) const { auto shadowNode = ShadowNode::Shared{}; - shadowTreeRegistry_.enumerate([&](const ShadowTree &shadowTree, bool &stop) { - RootShadowNode const *rootShadowNode; + shadowTreeRegistry_.enumerate([&](const ShadowTree& shadowTree, bool& stop) { + RootShadowNode const* rootShadowNode; // The public interface of `ShadowTree` discourages accessing a stored // pointer to a root node because of the possible data race. // To work around this, we ask for a commit and immediately cancel it @@ -551,16 +551,16 @@ ShadowNode::Shared UIManager::findShadowNodeByTag_DEPRECATED(Tag tag) const { // because this `findShadowNodeByTag` is deprecated. It is only added // to make migration to the new architecture easier. shadowTree.tryCommit( - [&](RootShadowNode const &oldRootShadowNode) { + [&](RootShadowNode const& oldRootShadowNode) { rootShadowNode = &oldRootShadowNode; return nullptr; }, {/* default commit options */}); if (rootShadowNode != nullptr) { - auto const &children = rootShadowNode->getChildren(); + auto const& children = rootShadowNode->getChildren(); if (!children.empty()) { - auto const &child = children.front(); + auto const& child = children.front(); shadowNode = findShadowNodeByTagRecursively(child, tag); if (shadowNode) { stop = true; @@ -573,33 +573,33 @@ ShadowNode::Shared UIManager::findShadowNodeByTag_DEPRECATED(Tag tag) const { } void UIManager::setComponentDescriptorRegistry( - const SharedComponentDescriptorRegistry &componentDescriptorRegistry) { + const SharedComponentDescriptorRegistry& componentDescriptorRegistry) { componentDescriptorRegistry_ = componentDescriptorRegistry; } -void UIManager::setDelegate(UIManagerDelegate *delegate) { +void UIManager::setDelegate(UIManagerDelegate* delegate) { delegate_ = delegate; } -UIManagerDelegate *UIManager::getDelegate() { +UIManagerDelegate* UIManager::getDelegate() { return delegate_; } void UIManager::visitBinding( - const std::function - &callback, - jsi::Runtime &runtime) const { + const std::function& + callback, + jsi::Runtime& runtime) const { auto uiManagerBinding = UIManagerBinding::getBinding(runtime); if (uiManagerBinding) { callback(*uiManagerBinding); } } -const ShadowTreeRegistry &UIManager::getShadowTreeRegistry() const { +const ShadowTreeRegistry& UIManager::getShadowTreeRegistry() const { return shadowTreeRegistry_; } -void UIManager::registerCommitHook(UIManagerCommitHook &commitHook) { +void UIManager::registerCommitHook(UIManagerCommitHook& commitHook) { std::unique_lock lock(commitHookMutex_); react_native_assert( std::find(commitHooks_.begin(), commitHooks_.end(), &commitHook) == @@ -608,7 +608,7 @@ void UIManager::registerCommitHook(UIManagerCommitHook &commitHook) { commitHooks_.push_back(&commitHook); } -void UIManager::unregisterCommitHook(UIManagerCommitHook &commitHook) { +void UIManager::unregisterCommitHook(UIManagerCommitHook& commitHook) { std::unique_lock lock(commitHookMutex_); auto iterator = std::find(commitHooks_.begin(), commitHooks_.end(), &commitHook); @@ -617,7 +617,7 @@ void UIManager::unregisterCommitHook(UIManagerCommitHook &commitHook) { commitHook.commitHookWasUnregistered(*this); } -void UIManager::registerMountHook(UIManagerMountHook &mountHook) { +void UIManager::registerMountHook(UIManagerMountHook& mountHook) { std::unique_lock lock(mountHookMutex_); react_native_assert( std::find(mountHooks_.begin(), mountHooks_.end(), &mountHook) == @@ -625,7 +625,7 @@ void UIManager::registerMountHook(UIManagerMountHook &mountHook) { mountHooks_.push_back(&mountHook); } -void UIManager::unregisterMountHook(UIManagerMountHook &mountHook) { +void UIManager::unregisterMountHook(UIManagerMountHook& mountHook) { std::unique_lock lock(mountHookMutex_); auto iterator = std::find(mountHooks_.begin(), mountHooks_.end(), &mountHook); react_native_assert(iterator != mountHooks_.end()); @@ -635,15 +635,15 @@ void UIManager::unregisterMountHook(UIManagerMountHook &mountHook) { #pragma mark - ShadowTreeDelegate RootShadowNode::Unshared UIManager::shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) const { + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) const { SystraceSection s("UIManager::shadowTreeWillCommit"); std::shared_lock lock(commitHookMutex_); auto resultRootShadowNode = newRootShadowNode; - for (auto *commitHook : commitHooks_) { + for (auto* commitHook : commitHooks_) { resultRootShadowNode = commitHook->shadowTreeWillCommit( shadowTree, oldRootShadowNode, resultRootShadowNode); } @@ -668,7 +668,7 @@ void UIManager::reportMount(SurfaceId surfaceId) const { auto time = JSExecutor::performanceNow(); auto rootShadowNode = RootShadowNode::Shared{}; - shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree &shadowTree) { + shadowTreeRegistry_.visit(surfaceId, [&](const ShadowTree& shadowTree) { rootShadowNode = shadowTree.getMountingCoordinator()->getBaseRevision().rootShadowNode; }); @@ -680,7 +680,7 @@ void UIManager::reportMount(SurfaceId surfaceId) const { { std::shared_lock lock(mountHookMutex_); - for (auto *mountHook : mountHooks_) { + for (auto* mountHook : mountHooks_) { mountHook->shadowTreeDidMount(rootShadowNode, time); } } @@ -688,7 +688,7 @@ void UIManager::reportMount(SurfaceId surfaceId) const { #pragma mark - UIManagerAnimationDelegate -void UIManager::setAnimationDelegate(UIManagerAnimationDelegate *delegate) { +void UIManager::setAnimationDelegate(UIManagerAnimationDelegate* delegate) { animationDelegate_ = delegate; } @@ -701,7 +701,7 @@ void UIManager::stopSurfaceForAnimationDelegate(SurfaceId surfaceId) const { void UIManager::animationTick() const { if (animationDelegate_ != nullptr && animationDelegate_->shouldAnimateFrame()) { - shadowTreeRegistry_.enumerate([](const ShadowTree &shadowTree, bool &) { + shadowTreeRegistry_.enumerate([](const ShadowTree& shadowTree, bool&) { shadowTree.notifyDelegatesOfUpdates(); }); } diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h index 7a3d6807d68..04baf7f7bb9 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManager.h @@ -36,29 +36,29 @@ class UIManagerMountHook; class UIManager final : public ShadowTreeDelegate { public: UIManager( - const RuntimeExecutor &runtimeExecutor, + const RuntimeExecutor& runtimeExecutor, BackgroundExecutor backgroundExecutor, ContextContainer::Shared contextContainer); ~UIManager() override; void setComponentDescriptorRegistry( - const SharedComponentDescriptorRegistry &componentDescriptorRegistry); + const SharedComponentDescriptorRegistry& componentDescriptorRegistry); /* * Sets and gets the UIManager's delegate. * The delegate is stored as a raw pointer, so the owner must null * the pointer before being destroyed. */ - void setDelegate(UIManagerDelegate *delegate); - UIManagerDelegate *getDelegate(); + void setDelegate(UIManagerDelegate* delegate); + UIManagerDelegate* getDelegate(); /** * Sets and gets the UIManager's Animation APIs delegate. * The delegate is stored as a raw pointer, so the owner must null * the pointer before being destroyed. */ - void setAnimationDelegate(UIManagerAnimationDelegate *delegate); + void setAnimationDelegate(UIManagerAnimationDelegate* delegate); /** * Execute stopSurface on any UIMAnagerAnimationDelegate. @@ -74,47 +74,47 @@ class UIManager final : public ShadowTreeDelegate { * The callback is called synchronously on the same thread. */ void visitBinding( - const std::function - &callback, - jsi::Runtime &runtime) const; + const std::function& + callback, + jsi::Runtime& runtime) const; /* * Registers and unregisters a commit hook. */ - void registerCommitHook(UIManagerCommitHook &commitHook); - void unregisterCommitHook(UIManagerCommitHook &commitHook); + void registerCommitHook(UIManagerCommitHook& commitHook); + void unregisterCommitHook(UIManagerCommitHook& commitHook); /* * Registers and unregisters a mount hook. */ - void registerMountHook(UIManagerMountHook &mountHook); - void unregisterMountHook(UIManagerMountHook &mountHook); + void registerMountHook(UIManagerMountHook& mountHook); + void unregisterMountHook(UIManagerMountHook& mountHook); ShadowNode::Shared getNewestCloneOfShadowNode( - const ShadowNode &shadowNode) const; + const ShadowNode& shadowNode) const; ShadowNode::Shared getNewestParentOfShadowNode( - const ShadowNode &shadowNode) const; + const ShadowNode& shadowNode) const; std::string getTextContentInNewestCloneOfShadowNode( - const ShadowNode &shadowNode) const; + const ShadowNode& shadowNode) const; int compareDocumentPosition( - const ShadowNode &shadowNode, - const ShadowNode &otherShadowNode) const; + const ShadowNode& shadowNode, + const ShadowNode& otherShadowNode) const; #pragma mark - Surface Start & Stop void startSurface( - ShadowTree::Unique &&shadowTree, - const std::string &moduleName, - const folly::dynamic &props, + ShadowTree::Unique&& shadowTree, + const std::string& moduleName, + const folly::dynamic& props, DisplayMode displayMode) const; void setSurfaceProps( SurfaceId surfaceId, - const std::string &moduleName, - const folly::dynamic &props, + const std::string& moduleName, + const folly::dynamic& props, DisplayMode displayMode) const; ShadowTree::Unique stopSurface(SurfaceId surfaceId) const; @@ -126,38 +126,38 @@ class UIManager final : public ShadowTreeDelegate { bool mountSynchronously) const override; RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) const override; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) const override; ShadowNode::Shared createNode( Tag tag, - const std::string &componentName, + const std::string& componentName, SurfaceId surfaceId, - const RawProps &props, - const InstanceHandle::Shared &instanceHandle) const; + const RawProps& props, + const InstanceHandle::Shared& instanceHandle) const; ShadowNode::Shared cloneNode( - const ShadowNode &shadowNode, - const ShadowNode::SharedListOfShared &children = nullptr, - const RawProps *rawProps = nullptr) const; + const ShadowNode& shadowNode, + const ShadowNode::SharedListOfShared& children = nullptr, + const RawProps* rawProps = nullptr) const; void appendChild( - const ShadowNode::Shared &parentShadowNode, - const ShadowNode::Shared &childShadowNode) const; + const ShadowNode::Shared& parentShadowNode, + const ShadowNode::Shared& childShadowNode) const; void completeSurface( SurfaceId surfaceId, - const ShadowNode::UnsharedListOfShared &rootChildren, + const ShadowNode::UnsharedListOfShared& rootChildren, ShadowTree::CommitOptions commitOptions) const; void setIsJSResponder( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, bool isJSResponder, bool blockNativeResponder) const; ShadowNode::Shared findNodeAtPoint( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, Point point) const; /* @@ -166,28 +166,28 @@ class UIManager final : public ShadowTreeDelegate { * `ancestorShadowNode` is nullptr). */ LayoutMetrics getRelativeLayoutMetrics( - const ShadowNode &shadowNode, - const ShadowNode *ancestorShadowNode, + const ShadowNode& shadowNode, + const ShadowNode* ancestorShadowNode, LayoutableShadowNode::LayoutInspectingPolicy policy) const; /* * Creates a new shadow node with given state data, clones what's necessary * and performs a commit. */ - void updateState(const StateUpdate &stateUpdate) const; + void updateState(const StateUpdate& stateUpdate) const; void dispatchCommand( - const ShadowNode::Shared &shadowNode, - const std::string &commandName, - const folly::dynamic &args) const; + const ShadowNode::Shared& shadowNode, + const std::string& commandName, + const folly::dynamic& args) const; void setNativeProps_DEPRECATED( - const ShadowNode::Shared &shadowNode, - const RawProps &rawProps) const; + const ShadowNode::Shared& shadowNode, + const RawProps& rawProps) const; void sendAccessibilityEvent( - const ShadowNode::Shared &shadowNode, - const std::string &eventType); + const ShadowNode::Shared& shadowNode, + const std::string& eventType); /* * Iterates over all shadow nodes which are parts of all registered surfaces @@ -197,7 +197,7 @@ class UIManager final : public ShadowTreeDelegate { */ ShadowNode::Shared findShadowNodeByTag_DEPRECATED(Tag tag) const; - const ShadowTreeRegistry &getShadowTreeRegistry() const; + const ShadowTreeRegistry& getShadowTreeRegistry() const; void reportMount(SurfaceId surfaceId) const; @@ -215,24 +215,24 @@ class UIManager final : public ShadowTreeDelegate { * This API configures a global LayoutAnimation starting from the root node. */ void configureNextLayoutAnimation( - jsi::Runtime &runtime, - const RawValue &config, - const jsi::Value &successCallback, - const jsi::Value &failureCallback) const; + jsi::Runtime& runtime, + const RawValue& config, + const jsi::Value& successCallback, + const jsi::Value& failureCallback) const; SharedComponentDescriptorRegistry componentDescriptorRegistry_; - UIManagerDelegate *delegate_{}; - UIManagerAnimationDelegate *animationDelegate_{nullptr}; + UIManagerDelegate* delegate_{}; + UIManagerAnimationDelegate* animationDelegate_{nullptr}; const RuntimeExecutor runtimeExecutor_{}; ShadowTreeRegistry shadowTreeRegistry_{}; const BackgroundExecutor backgroundExecutor_{}; ContextContainer::Shared contextContainer_; mutable std::shared_mutex commitHookMutex_; - mutable std::vector commitHooks_; + mutable std::vector commitHooks_; mutable std::shared_mutex mountHookMutex_; - mutable std::vector mountHooks_; + mutable std::vector mountHooks_; std::unique_ptr leakChecker_; }; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h index 2885d069881..80dc57ce3ec 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h @@ -23,10 +23,10 @@ class UIManagerAnimationDelegate { * TODO: need SurfaceId here */ virtual void uiManagerDidConfigureNextLayoutAnimation( - jsi::Runtime &runtime, - const RawValue &config, - const jsi::Value &successCallback, - const jsi::Value &failureCallback) const = 0; + jsi::Runtime& runtime, + const RawValue& config, + const jsi::Value& successCallback, + const jsi::Value& failureCallback) const = 0; /** * Set ComponentDescriptor registry. @@ -34,7 +34,7 @@ class UIManagerAnimationDelegate { * @param componentDescriptorRegistry */ virtual void setComponentDescriptorRegistry( - const SharedComponentDescriptorRegistry &componentDescriptorRegistry) = 0; + const SharedComponentDescriptorRegistry& componentDescriptorRegistry) = 0; /** * Set Animation flags for dropping delete and create mutations diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index f6878286ed4..ca6f816844f 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -24,8 +24,8 @@ namespace facebook::react { void UIManagerBinding::createAndInstallIfNeeded( - jsi::Runtime &runtime, - const std::shared_ptr &uiManager) { + jsi::Runtime& runtime, + const std::shared_ptr& uiManager) { auto uiManagerModuleName = "nativeFabricUIManager"; auto uiManagerValue = @@ -41,7 +41,7 @@ void UIManagerBinding::createAndInstallIfNeeded( } std::shared_ptr UIManagerBinding::getBinding( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { auto uiManagerModuleName = "nativeFabricUIManager"; auto uiManagerValue = @@ -63,8 +63,8 @@ UIManagerBinding::~UIManagerBinding() { } jsi::Value UIManagerBinding::getInspectorDataForInstance( - jsi::Runtime &runtime, - const EventEmitter &eventEmitter) const { + jsi::Runtime& runtime, + const EventEmitter& eventEmitter) const { auto eventTarget = eventEmitter.eventTarget_; EventEmitter::DispatchMutex().lock(); @@ -90,21 +90,21 @@ jsi::Value UIManagerBinding::getInspectorDataForInstance( } void UIManagerBinding::dispatchEvent( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &eventPayload) const { + const EventPayload& eventPayload) const { SystraceSection s("UIManagerBinding::dispatchEvent", "type", type); if (eventPayload.getType() == EventPayloadType::PointerEvent) { - auto pointerEvent = static_cast(eventPayload); + auto pointerEvent = static_cast(eventPayload); auto dispatchCallback = [this]( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &eventPayload) { + const EventPayload& eventPayload) { this->dispatchEventToJS( runtime, eventTarget, type, priority, eventPayload); }; @@ -122,11 +122,11 @@ void UIManagerBinding::dispatchEvent( } void UIManagerBinding::dispatchEventToJS( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &eventPayload) const { + const EventPayload& eventPayload) const { auto payload = eventPayload.asJSIValue(runtime); // If a payload is null, the factory has decided to cancel the event @@ -155,8 +155,8 @@ void UIManagerBinding::dispatchEventToJS( LOG(WARNING) << "instanceHandle is null, event will be dropped"; } - auto &eventHandlerWrapper = - static_cast(*eventHandler_); + auto& eventHandlerWrapper = + static_cast(*eventHandler_); currentEventPriority_ = priority; eventHandlerWrapper.callback.call( @@ -172,8 +172,8 @@ void UIManagerBinding::invalidate() const { } static void validateArgumentCount( - jsi::Runtime &runtime, - const std::string &methodName, + jsi::Runtime& runtime, + const std::string& methodName, size_t expected, size_t actual) { if (actual < expected) { @@ -185,8 +185,8 @@ static void validateArgumentCount( } jsi::Value UIManagerBinding::get( - jsi::Runtime &runtime, - const jsi::PropNameID &name) { + jsi::Runtime& runtime, + const jsi::PropNameID& name) { auto methodName = name.utf8(runtime); SystraceSection s("UIManagerBinding::get", "name", methodName); @@ -217,7 +217,7 @@ jsi::Value UIManagerBinding::get( // Scheduler and JS VM. This could happen if, for instance, C++ // semantics cause these lambda to not be deallocated until // a CPU tick (or more) after the JS VM is deallocated. - UIManager *uiManager = uiManager_.get(); + UIManager* uiManager = uiManager_.get(); // Semantic: Creates a new node with given pieces. if (methodName == "createNode") { @@ -227,9 +227,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -259,9 +259,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -279,9 +279,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -301,9 +301,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) { validateArgumentCount(runtime, methodName, paramCount, count); @@ -314,7 +314,7 @@ jsi::Value UIManagerBinding::get( arguments[3].getObject(runtime).getFunction(runtime); auto targetNode = uiManager->findNodeAtPoint(node, Point{locationX, locationY}); - auto &eventTarget = targetNode->getEventEmitter()->eventTarget_; + auto& eventTarget = targetNode->getEventEmitter()->eventTarget_; EventEmitter::DispatchMutex().lock(); eventTarget->retain(runtime); @@ -335,9 +335,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -357,13 +357,13 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); - const auto &rawProps = RawProps(runtime, arguments[1]); + const auto& rawProps = RawProps(runtime, arguments[1]); return valueFromShadowNode( runtime, uiManager->cloneNode( @@ -381,13 +381,13 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); - const auto &rawProps = RawProps(runtime, arguments[1]); + const auto& rawProps = RawProps(runtime, arguments[1]); return valueFromShadowNode( runtime, uiManager->cloneNode( @@ -404,9 +404,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -422,9 +422,9 @@ jsi::Value UIManagerBinding::get( runtime, name, 0, - [](jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value * /*arguments*/, + [](jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* /*arguments*/, size_t /*count*/) -> jsi::Value { auto shadowNodeList = std::make_shared( ShadowNode::ListOfShared({})); @@ -439,9 +439,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -462,9 +462,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [weakUIManager, uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -530,9 +530,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [this, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -551,9 +551,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -578,9 +578,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -602,9 +602,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -624,9 +624,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) { validateArgumentCount(runtime, methodName, paramCount, count); @@ -663,9 +663,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) { validateArgumentCount(runtime, methodName, paramCount, count); @@ -682,7 +682,7 @@ jsi::Value UIManagerBinding::get( auto newestCloneOfShadowNode = uiManager->getNewestCloneOfShadowNode(*shadowNode); - auto layoutableShadowNode = traitCast( + auto layoutableShadowNode = traitCast( newestCloneOfShadowNode.get()); Point originRelativeToParent = layoutableShadowNode != nullptr ? layoutableShadowNode->getLayoutMetrics().frame.origin @@ -708,9 +708,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) { validateArgumentCount(runtime, methodName, paramCount, count); @@ -746,9 +746,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -767,9 +767,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -789,9 +789,9 @@ jsi::Value UIManagerBinding::get( name, 0, [this]( - jsi::Runtime & /*runtime*/, - const jsi::Value & /*thisValue*/, - const jsi::Value * /*arguments*/, + jsi::Runtime& /*runtime*/, + const jsi::Value& /*thisValue*/, + const jsi::Value* /*arguments*/, size_t /*count*/) -> jsi::Value { return {serialize(currentEventPriority_)}; }); @@ -812,9 +812,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value &, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value&, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -854,9 +854,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -895,9 +895,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -929,9 +929,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -965,9 +965,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -997,9 +997,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -1034,9 +1034,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -1079,9 +1079,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -1106,7 +1106,7 @@ jsi::Value UIManagerBinding::get( return jsi::Value::undefined(); } - auto layoutableShadowNode = traitCast( + auto layoutableShadowNode = traitCast( newestCloneOfShadowNode.get()); // This should never happen if (layoutableShadowNode == nullptr) { @@ -1114,7 +1114,7 @@ jsi::Value UIManagerBinding::get( } auto layoutableParentShadowNode = - traitCast( + traitCast( newestParentOfShadowNode.get()); // This should never happen if (layoutableParentShadowNode == nullptr) { @@ -1163,9 +1163,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [uiManager, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); @@ -1187,7 +1187,7 @@ jsi::Value UIManagerBinding::get( return jsi::Value::undefined(); } - auto layoutableShadowNode = traitCast( + auto layoutableShadowNode = traitCast( newestCloneOfShadowNode.get()); // This should never happen if (layoutableShadowNode == nullptr) { @@ -1217,9 +1217,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [this, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); bool isCapturing = pointerEventsProcessor_.hasPointerCapture( @@ -1236,9 +1236,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [this, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); pointerEventsProcessor_.setPointerCapture( @@ -1255,9 +1255,9 @@ jsi::Value UIManagerBinding::get( name, paramCount, [this, methodName, paramCount]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* arguments, size_t count) -> jsi::Value { validateArgumentCount(runtime, methodName, paramCount, count); pointerEventsProcessor_.releasePointerCapture( @@ -1270,7 +1270,7 @@ jsi::Value UIManagerBinding::get( return jsi::Value::undefined(); } -UIManager &UIManagerBinding::getUIManager() { +UIManager& UIManagerBinding::getUIManager() { return *uiManager_; } diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h index 7ebef9ffee1..b5c98b3a0f1 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerBinding.h @@ -27,33 +27,33 @@ class UIManagerBinding : public jsi::HostObject { * Thread synchronization must be enforced externally. */ static void createAndInstallIfNeeded( - jsi::Runtime &runtime, - const std::shared_ptr &uiManager); + jsi::Runtime& runtime, + const std::shared_ptr& uiManager); /* * Returns a pointer to UIManagerBinding previously installed into a runtime. * Thread synchronization must be enforced externally. */ - static std::shared_ptr getBinding(jsi::Runtime &runtime); + static std::shared_ptr getBinding(jsi::Runtime& runtime); UIManagerBinding(std::shared_ptr uiManager); ~UIManagerBinding() override; jsi::Value getInspectorDataForInstance( - jsi::Runtime &runtime, - const EventEmitter &eventEmitter) const; + jsi::Runtime& runtime, + const EventEmitter& eventEmitter) const; /* * Delivers raw event data to JavaScript. * Thread synchronization must be enforced externally. */ void dispatchEvent( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &payload) const; + const EventPayload& payload) const; /* * Invalidates the binding and underlying UIManager. @@ -67,9 +67,9 @@ class UIManagerBinding : public jsi::HostObject { /* * `jsi::HostObject` specific overloads. */ - jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override; + jsi::Value get(jsi::Runtime& runtime, const jsi::PropNameID& name) override; - UIManager &getUIManager(); + UIManager& getUIManager(); private: /* @@ -77,11 +77,11 @@ class UIManagerBinding : public jsi::HostObject { * UIManagerBinding::dispatchEvent. */ void dispatchEventToJS( - jsi::Runtime &runtime, - const EventTarget *eventTarget, - const std::string &type, + jsi::Runtime& runtime, + const EventTarget* eventTarget, + const std::string& type, ReactEventPriority priority, - const EventPayload &payload) const; + const EventPayload& payload) const; std::shared_ptr uiManager_; std::unique_ptr eventHandler_; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h index 30d17b76219..1667aaf00ee 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerCommitHook.h @@ -22,9 +22,9 @@ class UIManagerCommitHook { /* * Called right after the commit hook is registered or unregistered. */ - virtual void commitHookWasRegistered(const UIManager &uiManager) noexcept = 0; + virtual void commitHookWasRegistered(const UIManager& uiManager) noexcept = 0; virtual void commitHookWasUnregistered( - const UIManager &uiManager) noexcept = 0; + const UIManager& uiManager) noexcept = 0; /* * Called right before a `ShadowTree` commits a new tree. @@ -32,9 +32,9 @@ class UIManagerCommitHook { * from `ShadowTreeDelegate`. */ virtual RootShadowNode::Unshared shadowTreeWillCommit( - const ShadowTree &shadowTree, - const RootShadowNode::Shared &oldRootShadowNode, - const RootShadowNode::Unshared &newRootShadowNode) noexcept = 0; + const ShadowTree& shadowTree, + const RootShadowNode::Shared& oldRootShadowNode, + const RootShadowNode::Unshared& newRootShadowNode) noexcept = 0; virtual ~UIManagerCommitHook() noexcept = default; }; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h index ff39a7b5568..4b196f4101c 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerDelegate.h @@ -31,15 +31,15 @@ class UIManagerDelegate { * might use this to optimistically allocate a new native view * instances. */ - virtual void uiManagerDidCreateShadowNode(const ShadowNode &shadowNode) = 0; + virtual void uiManagerDidCreateShadowNode(const ShadowNode& shadowNode) = 0; /* * Called when UIManager wants to dispatch a command to the mounting layer. */ virtual void uiManagerDidDispatchCommand( - const ShadowNode::Shared &shadowNode, - const std::string &commandName, - const folly::dynamic &args) = 0; + const ShadowNode::Shared& shadowNode, + const std::string& commandName, + const folly::dynamic& args) = 0; /* * Called when UIManager wants to dispatch some accessibility event @@ -47,14 +47,14 @@ class UIManagerDelegate { * platforms will necessarily implement the same set of events. */ virtual void uiManagerDidSendAccessibilityEvent( - const ShadowNode::Shared &shadowNode, - const std::string &eventType) = 0; + const ShadowNode::Shared& shadowNode, + const std::string& eventType) = 0; /* * Set JS responder for a view. */ virtual void uiManagerDidSetIsJSResponder( - const ShadowNode::Shared &shadowNode, + const ShadowNode::Shared& shadowNode, bool isJSResponder, bool blockNativeResponder) = 0; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h index fd171aa96eb..f460a0fd642 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/UIManagerMountHook.h @@ -25,7 +25,7 @@ class UIManagerMountHook { * Called right after a `ShadowTree` is mounted in the host platform. */ virtual void shadowTreeDidMount( - const RootShadowNode::Shared &rootShadowNode, + const RootShadowNode::Shared& rootShadowNode, double mountTime) noexcept = 0; virtual ~UIManagerMountHook() noexcept = default; diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.cpp b/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.cpp index 1ccc92e1fc3..3aa55476294 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.cpp +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.cpp @@ -13,8 +13,8 @@ namespace facebook::react { static jsi::Value getModule( - jsi::Runtime &runtime, - const std::string &moduleName) { + jsi::Runtime& runtime, + const std::string& moduleName) { auto batchedBridge = runtime.global().getPropertyAsObject(runtime, "__fbBatchedBridge"); auto getCallableModule = @@ -30,7 +30,7 @@ static jsi::Value getModule( return moduleAsValue; } -static bool checkBatchedBridgeIsActive(jsi::Runtime &runtime) { +static bool checkBatchedBridgeIsActive(jsi::Runtime& runtime) { if (!runtime.global().hasProperty(runtime, "__fbBatchedBridge")) { LOG(ERROR) << "getPropertyAsObject: property '__fbBatchedBridge' is undefined, expected an Object"; @@ -39,7 +39,7 @@ static bool checkBatchedBridgeIsActive(jsi::Runtime &runtime) { return true; } -static bool checkGetCallableModuleIsActive(jsi::Runtime &runtime) { +static bool checkGetCallableModuleIsActive(jsi::Runtime& runtime) { if (!checkBatchedBridgeIsActive(runtime)) { return false; } @@ -54,9 +54,9 @@ static bool checkGetCallableModuleIsActive(jsi::Runtime &runtime) { } jsi::Value callMethodOfModule( - jsi::Runtime &runtime, - const std::string &moduleName, - const std::string &methodName, + jsi::Runtime& runtime, + const std::string& moduleName, + const std::string& methodName, std::initializer_list args) { if (checkGetCallableModuleIsActive(runtime)) { auto module = getModule(runtime, moduleName); diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.h b/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.h index 6f16eae8928..60afbfff9b0 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/bindingUtils.h @@ -12,9 +12,9 @@ namespace facebook::react { jsi::Value callMethodOfModule( - jsi::Runtime &runtime, - const std::string &moduleName, - const std::string &methodName, + jsi::Runtime& runtime, + const std::string& moduleName, + const std::string& methodName, std::initializer_list args); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h index 99814cca1d7..4ee6fbba850 100644 --- a/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/uimanager/primitives.h @@ -20,7 +20,7 @@ namespace facebook::react { using BackgroundExecutor = - std::function &&callback)>; + std::function&& callback)>; struct EventHandlerWrapper : public EventHandler { EventHandlerWrapper(jsi::Function eventHandler) @@ -54,8 +54,8 @@ struct ShadowNodeListWrapper : public jsi::HostObject, public jsi::NativeState { }; inline static ShadowNode::Shared shadowNodeFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { if (value.isNull()) { return nullptr; } @@ -70,7 +70,7 @@ inline static ShadowNode::Shared shadowNodeFromValue( } inline static jsi::Value valueFromShadowNode( - jsi::Runtime &runtime, + jsi::Runtime& runtime, ShadowNode::Shared shadowNode) { if (CoreFeatures::useNativeState) { jsi::Object obj(runtime); @@ -85,8 +85,8 @@ inline static jsi::Value valueFromShadowNode( } inline static ShadowNode::UnsharedListOfShared shadowNodeListFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { if (CoreFeatures::useNativeState) { return value.getObject(runtime) .getNativeState(runtime) @@ -99,7 +99,7 @@ inline static ShadowNode::UnsharedListOfShared shadowNodeListFromValue( } inline static jsi::Value valueFromShadowNodeList( - jsi::Runtime &runtime, + jsi::Runtime& runtime, ShadowNode::UnsharedListOfShared shadowNodeList) { auto wrapper = std::make_shared(std::move(shadowNodeList)); @@ -115,9 +115,9 @@ inline static jsi::Value valueFromShadowNodeList( } inline static ShadowNode::UnsharedListOfShared shadowNodeListFromWeakList( - const ShadowNode::UnsharedListOfWeak &weakShadowNodeList) { + const ShadowNode::UnsharedListOfWeak& weakShadowNodeList) { auto result = std::make_shared(); - for (const auto &weakShadowNode : *weakShadowNodeList) { + for (const auto& weakShadowNode : *weakShadowNodeList) { auto sharedShadowNode = weakShadowNode.lock(); if (!sharedShadowNode) { return nullptr; @@ -128,24 +128,24 @@ inline static ShadowNode::UnsharedListOfShared shadowNodeListFromWeakList( } inline static ShadowNode::UnsharedListOfWeak weakShadowNodeListFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { auto shadowNodeList = shadowNodeListFromValue(runtime, value); auto weakShadowNodeList = std::make_shared(); - for (const auto &shadowNode : *shadowNodeList) { + for (const auto& shadowNode : *shadowNodeList) { weakShadowNodeList->push_back(shadowNode); } return weakShadowNodeList; } -inline static Tag tagFromValue(const jsi::Value &value) { +inline static Tag tagFromValue(const jsi::Value& value) { return (Tag)value.getNumber(); } inline static InstanceHandle::Shared instanceHandleFromValue( - jsi::Runtime &runtime, - const jsi::Value &instanceHandleValue, - const jsi::Value &tagValue) { + jsi::Runtime& runtime, + const jsi::Value& instanceHandleValue, + const jsi::Value& tagValue) { react_native_assert(!instanceHandleValue.isNull()); if (instanceHandleValue.isNull()) { return nullptr; @@ -155,8 +155,8 @@ inline static InstanceHandle::Shared instanceHandleFromValue( } inline static SurfaceId surfaceIdFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { return (SurfaceId)value.getNumber(); } @@ -174,26 +174,26 @@ inline static int displayModeToInt(const DisplayMode value) { } inline static std::string stringFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { return value.getString(runtime).utf8(runtime); } inline static folly::dynamic commandArgsFromValue( - jsi::Runtime &runtime, - const jsi::Value &value) { + jsi::Runtime& runtime, + const jsi::Value& value) { return jsi::dynamicFromValue(runtime, value); } inline static jsi::Value getArrayOfInstanceHandlesFromShadowNodes( - const ShadowNode::ListOfShared &nodes, - jsi::Runtime &runtime) { + const ShadowNode::ListOfShared& nodes, + jsi::Runtime& runtime) { // JSI doesn't support adding elements to an array after creation, // so we need to accumulate the values in a vector and then create // the array when we know the size. std::vector nonNullInstanceHandles; nonNullInstanceHandles.reserve(nodes.size()); - for (const auto &shadowNode : nodes) { + for (const auto& shadowNode : nodes) { auto instanceHandle = (*shadowNode).getInstanceHandle(runtime); if (!instanceHandle.isNull()) { nonNullInstanceHandles.push_back(std::move(instanceHandle)); @@ -208,14 +208,14 @@ inline static jsi::Value getArrayOfInstanceHandlesFromShadowNodes( } inline static void getTextContentInShadowNode( - const ShadowNode &shadowNode, - std::string &result) { - auto rawTextShadowNode = traitCast(&shadowNode); + const ShadowNode& shadowNode, + std::string& result) { + auto rawTextShadowNode = traitCast(&shadowNode); if (rawTextShadowNode != nullptr) { result.append(rawTextShadowNode->getConcreteProps().text); } - for (const auto &childNode : shadowNode.getChildren()) { + for (const auto& childNode : shadowNode.getChildren()) { getTextContentInShadowNode(*childNode.get(), result); } } diff --git a/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.cpp b/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.cpp index 9b721f39563..f265e4590ca 100644 --- a/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.cpp +++ b/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.cpp @@ -15,11 +15,11 @@ BridgelessJSCallInvoker::BridgelessJSCallInvoker( RuntimeExecutor runtimeExecutor) : runtimeExecutor_(std::move(runtimeExecutor)) {} -void BridgelessJSCallInvoker::invokeAsync(std::function &&func) { - runtimeExecutor_([func = std::move(func)](jsi::Runtime &runtime) { func(); }); +void BridgelessJSCallInvoker::invokeAsync(std::function&& func) { + runtimeExecutor_([func = std::move(func)](jsi::Runtime& runtime) { func(); }); } -void BridgelessJSCallInvoker::invokeSync(std::function &&func) { +void BridgelessJSCallInvoker::invokeSync(std::function&& func) { // TODO: Implement this method. The TurboModule infra doesn't call invokeSync. throw std::runtime_error( "Synchronous native -> JS calls are currently not supported."); diff --git a/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.h b/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.h index a061b245a3d..612af02c483 100644 --- a/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.h +++ b/packages/react-native/ReactCommon/react/runtime/BridgelessJSCallInvoker.h @@ -18,8 +18,8 @@ namespace facebook::react { class BridgelessJSCallInvoker : public CallInvoker { public: explicit BridgelessJSCallInvoker(RuntimeExecutor runtimeExecutor); - void invokeAsync(std::function &&func) override; - void invokeSync(std::function &&func) override; + void invokeAsync(std::function&& func) override; + void invokeSync(std::function&& func) override; private: RuntimeExecutor runtimeExecutor_; diff --git a/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.cpp b/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.cpp index 5a924edddca..70bfc4a6a25 100644 --- a/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.cpp +++ b/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.cpp @@ -14,14 +14,14 @@ BridgelessNativeMethodCallInvoker::BridgelessNativeMethodCallInvoker( : messageQueueThread_(std::move(messageQueueThread)) {} void BridgelessNativeMethodCallInvoker::invokeAsync( - const std::string &methodName, - std::function &&func) { + const std::string& methodName, + std::function&& func) { messageQueueThread_->runOnQueue(std::move(func)); } void BridgelessNativeMethodCallInvoker::invokeSync( - const std::string &methodName, - std::function &&func) { + const std::string& methodName, + std::function&& func) { messageQueueThread_->runOnQueueSync(std::move(func)); } diff --git a/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.h b/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.h index 775ed0daabc..c26afe83953 100644 --- a/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.h +++ b/packages/react-native/ReactCommon/react/runtime/BridgelessNativeMethodCallInvoker.h @@ -16,9 +16,9 @@ class BridgelessNativeMethodCallInvoker : public NativeMethodCallInvoker { public: explicit BridgelessNativeMethodCallInvoker( std::shared_ptr messageQueueThread); - void invokeAsync(const std::string &methodName, std::function &&func) + void invokeAsync(const std::string& methodName, std::function&& func) override; - void invokeSync(const std::string &methodName, std::function &&func) + void invokeSync(const std::string& methodName, std::function&& func) override; private: diff --git a/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.cpp b/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.cpp index 8b4cb81cdb8..fbf6f3855ae 100644 --- a/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.cpp +++ b/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.cpp @@ -17,7 +17,7 @@ BufferedRuntimeExecutor::BufferedRuntimeExecutor( isBufferingEnabled_(true), lastIndex_(0) {} -void BufferedRuntimeExecutor::execute(Work &&callback) { +void BufferedRuntimeExecutor::execute(Work&& callback) { if (!isBufferingEnabled_) { // Fast path: Schedule directly to RuntimeExecutor, without locking runtimeExecutor_(std::move(callback)); @@ -50,7 +50,7 @@ void BufferedRuntimeExecutor::flush() { void BufferedRuntimeExecutor::unsafeFlush() { while (queue_.size() > 0) { - const BufferedWork &bufferedWork = queue_.top(); + const BufferedWork& bufferedWork = queue_.top(); Work work = std::move(bufferedWork.work_); runtimeExecutor_(std::move(work)); queue_.pop(); diff --git a/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.h b/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.h index e2102a7ed6a..99a6a5352cf 100644 --- a/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.h +++ b/packages/react-native/ReactCommon/react/runtime/BufferedRuntimeExecutor.h @@ -15,13 +15,13 @@ namespace facebook::react { class BufferedRuntimeExecutor { public: - using Work = std::function; + using Work = std::function; // A utility structure to track pending work in the order of when they arrive. struct BufferedWork { uint64_t index_; Work work_; - bool operator<(const BufferedWork &rhs) const { + bool operator<(const BufferedWork& rhs) const { // Higher index has lower priority, so this inverted comparison puts // the smaller index on top of the queue. return index_ > rhs.index_; @@ -30,7 +30,7 @@ class BufferedRuntimeExecutor { BufferedRuntimeExecutor(RuntimeExecutor runtimeExecutor); - void execute(Work &&callback); + void execute(Work&& callback); // Flush buffered JS calls and then diable JS buffering void flush(); diff --git a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp index 4ece09a6870..2dd5a28c365 100644 --- a/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp +++ b/packages/react-native/ReactCommon/react/runtime/ReactInstance.cpp @@ -25,7 +25,7 @@ namespace facebook::react { // Looping on \c drainMicrotasks until it completes or hits the retries bound. -static void performMicrotaskCheckpoint(jsi::Runtime &runtime) { +static void performMicrotaskCheckpoint(jsi::Runtime& runtime) { uint8_t retries = 0; // A heuristic number to guard inifinite or absurd numbers of retries. constexpr unsigned int kRetriesBound = 255; @@ -37,7 +37,7 @@ static void performMicrotaskCheckpoint(jsi::Runtime &runtime) { if (runtime.drainMicrotasks()) { break; } - } catch (jsi::JSError &error) { + } catch (jsi::JSError& error) { handleJSError(runtime, error, true); } retries++; @@ -66,8 +66,8 @@ ReactInstance::ReactInstance( jsMessageQueueThread_), weakHasFatalJsError = std::weak_ptr(hasFatalJsError_)]( - std::function - &&callback) { + std::function&& + callback) { if (std::shared_ptr sharedHasFatalJsError = weakHasFatalJsError.lock()) { if (*sharedHasFatalJsError) { @@ -92,7 +92,7 @@ ReactInstance::ReactInstance( strongTimerManager->callReactNativeMicrotasks(*strongRuntime); } performMicrotaskCheckpoint(*strongRuntime); - } catch (jsi::JSError &originalError) { + } catch (jsi::JSError& originalError) { handleJSError(*strongRuntime, originalError, true); } } @@ -105,7 +105,7 @@ ReactInstance::ReactInstance( auto pipedRuntimeExecutor = [runtimeScheduler = runtimeScheduler_.get()]( - std::function &&callback) { + std::function&& callback) { runtimeScheduler->scheduleWork(std::move(callback)); }; @@ -115,7 +115,7 @@ ReactInstance::ReactInstance( RuntimeExecutor ReactInstance::getUnbufferedRuntimeExecutor() noexcept { return [runtimeScheduler = runtimeScheduler_.get()]( - std::function &&callback) { + std::function&& callback) { runtimeScheduler->scheduleWork(std::move(callback)); }; } @@ -127,7 +127,7 @@ RuntimeExecutor ReactInstance::getUnbufferedRuntimeExecutor() noexcept { RuntimeExecutor ReactInstance::getBufferedRuntimeExecutor() noexcept { return [weakBufferedRuntimeExecutor_ = std::weak_ptr(bufferedRuntimeExecutor_)]( - std::function &&callback) { + std::function&& callback) { if (auto strongBufferedRuntimeExecutor_ = weakBufferedRuntimeExecutor_.lock()) { strongBufferedRuntimeExecutor_->execute(std::move(callback)); @@ -152,9 +152,9 @@ ReactInstance::getRuntimeScheduler() noexcept { * }) */ static void defineReadOnlyGlobal( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::string propName, - jsi::Value &&value) { + jsi::Value&& value) { if (runtime.global().hasProperty(runtime, propName.c_str())) { throw jsi::JSError( runtime, @@ -181,7 +181,7 @@ namespace { // Copied from JSIExecutor.cpp // basename_r isn't in all iOS SDKs, so use this simple version instead. -std::string simpleBasename(const std::string &path) { +std::string simpleBasename(const std::string& path) { size_t pos = path.rfind("/"); return (pos != std::string::npos) ? path.substr(pos) : path; } @@ -197,7 +197,7 @@ std::string simpleBasename(const std::string &path) { */ void ReactInstance::loadScript( std::unique_ptr script, - const std::string &sourceURL) { + const std::string& sourceURL) { auto buffer = std::make_shared(std::move(script)); std::string scriptName = simpleBasename(sourceURL); @@ -207,7 +207,7 @@ void ReactInstance::loadScript( sourceURL, buffer = std::move(buffer), weakBufferedRuntimeExecuter = std::weak_ptr( - bufferedRuntimeExecutor_)](jsi::Runtime &runtime) { + bufferedRuntimeExecutor_)](jsi::Runtime& runtime) { try { SystraceSection s("ReactInstance::loadScript"); bool hasLogger(ReactMarker::logTaggedMarkerBridgelessImpl); @@ -228,7 +228,7 @@ void ReactInstance::loadScript( weakBufferedRuntimeExecuter.lock()) { strongBufferedRuntimeExecuter->flush(); } - } catch (jsi::JSError &error) { + } catch (jsi::JSError& error) { // Handle uncaught JS errors during loading JS bundle *hasFatalJsError_ = true; this->jsErrorHandler_.handleJsError(error, true); @@ -241,10 +241,10 @@ void ReactInstance::loadScript( * `registerCallableModule`. Used to invoke a JS function from platform code. */ void ReactInstance::callFunctionOnModule( - const std::string &moduleName, - const std::string &methodName, - const folly::dynamic &args) { - bufferedRuntimeExecutor_->execute([=](jsi::Runtime &runtime) { + const std::string& moduleName, + const std::string& methodName, + const folly::dynamic& args) { + bufferedRuntimeExecutor_->execute([=](jsi::Runtime& runtime) { SystraceSection s( "ReactInstance::callFunctionOnModule", "moduleName", @@ -255,7 +255,7 @@ void ReactInstance::callFunctionOnModule( std::ostringstream knownModules; int i = 0; for (auto it = modules_.begin(); it != modules_.end(); it++, i++) { - const char *space = (i > 0 ? ", " : " "); + const char* space = (i > 0 ? ", " : " "); knownModules << space << it->first; } throw jsi::JSError( @@ -277,20 +277,20 @@ void ReactInstance::callFunctionOnModule( } std::vector jsArgs; - for (auto &arg : args) { + for (auto& arg : args) { jsArgs.push_back(jsi::valueFromDynamic(runtime, arg)); } method.asObject(runtime).asFunction(runtime).callWithThis( - runtime, module, (const jsi::Value *)jsArgs.data(), jsArgs.size()); + runtime, module, (const jsi::Value*)jsArgs.data(), jsArgs.size()); }); } void ReactInstance::registerSegment( uint32_t segmentId, - const std::string &segmentPath) { + const std::string& segmentPath) { LOG(WARNING) << "Starting to run ReactInstance::registerSegment with segment " << segmentId; - runtimeScheduler_->scheduleWork([=](jsi::Runtime &runtime) { + runtimeScheduler_->scheduleWork([=](jsi::Runtime& runtime) { SystraceSection s("ReactInstance::registerSegment"); const auto tag = folly::to(segmentId); auto script = JSBigFileString::fromPath(segmentPath); @@ -320,7 +320,7 @@ void ReactInstance::registerSegment( namespace { void defineReactInstanceFlags( - jsi::Runtime &runtime, + jsi::Runtime& runtime, ReactInstance::JSRuntimeFlags options) noexcept { defineReadOnlyGlobal(runtime, "RN$Bridgeless", jsi::Value(true)); @@ -342,7 +342,7 @@ void ReactInstance::initializeRuntime( JSRuntimeFlags options, BindingsInstallFunc bindingsInstallFunc) noexcept { runtimeScheduler_->scheduleWork([this, options, bindingsInstallFunc]( - jsi::Runtime &runtime) { + jsi::Runtime& runtime) { SystraceSection s("ReactInstance::initializeRuntime"); bindNativePerformanceNow(runtime); @@ -360,9 +360,9 @@ void ReactInstance::initializeRuntime( jsi::PropNameID::forAscii(runtime, "registerCallableModule"), 2, [this]( - jsi::Runtime &runtime, - const jsi::Value & /*unused*/, - const jsi::Value *args, + jsi::Runtime& runtime, + const jsi::Value& /*unused*/, + const jsi::Value* args, size_t count) { if (count != 2) { throw jsi::JSError( @@ -404,7 +404,7 @@ void ReactInstance::handleMemoryPressureJs(int pressureLevel) { TRIM_MEMORY_RUNNING_MODERATE = 5, TRIM_MEMORY_UI_HIDDEN = 20, }; - const char *levelName; + const char* levelName; switch (pressureLevel) { case TRIM_MEMORY_BACKGROUND: levelName = "TRIM_MEMORY_BACKGROUND"; @@ -449,7 +449,7 @@ void ReactInstance::handleMemoryPressureJs(int pressureLevel) { // collections. LOG(INFO) << "Memory warning (pressure level: " << levelName << ") received by JS VM, running a GC"; - runtimeScheduler_->scheduleWork([=](jsi::Runtime &runtime) { + runtimeScheduler_->scheduleWork([=](jsi::Runtime& runtime) { SystraceSection s("ReactInstance::handleMemoryPressure"); runtime.instrumentation().collectGarbage(levelName); }); diff --git a/packages/react-native/ReactCommon/react/runtime/ReactInstance.h b/packages/react-native/ReactCommon/react/runtime/ReactInstance.h index 35de40cc9c0..f3126c302f3 100644 --- a/packages/react-native/ReactCommon/react/runtime/ReactInstance.h +++ b/packages/react-native/ReactCommon/react/runtime/ReactInstance.h @@ -26,7 +26,7 @@ struct CallableModule { class ReactInstance final { public: - using BindingsInstallFunc = std::function; + using BindingsInstallFunc = std::function; ReactInstance( std::unique_ptr runtime, @@ -51,14 +51,14 @@ class ReactInstance final { void loadScript( std::unique_ptr script, - const std::string &sourceURL); + const std::string& sourceURL); - void registerSegment(uint32_t segmentId, const std::string &segmentPath); + void registerSegment(uint32_t segmentId, const std::string& segmentPath); void callFunctionOnModule( - const std::string &moduleName, - const std::string &methodName, - const folly::dynamic &args); + const std::string& moduleName, + const std::string& methodName, + const folly::dynamic& args); void handleMemoryPressureJs(int pressureLevel); diff --git a/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp b/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp index b2a7e7bbf4e..3eca065fbb8 100644 --- a/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp +++ b/packages/react-native/ReactCommon/react/runtime/TimerManager.cpp @@ -22,8 +22,8 @@ void TimerManager::setRuntimeExecutor( } std::shared_ptr TimerManager::createReactNativeMicrotask( - jsi::Function &&callback, - std::vector &&args) { + jsi::Function&& callback, + std::vector&& args) { auto sharedCallback = std::make_shared( std::move(callback), std::move(args), /* repeat */ false); @@ -35,7 +35,7 @@ std::shared_ptr TimerManager::createReactNativeMicrotask( return std::make_shared(timerID); } -void TimerManager::callReactNativeMicrotasks(jsi::Runtime &runtime) { +void TimerManager::callReactNativeMicrotasks(jsi::Runtime& runtime) { std::vector reactNativeMicrotasksQueue; while (!reactNativeMicrotasksQueue_.empty()) { reactNativeMicrotasksQueue.clear(); @@ -52,8 +52,8 @@ void TimerManager::callReactNativeMicrotasks(jsi::Runtime &runtime) { } std::shared_ptr TimerManager::createTimer( - jsi::Function &&callback, - std::vector &&args, + jsi::Function&& callback, + std::vector&& args, double delay) { auto sharedCallback = std::make_shared( std::move(callback), std::move(args), false); @@ -68,8 +68,8 @@ std::shared_ptr TimerManager::createTimer( } std::shared_ptr TimerManager::createRecurringTimer( - jsi::Function &&callback, - std::vector &&args, + jsi::Function&& callback, + std::vector&& args, double delay) { auto sharedCallback = std::make_shared( std::move(callback), std::move(args), true); @@ -84,7 +84,7 @@ std::shared_ptr TimerManager::createRecurringTimer( } void TimerManager::deleteReactNativeMicrotask( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr timerHandle) { if (timerHandle == nullptr) { throw jsi::JSError( @@ -106,7 +106,7 @@ void TimerManager::deleteReactNativeMicrotask( } void TimerManager::deleteTimer( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr timerHandle) { if (timerHandle == nullptr) { throw jsi::JSError(runtime, "clearTimeout called with an invalid handle"); @@ -119,7 +119,7 @@ void TimerManager::deleteTimer( } void TimerManager::deleteRecurringTimer( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr timerHandle) { if (timerHandle == nullptr) { throw jsi::JSError(runtime, "clearInterval called with an invalid handle"); @@ -132,7 +132,7 @@ void TimerManager::deleteRecurringTimer( } void TimerManager::callTimer(uint32_t timerID) { - runtimeExecutor_([this, timerID](jsi::Runtime &runtime) { + runtimeExecutor_([this, timerID](jsi::Runtime& runtime) { SystraceSection s("TimerManager::callTimer"); if (timers_.count(timerID) > 0) { timers_[timerID]->invoke(runtime); @@ -145,7 +145,7 @@ void TimerManager::callTimer(uint32_t timerID) { }); } -void TimerManager::attachGlobals(jsi::Runtime &runtime) { +void TimerManager::attachGlobals(jsi::Runtime& runtime) { // Install host functions for timers. // TODO (T45786383): Add missing timer functions from JSTimers // TODL (T96212789): Skip immediate APIs when JSVM microtask queue is used. @@ -157,9 +157,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "setImmediate"), 2, // Function, ...args [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0) { throw jsi::JSError( @@ -192,9 +192,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "clearImmediate"), 1, // handle [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0 || !args[0].isObject() || !args[0].asObject(rt).isHostObject(rt)) { @@ -214,9 +214,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "setTimeout"), 3, // Function, delay, ...args [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0) { throw jsi::JSError( @@ -257,9 +257,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "clearTimeout"), 1, // timerID [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0 || !args[0].isObject() || !args[0].asObject(rt).isHostObject(rt)) { @@ -279,9 +279,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "setInterval"), 3, // Function, delay, ...args [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count < 2) { throw jsi::JSError( @@ -320,9 +320,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "clearInterval"), 1, // timerID [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0 || !args[0].isObject() || !args[0].asObject(rt).isHostObject(rt)) { @@ -342,9 +342,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "requestAnimationFrame"), 1, // callback [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0) { throw jsi::JSError( @@ -365,9 +365,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { 0, [callbackContainer = std::make_shared( args[0].getObject(rt).getFunction(rt))]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { auto performance = rt.global().getPropertyAsObject(rt, "performance"); @@ -396,9 +396,9 @@ void TimerManager::attachGlobals(jsi::Runtime &runtime) { jsi::PropNameID::forAscii(runtime, "cancelAnimationFrame"), 1, // timerID [this]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, + jsi::Runtime& rt, + const jsi::Value& thisVal, + const jsi::Value* args, size_t count) { if (count == 0 || !args[0].isObject() || !args[0].asObject(rt).isHostObject(rt)) { diff --git a/packages/react-native/ReactCommon/react/runtime/TimerManager.h b/packages/react-native/ReactCommon/react/runtime/TimerManager.h index 72907e44353..6735e29c55a 100644 --- a/packages/react-native/ReactCommon/react/runtime/TimerManager.h +++ b/packages/react-native/ReactCommon/react/runtime/TimerManager.h @@ -39,7 +39,7 @@ class TimerHandle : public jsi::HostObject { * Wraps a jsi::Function to make it copyable so we can pass it into a lambda. */ struct TimerCallback { - TimerCallback(TimerCallback &&) = default; + TimerCallback(TimerCallback&&) = default; TimerCallback( jsi::Function callback, @@ -49,7 +49,7 @@ struct TimerCallback { args_(std::move(args)), repeat(repeat) {} - void invoke(jsi::Runtime &runtime) { + void invoke(jsi::Runtime& runtime) { callback_.call(runtime, args_.data(), args_.size()); } @@ -65,35 +65,35 @@ class TimerManager { void setRuntimeExecutor(RuntimeExecutor runtimeExecutor) noexcept; - void callReactNativeMicrotasks(jsi::Runtime &runtime); + void callReactNativeMicrotasks(jsi::Runtime& runtime); void callTimer(uint32_t); - void attachGlobals(jsi::Runtime &runtime); + void attachGlobals(jsi::Runtime& runtime); private: std::shared_ptr createReactNativeMicrotask( - jsi::Function &&callback, - std::vector &&args); + jsi::Function&& callback, + std::vector&& args); void deleteReactNativeMicrotask( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr handle); std::shared_ptr createTimer( - jsi::Function &&callback, - std::vector &&args, + jsi::Function&& callback, + std::vector&& args, double delay); - void deleteTimer(jsi::Runtime &runtime, std::shared_ptr handle); + void deleteTimer(jsi::Runtime& runtime, std::shared_ptr handle); std::shared_ptr createRecurringTimer( - jsi::Function &&callback, - std::vector &&args, + jsi::Function&& callback, + std::vector&& args, double delay); void deleteRecurringTimer( - jsi::Runtime &runtime, + jsi::Runtime& runtime, std::shared_ptr handle); RuntimeExecutor runtimeExecutor_; diff --git a/packages/react-native/ReactCommon/react/runtime/hermes/HermesInstance.cpp b/packages/react-native/ReactCommon/react/runtime/hermes/HermesInstance.cpp index 4541628fb61..0538d5e0434 100644 --- a/packages/react-native/ReactCommon/react/runtime/hermes/HermesInstance.cpp +++ b/packages/react-native/ReactCommon/react/runtime/hermes/HermesInstance.cpp @@ -41,7 +41,7 @@ class HermesInstanceRuntimeAdapter : public inspector_modern::RuntimeAdapter { : hermesRuntime_(hermesRuntime) {} virtual ~HermesInstanceRuntimeAdapter() = default; - HermesRuntime &getRuntime() override { + HermesRuntime& getRuntime() override { return *hermesRuntime_; } diff --git a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.cpp b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.cpp index 9253a9956ee..692b5b7e74b 100644 --- a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.cpp +++ b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.cpp @@ -9,12 +9,12 @@ namespace facebook::react::LegacyUIManagerConstantsProviderBinding { -void install(jsi::Runtime &runtime, ProviderType &&provider) { +void install(jsi::Runtime& runtime, ProviderType&& provider) { auto name = "RN$LegacyInterop_UIManager_getConstants"; auto hostFunction = [provider = std::move(provider)]( - jsi::Runtime &runtime, - const jsi::Value & /*thisValue*/, - const jsi::Value * /*arguments*/, + jsi::Runtime& runtime, + const jsi::Value& /*thisValue*/, + const jsi::Value* /*arguments*/, size_t count) -> jsi::Value { if (count != 0) { throw new jsi::JSError(runtime, "0 arguments expected."); diff --git a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.h b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.h index b32cc7c8f23..097de4e1994 100644 --- a/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.h +++ b/packages/react-native/ReactCommon/react/runtime/nativeviewconfig/LegacyUIManagerConstantsProviderBinding.h @@ -18,5 +18,5 @@ using ProviderType = std::function; * runtime. It is supposed to be used as a substitute to UIManager.getConstants * in bridgeless mode. */ -void install(jsi::Runtime &runtime, ProviderType &&provider); +void install(jsi::Runtime& runtime, ProviderType&& provider); } // namespace facebook::react::LegacyUIManagerConstantsProviderBinding diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTLegacyUIManagerConstantsProvider.h b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTLegacyUIManagerConstantsProvider.h index 9359df209c0..041752ba5e9 100644 --- a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTLegacyUIManagerConstantsProvider.h +++ b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTLegacyUIManagerConstantsProvider.h @@ -15,5 +15,5 @@ namespace facebook::react { * to implement UIManager.getConstants in bridgeless mode. The constants object * contains view configs for every legacy native component. */ -void installLegacyUIManagerConstantsProviderBinding(jsi::Runtime &runtime); +void installLegacyUIManagerConstantsProviderBinding(jsi::Runtime& runtime); } // namespace facebook::react diff --git a/packages/react-native/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp b/packages/react-native/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp index b80d573e872..0d8ea7f3285 100644 --- a/packages/react-native/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp +++ b/packages/react-native/ReactCommon/react/runtime/tests/cxx/ReactInstanceTest.cpp @@ -31,12 +31,12 @@ class MockTimerRegistry : public PlatformTimerRegistry { class MockMessageQueueThread : public MessageQueueThread { public: - void runOnQueue(std::function &&func) { + void runOnQueue(std::function&& func) { callbackQueue_.push(func); } // Unused - void runOnQueueSync(std::function &&) {} + void runOnQueueSync(std::function&&) {} // Unused void quitSynchronous() {} @@ -52,7 +52,7 @@ class MockMessageQueueThread : public MessageQueueThread { void guardedTick() { try { tick(); - } catch (const std::exception &e) { + } catch (const std::exception& e) { // For easier debugging FAIL() << e.what(); } @@ -68,7 +68,7 @@ class MockMessageQueueThread : public MessageQueueThread { class ErrorUtils : public jsi::HostObject { public: - jsi::Value get(jsi::Runtime &rt, const jsi::PropNameID &name) override { + jsi::Value get(jsi::Runtime& rt, const jsi::PropNameID& name) override { auto methodName = name.utf8(rt); if (methodName == "reportFatalError") { @@ -77,9 +77,9 @@ class ErrorUtils : public jsi::HostObject { name, 1, [this]( - jsi::Runtime &runtime, - const jsi::Value &thisValue, - const jsi::Value *arguments, + jsi::Runtime& runtime, + const jsi::Value& thisValue, + const jsi::Value* arguments, size_t count) { if (count >= 1) { auto value = jsi::Value(runtime, std::move(arguments[0])); @@ -93,7 +93,7 @@ class ErrorUtils : public jsi::HostObject { } } - void reportFatalError(jsi::JSError &&error) { + void reportFatalError(jsi::JSError&& error) { errors_.push_back(std::move(error)); } @@ -143,7 +143,7 @@ class ReactInstanceTest : public ::testing::Test { void initializeRuntimeWithScript( ReactInstance::JSRuntimeFlags jsRuntimeFlags, std::string script) { - instance_->initializeRuntime(jsRuntimeFlags, [](jsi::Runtime &runtime) {}); + instance_->initializeRuntime(jsRuntimeFlags, [](jsi::Runtime& runtime) {}); step(); // Run the main bundle, so that native -> JS calls no longer get buffered. @@ -152,7 +152,7 @@ class ReactInstanceTest : public ::testing::Test { void initializeRuntimeWithScript(std::string script) { instance_->initializeRuntime( - {.isProfiling = false}, [](jsi::Runtime &runtime) {}); + {.isProfiling = false}, [](jsi::Runtime& runtime) {}); step(); // Run the main bundle, so that native -> JS calls no longer get buffered. @@ -162,7 +162,7 @@ class ReactInstanceTest : public ::testing::Test { jsi::Value eval(std::string js) { RuntimeExecutor runtimeExecutor = instance_->getUnbufferedRuntimeExecutor(); jsi::Value ret = jsi::Value::undefined(); - runtimeExecutor([js, &ret](jsi::Runtime &runtime) { + runtimeExecutor([js, &ret](jsi::Runtime& runtime) { ret = runtime.evaluateJavaScript( std::make_unique(js), ""); }); @@ -203,11 +203,11 @@ class ReactInstanceTest : public ::testing::Test { messageQueueThread_->guardedTick(); } - jsi::Runtime *runtime_; + jsi::Runtime* runtime_; std::shared_ptr messageQueueThread_; std::unique_ptr instance_; std::shared_ptr timerManager_; - MockTimerRegistry *mockRegistry_; + MockTimerRegistry* mockRegistry_; std::shared_ptr errorHandler_; }; diff --git a/packages/react-native/ReactCommon/react/test_utils/Entropy.h b/packages/react-native/ReactCommon/react/test_utils/Entropy.h index 32507157ae8..a858bada731 100644 --- a/packages/react-native/ReactCommon/react/test_utils/Entropy.h +++ b/packages/react-native/ReactCommon/react/test_utils/Entropy.h @@ -68,17 +68,17 @@ class Entropy final { } void generateRandomValue( - Generator &generator, - bool &result, + Generator& generator, + bool& result, double ratio = 0.5) const { result = generator() % 10000 < 10000 * ratio; } - void generateRandomValue(Generator &generator, int &result) const { + void generateRandomValue(Generator& generator, int& result) const { result = generator(); } - void generateRandomValue(Generator &generator, int &result, int min, int max) + void generateRandomValue(Generator& generator, int& result, int min, int max) const { std::uniform_int_distribution distribution(min, max); result = distribution(generator); @@ -105,7 +105,7 @@ class Entropy final { auto spreadResult = std::vector>(deviationLimit * 2); std::fill(spreadResult.begin(), spreadResult.end(), std::vector{}); - for (const auto &item : items) { + for (const auto& item : items) { auto position = int(distribution(generator_) + deviationLimit); position = std::max(0, std::min(position, deviationLimit * 2)); @@ -115,7 +115,7 @@ class Entropy final { } auto result = std::vector>{}; - for (const auto &chunk : spreadResult) { + for (const auto& chunk : spreadResult) { if (chunk.size() == 0) { continue; } diff --git a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h index c358b382776..ba334fe4902 100644 --- a/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h +++ b/packages/react-native/ReactCommon/react/test_utils/shadowTreeGeneration.h @@ -39,11 +39,11 @@ class ShadowTreeEdge final { }; static bool traverseShadowTree( - const ShadowNode::Shared &parentShadowNode, - const std::function - &callback) { + const ShadowNode::Shared& parentShadowNode, + const std::function& + callback) { auto index = int{0}; - for (const auto &childNode : parentShadowNode->getChildren()) { + for (const auto& childNode : parentShadowNode->getChildren()) { auto stop = bool{false}; callback(ShadowTreeEdge{childNode, parentShadowNode, index}, stop); @@ -61,23 +61,23 @@ static bool traverseShadowTree( return false; } -static int countShadowNodes(const ShadowNode::Shared &rootShadowNode) { +static int countShadowNodes(const ShadowNode::Shared& rootShadowNode) { auto counter = int{0}; traverseShadowTree( rootShadowNode, - [&](const ShadowTreeEdge &edge, bool &stop) { counter++; }); + [&](const ShadowTreeEdge& edge, bool& stop) { counter++; }); return counter; } static ShadowTreeEdge findShadowNodeWithIndex( - const ShadowNode::Shared &rootNode, + const ShadowNode::Shared& rootNode, int index) { auto counter = int{0}; auto result = ShadowTreeEdge{}; - traverseShadowTree(rootNode, [&](const ShadowTreeEdge &edge, bool &stop) { + traverseShadowTree(rootNode, [&](const ShadowTreeEdge& edge, bool& stop) { if (index == counter) { result = edge; } @@ -89,8 +89,8 @@ static ShadowTreeEdge findShadowNodeWithIndex( } static ShadowTreeEdge findRandomShadowNode( - const Entropy &entropy, - const ShadowNode::Shared &rootShadowNode) { + const Entropy& entropy, + const ShadowNode::Shared& rootShadowNode) { auto count = countShadowNodes(rootShadowNode); return findShadowNodeWithIndex( rootShadowNode, @@ -98,18 +98,18 @@ static ShadowTreeEdge findRandomShadowNode( } static ShadowNode::ListOfShared cloneSharedShadowNodeList( - const ShadowNode::ListOfShared &list) { + const ShadowNode::ListOfShared& list) { auto result = ShadowNode::ListOfShared{}; result.reserve(list.size()); - for (const auto &shadowNode : list) { + for (const auto& shadowNode : list) { result.push_back(shadowNode->clone({})); } return result; } static inline ShadowNode::Unshared messWithChildren( - const Entropy &entropy, - const ShadowNode &shadowNode) { + const Entropy& entropy, + const ShadowNode& shadowNode) { auto children = shadowNode.getChildren(); children = cloneSharedShadowNodeList(children); entropy.shuffle(children); @@ -119,8 +119,8 @@ static inline ShadowNode::Unshared messWithChildren( } static inline ShadowNode::Unshared messWithLayoutableOnlyFlag( - const Entropy &entropy, - const ShadowNode &shadowNode) { + const Entropy& entropy, + const ShadowNode& shadowNode) { auto oldProps = shadowNode.getProps(); ContextContainer contextContainer{}; @@ -129,8 +129,8 @@ static inline ShadowNode::Unshared messWithLayoutableOnlyFlag( auto newProps = shadowNode.getComponentDescriptor().cloneProps( parserContext, oldProps, RawProps(folly::dynamic::object())); - auto &viewProps = - const_cast(static_cast(*newProps)); + auto& viewProps = + const_cast(static_cast(*newProps)); if (entropy.random(0.1)) { viewProps.nativeId = entropy.random() ? "42" : ""; @@ -176,8 +176,8 @@ static inline ShadowNode::Unshared messWithLayoutableOnlyFlag( // Similar to `messWithLayoutableOnlyFlag` but has a 50/50 chance of flattening // (or unflattening) a node's children. static inline ShadowNode::Unshared messWithNodeFlattenednessFlags( - const Entropy &entropy, - const ShadowNode &shadowNode) { + const Entropy& entropy, + const ShadowNode& shadowNode) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; @@ -185,8 +185,8 @@ static inline ShadowNode::Unshared messWithNodeFlattenednessFlags( auto newProps = shadowNode.getComponentDescriptor().cloneProps( parserContext, oldProps, RawProps(folly::dynamic::object())); - auto &viewProps = - const_cast(static_cast(*newProps)); + auto& viewProps = + const_cast(static_cast(*newProps)); if (entropy.random(0.5)) { viewProps.nativeId = ""; @@ -217,8 +217,8 @@ static inline ShadowNode::Unshared messWithNodeFlattenednessFlags( } static inline ShadowNode::Unshared messWithYogaStyles( - const Entropy &entropy, - const ShadowNode &shadowNode) { + const Entropy& entropy, + const ShadowNode& shadowNode) { folly::dynamic dynamic = folly::dynamic::object(); if (entropy.random()) { @@ -238,7 +238,7 @@ static inline ShadowNode::Unshared messWithYogaStyles( // failures if the size of properties also changes. EXPECT_EQ(properties.size(), 20); - for (const auto &property : properties) { + for (const auto& property : properties) { if (entropy.random(0.1)) { dynamic[property] = entropy.random(0, 1024); } @@ -257,31 +257,31 @@ static inline ShadowNode::Unshared messWithYogaStyles( } using ShadowNodeAlteration = std::function< - ShadowNode::Unshared(const Entropy &entropy, const ShadowNode &shadowNode)>; + ShadowNode::Unshared(const Entropy& entropy, const ShadowNode& shadowNode)>; static inline void alterShadowTree( - const Entropy &entropy, - RootShadowNode::Shared &rootShadowNode, + const Entropy& entropy, + RootShadowNode::Shared& rootShadowNode, ShadowNodeAlteration alteration) { auto edge = findRandomShadowNode(entropy, rootShadowNode); rootShadowNode = std::static_pointer_cast(rootShadowNode->cloneTree( - edge.shadowNode->getFamily(), [&](const ShadowNode &oldShadowNode) { + edge.shadowNode->getFamily(), [&](const ShadowNode& oldShadowNode) { return alteration(entropy, oldShadowNode); })); } static inline void alterShadowTree( - const Entropy &entropy, - RootShadowNode::Shared &rootShadowNode, + const Entropy& entropy, + RootShadowNode::Shared& rootShadowNode, std::vector alterations) { auto i = entropy.random(0, alterations.size() - 1); alterShadowTree(entropy, rootShadowNode, alterations[i]); } static SharedViewProps generateDefaultProps( - const ComponentDescriptor &componentDescriptor) { + const ComponentDescriptor& componentDescriptor) { ContextContainer contextContainer{}; PropsParserContext parserContext{-1, contextContainer}; @@ -290,8 +290,8 @@ static SharedViewProps generateDefaultProps( } static inline ShadowNode::Shared generateShadowNodeTree( - const Entropy &entropy, - const ComponentDescriptor &componentDescriptor, + const Entropy& entropy, + const ComponentDescriptor& componentDescriptor, int size, int deviation = 3) { if (size <= 1) { @@ -306,7 +306,7 @@ static inline ShadowNode::Shared generateShadowNodeTree( auto chunks = entropy.distribute(items, deviation); auto children = ShadowNode::ListOfShared{}; - for (const auto &chunk : chunks) { + for (const auto& chunk : chunks) { children.push_back( generateShadowNodeTree(entropy, componentDescriptor, chunk.size())); } diff --git a/packages/react-native/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h b/packages/react-native/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h index 6744e3e625f..8cf310e1cf0 100644 --- a/packages/react-native/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h +++ b/packages/react-native/ReactCommon/react/utils/CalledOnceMovableOnlyFunction.h @@ -25,7 +25,7 @@ class CalledOnceMovableOnlyFunction { bool wasMovedFrom_; public: - explicit CalledOnceMovableOnlyFunction(std::function &&function) + explicit CalledOnceMovableOnlyFunction(std::function&& function) : function_(std::move(function)) { wasCalled_ = false; wasMovedFrom_ = false; @@ -40,24 +40,24 @@ class CalledOnceMovableOnlyFunction { /* * Not copyable. */ - CalledOnceMovableOnlyFunction(const CalledOnceMovableOnlyFunction &other) = + CalledOnceMovableOnlyFunction(const CalledOnceMovableOnlyFunction& other) = delete; - CalledOnceMovableOnlyFunction &operator=( - const CalledOnceMovableOnlyFunction &other) = delete; + CalledOnceMovableOnlyFunction& operator=( + const CalledOnceMovableOnlyFunction& other) = delete; /* * Movable. */ CalledOnceMovableOnlyFunction( - CalledOnceMovableOnlyFunction &&other) noexcept { + CalledOnceMovableOnlyFunction&& other) noexcept { wasCalled_ = false; wasMovedFrom_ = false; other.wasMovedFrom_ = true; function_ = std::move(other.function_); }; - CalledOnceMovableOnlyFunction &operator=( - CalledOnceMovableOnlyFunction &&other) noexcept { + CalledOnceMovableOnlyFunction& operator=( + CalledOnceMovableOnlyFunction&& other) noexcept { react_native_assert( (wasCalled_ || wasMovedFrom_) && "`CalledOnceMovableOnlyFunction` is re-assigned before being called."); diff --git a/packages/react-native/ReactCommon/react/utils/ContextContainer.h b/packages/react-native/ReactCommon/react/utils/ContextContainer.h index b56bb2a6622..1c73ac0e699 100644 --- a/packages/react-native/ReactCommon/react/utils/ContextContainer.h +++ b/packages/react-native/ReactCommon/react/utils/ContextContainer.h @@ -40,7 +40,7 @@ class ContextContainer final { *`ReactNativeConfig`. */ template - void insert(const std::string &key, T const &instance) const { + void insert(const std::string& key, T const& instance) const { std::unique_lock lock(mutex_); instances_.insert({key, std::make_shared(instance)}); @@ -50,7 +50,7 @@ class ContextContainer final { * Removes an instance stored for a given `key`. * Does nothing if the instance was not found. */ - void erase(const std::string &key) const { + void erase(const std::string& key) const { std::unique_lock lock(mutex_); instances_.erase(key); @@ -61,10 +61,10 @@ class ContextContainer final { * Values with keys that already exist in the container will be replaced with * values from the given container. */ - void update(const ContextContainer &contextContainer) const { + void update(const ContextContainer& contextContainer) const { std::unique_lock lock(mutex_); - for (const auto &pair : contextContainer.instances_) { + for (const auto& pair : contextContainer.instances_) { instances_.erase(pair.first); instances_.insert(pair); } @@ -76,13 +76,13 @@ class ContextContainer final { * Throws an exception if the instance could not be found. */ template - T at(const std::string &key) const { + T at(const std::string& key) const { std::shared_lock lock(mutex_); react_native_assert( instances_.find(key) != instances_.end() && "ContextContainer doesn't have an instance for given key."); - return *static_cast(instances_.at(key).get()); + return *static_cast(instances_.at(key).get()); } /* @@ -91,7 +91,7 @@ class ContextContainer final { * Returns an empty optional if the instance could not be found. */ template - std::optional find(const std::string &key) const { + std::optional find(const std::string& key) const { std::shared_lock lock(mutex_); auto iterator = instances_.find(key); @@ -99,7 +99,7 @@ class ContextContainer final { return {}; } - return *static_cast(iterator->second.get()); + return *static_cast(iterator->second.get()); } private: diff --git a/packages/react-native/ReactCommon/react/utils/RunLoopObserver.cpp b/packages/react-native/ReactCommon/react/utils/RunLoopObserver.cpp index 6c298614150..74707e8d91a 100644 --- a/packages/react-native/ReactCommon/react/utils/RunLoopObserver.cpp +++ b/packages/react-native/ReactCommon/react/utils/RunLoopObserver.cpp @@ -13,10 +13,10 @@ namespace facebook::react { RunLoopObserver::RunLoopObserver( Activity activities, - const WeakOwner &owner) noexcept + const WeakOwner& owner) noexcept : activities_(activities), owner_(owner) {} -void RunLoopObserver::setDelegate(const Delegate *delegate) const noexcept { +void RunLoopObserver::setDelegate(const Delegate* delegate) const noexcept { // We need these constraints to ensure basic thread-safety. react_native_assert(delegate && "A delegate must not be `nullptr`."); react_native_assert( diff --git a/packages/react-native/ReactCommon/react/utils/RunLoopObserver.h b/packages/react-native/ReactCommon/react/utils/RunLoopObserver.h index 64f29c1c589..43a7918aba2 100644 --- a/packages/react-native/ReactCommon/react/utils/RunLoopObserver.h +++ b/packages/react-native/ReactCommon/react/utils/RunLoopObserver.h @@ -63,7 +63,7 @@ class RunLoopObserver { * is retained during this call. * Will be called on the thread associated with the run loop. */ - virtual void activityDidChange(const Delegate *delegate, Activity activity) + virtual void activityDidChange(const Delegate* delegate, Activity activity) const noexcept = 0; virtual ~Delegate() noexcept = default; @@ -71,19 +71,19 @@ class RunLoopObserver { using Factory = std::function( Activity activities, - const WeakOwner &owner)>; + const WeakOwner& owner)>; /* * Constructs a run loop observer. */ - RunLoopObserver(Activity activities, const WeakOwner &owner) noexcept; + RunLoopObserver(Activity activities, const WeakOwner& owner) noexcept; virtual ~RunLoopObserver() noexcept = default; /* * Sets the delegate. * Must be called just once. */ - void setDelegate(const Delegate *delegate) const noexcept; + void setDelegate(const Delegate* delegate) const noexcept; /* * Enables or disables run loop observing. @@ -120,7 +120,7 @@ class RunLoopObserver { const Activity activities_{}; const WeakOwner owner_; - mutable const Delegate *delegate_{nullptr}; + mutable const Delegate* delegate_{nullptr}; mutable std::atomic enabled_{false}; }; diff --git a/packages/react-native/ReactCommon/react/utils/SharedFunction.h b/packages/react-native/ReactCommon/react/utils/SharedFunction.h index d44d8102fdc..e2ab4404c9a 100644 --- a/packages/react-native/ReactCommon/react/utils/SharedFunction.h +++ b/packages/react-native/ReactCommon/react/utils/SharedFunction.h @@ -26,20 +26,20 @@ class SharedFunction { using T = void(ArgumentT...); struct Pair { - Pair(std::function &&function) : function(std::move(function)) {} + Pair(std::function&& function) : function(std::move(function)) {} std::function function; std::shared_mutex mutex{}; }; public: - SharedFunction(std::function &&function = nullptr) + SharedFunction(std::function&& function = nullptr) : pair_(std::make_shared(std::move(function))) {} - SharedFunction(const SharedFunction &other) = default; - SharedFunction(SharedFunction &&other) noexcept = default; + SharedFunction(const SharedFunction& other) = default; + SharedFunction(SharedFunction&& other) noexcept = default; - SharedFunction &operator=(const SharedFunction &other) = default; - SharedFunction &operator=(SharedFunction &&other) noexcept = default; + SharedFunction& operator=(const SharedFunction& other) = default; + SharedFunction& operator=(SharedFunction&& other) noexcept = default; void assign(std::function function) const { std::unique_lock lock(pair_->mutex); diff --git a/packages/react-native/ReactCommon/react/utils/SimpleThreadSafeCache.h b/packages/react-native/ReactCommon/react/utils/SimpleThreadSafeCache.h index 4710b2c55c0..a0855f68433 100644 --- a/packages/react-native/ReactCommon/react/utils/SimpleThreadSafeCache.h +++ b/packages/react-native/ReactCommon/react/utils/SimpleThreadSafeCache.h @@ -29,7 +29,7 @@ class SimpleThreadSafeCache { * generator function, stores it inside a cache and returns it. * Can be called from any thread. */ - ValueT get(const KeyT &key, std::function generator) + ValueT get(const KeyT& key, std::function generator) const { std::lock_guard lock(mutex_); auto iterator = map_.find(key); @@ -47,7 +47,7 @@ class SimpleThreadSafeCache { * If the value wasn't found in the cache, returns empty optional. * Can be called from any thread. */ - std::optional get(const KeyT &key) const { + std::optional get(const KeyT& key) const { std::lock_guard lock(mutex_); auto iterator = map_.find(key); if (iterator == map_.end()) { @@ -61,7 +61,7 @@ class SimpleThreadSafeCache { * Sets a key-value pair in the LRU cache. * Can be called from any thread. */ - void set(const KeyT &key, const ValueT &value) const { + void set(const KeyT& key, const ValueT& value) const { std::lock_guard lock(mutex_); map_.set(std::move(key), std::move(value)); } diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp index 616df655e09..c5cb71b58a3 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp @@ -12,7 +12,7 @@ namespace BridgeNativeModulePerfLogger { std::unique_ptr g_perfLogger = nullptr; -void enableLogging(std::unique_ptr &&newPerfLogger) { +void enableLogging(std::unique_ptr&& newPerfLogger) { g_perfLogger = std::move(newPerfLogger); } @@ -20,274 +20,274 @@ void disableLogging() { g_perfLogger = nullptr; } -void moduleDataCreateStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleDataCreateStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleDataCreateStart(moduleName, id); } } -void moduleDataCreateEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleDataCreateEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleDataCreateEnd(moduleName, id); } } -void moduleCreateStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateStart(moduleName, id); } } -void moduleCreateCacheHit(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateCacheHit(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateCacheHit(moduleName, id); } } -void moduleCreateConstructStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateConstructStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateConstructStart(moduleName, id); } } -void moduleCreateConstructEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateConstructEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateConstructEnd(moduleName, id); } } -void moduleCreateSetUpStart(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateSetUpStart(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateSetUpStart(moduleName, id); } } -void moduleCreateSetUpEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateSetUpEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateSetUpEnd(moduleName, id); } } -void moduleCreateEnd(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateEnd(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateEnd(moduleName, id); } } -void moduleCreateFail(const char *moduleName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleCreateFail(const char* moduleName, int32_t id) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleCreateFail(moduleName, id); } } -void moduleJSRequireBeginningStart(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningStart(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningStart(moduleName); } } -void moduleJSRequireBeginningCacheHit(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningCacheHit(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningCacheHit(moduleName); } } -void moduleJSRequireBeginningEnd(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningEnd(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningEnd(moduleName); } } -void moduleJSRequireBeginningFail(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireBeginningFail(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireBeginningFail(moduleName); } } -void moduleJSRequireEndingStart(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingStart(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingStart(moduleName); } } -void moduleJSRequireEndingEnd(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingEnd(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingEnd(moduleName); } } -void moduleJSRequireEndingFail(const char *moduleName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void moduleJSRequireEndingFail(const char* moduleName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->moduleJSRequireEndingFail(moduleName); } } -void syncMethodCallStart(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallStart(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallStart(moduleName, methodName); } } void syncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallArgConversionStart(moduleName, methodName); } } void syncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallArgConversionEnd(moduleName, methodName); } } void syncMethodCallExecutionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallExecutionStart(moduleName, methodName); } } void syncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallExecutionEnd(moduleName, methodName); } } void syncMethodCallReturnConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallReturnConversionStart(moduleName, methodName); } } void syncMethodCallReturnConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallReturnConversionEnd(moduleName, methodName); } } -void syncMethodCallEnd(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallEnd(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallEnd(moduleName, methodName); } } -void syncMethodCallFail(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void syncMethodCallFail(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->syncMethodCallFail(moduleName, methodName); } } -void asyncMethodCallStart(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallStart(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallStart(moduleName, methodName); } } void asyncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallArgConversionStart(moduleName, methodName); } } void asyncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + const char* moduleName, + const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallArgConversionEnd(moduleName, methodName); } } -void asyncMethodCallDispatch(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallDispatch(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallDispatch(moduleName, methodName); } } -void asyncMethodCallEnd(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallEnd(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallEnd(moduleName, methodName); } } -void asyncMethodCallFail(const char *moduleName, const char *methodName) { - NativeModulePerfLogger *logger = g_perfLogger.get(); +void asyncMethodCallFail(const char* moduleName, const char* methodName) { + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallFail(moduleName, methodName); } } void asyncMethodCallBatchPreprocessStart() { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallBatchPreprocessStart(); } } void asyncMethodCallBatchPreprocessEnd(int batchSize) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallBatchPreprocessEnd(batchSize); } } void asyncMethodCallExecutionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionStart(moduleName, methodName, id); } } void asyncMethodCallExecutionArgConversionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionArgConversionStart( moduleName, methodName, id); @@ -295,10 +295,10 @@ void asyncMethodCallExecutionArgConversionStart( } void asyncMethodCallExecutionArgConversionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionArgConversionEnd( moduleName, methodName, id); @@ -306,20 +306,20 @@ void asyncMethodCallExecutionArgConversionEnd( } void asyncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionEnd(moduleName, methodName, id); } } void asyncMethodCallExecutionFail( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) { - NativeModulePerfLogger *logger = g_perfLogger.get(); + NativeModulePerfLogger* logger = g_perfLogger.get(); if (logger != nullptr) { logger->asyncMethodCallExecutionFail(moduleName, methodName, id); } diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h index e1ed6d1cef8..096cf47282a 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h @@ -12,71 +12,71 @@ namespace facebook::react { namespace BridgeNativeModulePerfLogger { -void enableLogging(std::unique_ptr &&logger); +void enableLogging(std::unique_ptr&& logger); void disableLogging(); -void moduleDataCreateStart(const char *moduleName, int32_t id); -void moduleDataCreateEnd(const char *moduleName, int32_t id); +void moduleDataCreateStart(const char* moduleName, int32_t id); +void moduleDataCreateEnd(const char* moduleName, int32_t id); /** * Create NativeModule platform object */ -void moduleCreateStart(const char *moduleName, int32_t id); -void moduleCreateCacheHit(const char *moduleName, int32_t id); -void moduleCreateConstructStart(const char *moduleName, int32_t id); -void moduleCreateConstructEnd(const char *moduleName, int32_t id); -void moduleCreateSetUpStart(const char *moduleName, int32_t id); -void moduleCreateSetUpEnd(const char *moduleName, int32_t id); -void moduleCreateEnd(const char *moduleName, int32_t id); -void moduleCreateFail(const char *moduleName, int32_t id); +void moduleCreateStart(const char* moduleName, int32_t id); +void moduleCreateCacheHit(const char* moduleName, int32_t id); +void moduleCreateConstructStart(const char* moduleName, int32_t id); +void moduleCreateConstructEnd(const char* moduleName, int32_t id); +void moduleCreateSetUpStart(const char* moduleName, int32_t id); +void moduleCreateSetUpEnd(const char* moduleName, int32_t id); +void moduleCreateEnd(const char* moduleName, int32_t id); +void moduleCreateFail(const char* moduleName, int32_t id); /** * JS require beginning */ -void moduleJSRequireBeginningStart(const char *moduleName); -void moduleJSRequireBeginningCacheHit(const char *moduleName); -void moduleJSRequireBeginningEnd(const char *moduleName); -void moduleJSRequireBeginningFail(const char *moduleName); +void moduleJSRequireBeginningStart(const char* moduleName); +void moduleJSRequireBeginningCacheHit(const char* moduleName); +void moduleJSRequireBeginningEnd(const char* moduleName); +void moduleJSRequireBeginningFail(const char* moduleName); /** * JS require ending */ -void moduleJSRequireEndingStart(const char *moduleName); -void moduleJSRequireEndingEnd(const char *moduleName); -void moduleJSRequireEndingFail(const char *moduleName); +void moduleJSRequireEndingStart(const char* moduleName); +void moduleJSRequireEndingEnd(const char* moduleName); +void moduleJSRequireEndingFail(const char* moduleName); // Sync method calls -void syncMethodCallStart(const char *moduleName, const char *methodName); +void syncMethodCallStart(const char* moduleName, const char* methodName); void syncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallExecutionStart( - const char *moduleName, - const char *methodName); -void syncMethodCallExecutionEnd(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void syncMethodCallExecutionEnd(const char* moduleName, const char* methodName); void syncMethodCallReturnConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void syncMethodCallReturnConversionEnd( - const char *moduleName, - const char *methodName); -void syncMethodCallEnd(const char *moduleName, const char *methodName); -void syncMethodCallFail(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void syncMethodCallEnd(const char* moduleName, const char* methodName); +void syncMethodCallFail(const char* moduleName, const char* methodName); // Async method calls -void asyncMethodCallStart(const char *moduleName, const char *methodName); +void asyncMethodCallStart(const char* moduleName, const char* methodName); void asyncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName); + const char* moduleName, + const char* methodName); void asyncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName); -void asyncMethodCallDispatch(const char *moduleName, const char *methodName); -void asyncMethodCallEnd(const char *moduleName, const char *methodName); -void asyncMethodCallFail(const char *moduleName, const char *methodName); + const char* moduleName, + const char* methodName); +void asyncMethodCallDispatch(const char* moduleName, const char* methodName); +void asyncMethodCallEnd(const char* moduleName, const char* methodName); +void asyncMethodCallFail(const char* moduleName, const char* methodName); /** * Pre-processing async method call batch @@ -86,24 +86,24 @@ void asyncMethodCallBatchPreprocessEnd(int batchSize); // Async method call execution void asyncMethodCallExecutionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionArgConversionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionArgConversionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); void asyncMethodCallExecutionFail( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id); } // namespace BridgeNativeModulePerfLogger diff --git a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/NativeModulePerfLogger.h b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/NativeModulePerfLogger.h index 864ddfc1d32..8348068d934 100644 --- a/packages/react-native/ReactCommon/reactperflogger/reactperflogger/NativeModulePerfLogger.h +++ b/packages/react-native/ReactCommon/reactperflogger/reactperflogger/NativeModulePerfLogger.h @@ -38,24 +38,24 @@ class NativeModulePerfLogger { * - moduleDataCreateStart: very beginning of first phase. * - moduleDataCreateEnd: after RCTModuleData has been created. */ - virtual void moduleDataCreateStart(const char *moduleName, int32_t id) = 0; - virtual void moduleDataCreateEnd(const char *moduleName, int32_t id) = 0; + virtual void moduleDataCreateStart(const char* moduleName, int32_t id) = 0; + virtual void moduleDataCreateEnd(const char* moduleName, int32_t id) = 0; /** * How long does it take to create the platform NativeModule object? * - moduleCreateStart: start creating platform NativeModule * - moduleCreateEnd: stop creating platform NativeModule */ - virtual void moduleCreateStart(const char *moduleName, int32_t id) = 0; - virtual void moduleCreateCacheHit(const char *moduleName, int32_t id) = 0; + virtual void moduleCreateStart(const char* moduleName, int32_t id) = 0; + virtual void moduleCreateCacheHit(const char* moduleName, int32_t id) = 0; virtual void moduleCreateConstructStart( - const char *moduleName, + const char* moduleName, int32_t id) = 0; - virtual void moduleCreateConstructEnd(const char *moduleName, int32_t id) = 0; - virtual void moduleCreateSetUpStart(const char *moduleName, int32_t id) = 0; - virtual void moduleCreateSetUpEnd(const char *moduleName, int32_t id) = 0; - virtual void moduleCreateEnd(const char *moduleName, int32_t id) = 0; - virtual void moduleCreateFail(const char *moduleName, int32_t id) = 0; + virtual void moduleCreateConstructEnd(const char* moduleName, int32_t id) = 0; + virtual void moduleCreateSetUpStart(const char* moduleName, int32_t id) = 0; + virtual void moduleCreateSetUpEnd(const char* moduleName, int32_t id) = 0; + virtual void moduleCreateEnd(const char* moduleName, int32_t id) = 0; + virtual void moduleCreateFail(const char* moduleName, int32_t id) = 0; /** * How long, after starting JS require, does it take to start creating the @@ -63,10 +63,10 @@ class NativeModulePerfLogger { * - moduleJSRequireBeginningStart: start of JS require * - moduleJSRequireBeginningEnd: start creating platform NativeModule */ - virtual void moduleJSRequireBeginningStart(const char *moduleName) = 0; - virtual void moduleJSRequireBeginningCacheHit(const char *moduleName) = 0; - virtual void moduleJSRequireBeginningEnd(const char *moduleName) = 0; - virtual void moduleJSRequireBeginningFail(const char *moduleName) = 0; + virtual void moduleJSRequireBeginningStart(const char* moduleName) = 0; + virtual void moduleJSRequireBeginningCacheHit(const char* moduleName) = 0; + virtual void moduleJSRequireBeginningEnd(const char* moduleName) = 0; + virtual void moduleJSRequireBeginningFail(const char* moduleName) = 0; /** * How long does it take to return from the JS require after the platform @@ -74,58 +74,58 @@ class NativeModulePerfLogger { * - moduleJSRequireEndingStart: end creating platform NativeModule * - moduleJSRequireEndingEnd: end of JS require */ - virtual void moduleJSRequireEndingStart(const char *moduleName) = 0; - virtual void moduleJSRequireEndingEnd(const char *moduleName) = 0; - virtual void moduleJSRequireEndingFail(const char *moduleName) = 0; + virtual void moduleJSRequireEndingStart(const char* moduleName) = 0; + virtual void moduleJSRequireEndingEnd(const char* moduleName) = 0; + virtual void moduleJSRequireEndingFail(const char* moduleName) = 0; // Sync method calls virtual void syncMethodCallStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallExecutionStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallReturnConversionStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallReturnConversionEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void syncMethodCallFail( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; // Async method calls virtual void asyncMethodCallStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void asyncMethodCallArgConversionStart( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void asyncMethodCallArgConversionEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void asyncMethodCallDispatch( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void asyncMethodCallEnd( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; virtual void asyncMethodCallFail( - const char *moduleName, - const char *methodName) = 0; + const char* moduleName, + const char* methodName) = 0; /** * In the NativeModule system, we batch async NativeModule method calls. @@ -138,24 +138,24 @@ class NativeModulePerfLogger { // Async method call execution virtual void asyncMethodCallExecutionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) = 0; virtual void asyncMethodCallExecutionArgConversionStart( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) = 0; virtual void asyncMethodCallExecutionArgConversionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) = 0; virtual void asyncMethodCallExecutionEnd( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) = 0; virtual void asyncMethodCallExecutionFail( - const char *moduleName, - const char *methodName, + const char* moduleName, + const char* methodName, int32_t id) = 0; }; diff --git a/packages/react-native/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h b/packages/react-native/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h index aef63a3ea8e..0ad49416215 100644 --- a/packages/react-native/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h +++ b/packages/react-native/ReactCommon/runtimeexecutor/ReactCommon/RuntimeExecutor.h @@ -23,7 +23,7 @@ namespace facebook::react { * difficult to ensure that the Runtime is being accessed safely. */ using RuntimeExecutor = - std::function &&callback)>; + std::function&& callback)>; /* * The caller can expect that the callback will be executed sometime later on an @@ -36,8 +36,8 @@ using RuntimeExecutor = * is no synchronization. */ inline static void executeAsynchronously( - const RuntimeExecutor &runtimeExecutor, - std::function &&callback) noexcept { + const RuntimeExecutor& runtimeExecutor, + std::function&& callback) noexcept { std::thread([callback = std::move(callback), runtimeExecutor]() mutable { runtimeExecutor(std::move(callback)); }).detach(); @@ -51,13 +51,13 @@ inline static void executeAsynchronously( * `callback` will be executed. */ inline static void executeSynchronously_CAN_DEADLOCK( - const RuntimeExecutor &runtimeExecutor, - std::function &&callback) noexcept { + const RuntimeExecutor& runtimeExecutor, + std::function&& callback) noexcept { std::mutex mutex; mutex.lock(); runtimeExecutor( - [callback = std::move(callback), &mutex](jsi::Runtime &runtime) { + [callback = std::move(callback), &mutex](jsi::Runtime& runtime) { callback(runtime); mutex.unlock(); }); @@ -73,8 +73,8 @@ inline static void executeSynchronously_CAN_DEADLOCK( * thread. */ inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK( - const RuntimeExecutor &runtimeExecutor, - std::function &&callback) noexcept { + const RuntimeExecutor& runtimeExecutor, + std::function&& callback) noexcept { // Note: We need the third mutex to get back to the main thread before // the lambda is finished (because all mutexes are allocated on the stack). @@ -86,11 +86,11 @@ inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK( mutex2.lock(); mutex3.lock(); - jsi::Runtime *runtimePtr; + jsi::Runtime* runtimePtr; auto threadId = std::this_thread::get_id(); - runtimeExecutor([&](jsi::Runtime &runtime) { + runtimeExecutor([&](jsi::Runtime& runtime) { runtimePtr = &runtime; if (threadId == std::this_thread::get_id()) { @@ -114,13 +114,13 @@ inline static void executeSynchronouslyOnSameThread_CAN_DEADLOCK( template inline static DataT executeSynchronouslyOnSameThread_CAN_DEADLOCK( - const RuntimeExecutor &runtimeExecutor, - std::function &&callback) noexcept { + const RuntimeExecutor& runtimeExecutor, + std::function&& callback) noexcept { DataT data; executeSynchronouslyOnSameThread_CAN_DEADLOCK( runtimeExecutor, - [&](jsi::Runtime &runtime) { data = callback(runtime); }); + [&](jsi::Runtime& runtime) { data = callback(runtime); }); return data; } diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp index d9344d428fc..fb258b6022d 100644 --- a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp +++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.cpp @@ -15,86 +15,86 @@ NativeCxxModuleExample::NativeCxxModuleExample( : NativeCxxModuleExampleCxxSpec(std::move(jsInvoker)) {} void NativeCxxModuleExample::getValueWithCallback( - jsi::Runtime &rt, + jsi::Runtime& rt, AsyncCallback callback) { callback({"value from callback!"}); } std::vector> NativeCxxModuleExample::getArray( - jsi::Runtime &rt, + jsi::Runtime& rt, std::vector> arg) { return arg; } -bool NativeCxxModuleExample::getBool(jsi::Runtime &rt, bool arg) { +bool NativeCxxModuleExample::getBool(jsi::Runtime& rt, bool arg) { return arg; } -ConstantsStruct NativeCxxModuleExample::getConstants(jsi::Runtime &rt) { +ConstantsStruct NativeCxxModuleExample::getConstants(jsi::Runtime& rt) { return ConstantsStruct{true, 69, "react-native"}; } CustomEnumInt NativeCxxModuleExample::getCustomEnum( - jsi::Runtime &rt, + jsi::Runtime& rt, CustomEnumInt arg) { return arg; } std::shared_ptr NativeCxxModuleExample::getCustomHostObject( - jsi::Runtime &rt) { + jsi::Runtime& rt) { return std::make_shared( std::make_shared("answer", 42)); } std::string NativeCxxModuleExample::consumeCustomHostObject( - jsi::Runtime &rt, + jsi::Runtime& rt, std::shared_ptr arg) { auto value = arg->getValue(); return value->a_ + std::to_string(value->b_); } NativeCxxModuleExampleCxxEnumFloat NativeCxxModuleExample::getNumEnum( - jsi::Runtime &rt, + jsi::Runtime& rt, NativeCxxModuleExampleCxxEnumInt arg) { return NativeCxxModuleExampleCxxEnumFloat::FB; } NativeCxxModuleExampleCxxEnumStr NativeCxxModuleExample::getStrEnum( - jsi::Runtime &rt, + jsi::Runtime& rt, NativeCxxModuleExampleCxxEnumNone arg) { return NativeCxxModuleExampleCxxEnumStr::SB; } std::map> NativeCxxModuleExample::getMap( - jsi::Runtime &rt, + jsi::Runtime& rt, std::map> arg) { return arg; } -double NativeCxxModuleExample::getNumber(jsi::Runtime &rt, double arg) { +double NativeCxxModuleExample::getNumber(jsi::Runtime& rt, double arg) { return arg; } ObjectStruct NativeCxxModuleExample::getObject( - jsi::Runtime &rt, + jsi::Runtime& rt, ObjectStruct arg) { return arg; } std::set NativeCxxModuleExample::getSet( - jsi::Runtime &rt, + jsi::Runtime& rt, std::set arg) { return arg; } std::string NativeCxxModuleExample::getString( - jsi::Runtime &rt, + jsi::Runtime& rt, std::string arg) { return arg; } std::string NativeCxxModuleExample::getUnion( - jsi::Runtime &rt, + jsi::Runtime& rt, float x, std::string y, jsi::Object z) { @@ -111,7 +111,7 @@ std::string NativeCxxModuleExample::getUnion( } ValueStruct NativeCxxModuleExample::getValue( - jsi::Runtime &rt, + jsi::Runtime& rt, double x, std::string y, ObjectStruct z) { @@ -120,7 +120,7 @@ ValueStruct NativeCxxModuleExample::getValue( } AsyncPromise NativeCxxModuleExample::getValueWithPromise( - jsi::Runtime &rt, + jsi::Runtime& rt, bool error) { auto promise = AsyncPromise(rt, jsInvoker_); if (error) { @@ -132,51 +132,51 @@ AsyncPromise NativeCxxModuleExample::getValueWithPromise( } std::optional NativeCxxModuleExample::getWithWithOptionalArgs( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional optionalArg) { return optionalArg; } -void NativeCxxModuleExample::voidFunc(jsi::Runtime &rt) { +void NativeCxxModuleExample::voidFunc(jsi::Runtime& rt) { // Nothing to do } void NativeCxxModuleExample::emitCustomDeviceEvent( - jsi::Runtime &rt, + jsi::Runtime& rt, jsi::String eventName) { // Test emitting device events (RCTDeviceEventEmitter.emit) from C++ // TurboModule with arbitrary arguments emitDeviceEvent( rt, eventName.utf8(rt).c_str(), - [](jsi::Runtime &rt, std::vector &args) { + [](jsi::Runtime& rt, std::vector& args) { args.emplace_back(jsi::Value(true)); args.emplace_back(jsi::Value(42)); args.emplace_back(jsi::String::createFromAscii(rt, "stringArg")); }); } -void NativeCxxModuleExample::voidFuncThrows(jsi::Runtime &rt) { +void NativeCxxModuleExample::voidFuncThrows(jsi::Runtime& rt) { throw std::runtime_error("Intentional exception from Cxx voidFuncThrows"); }; ObjectStruct NativeCxxModuleExample::getObjectThrows( - jsi::Runtime &rt, + jsi::Runtime& rt, ObjectStruct arg) { throw std::runtime_error("Intentional exception from Cxx getObjectThrows"); }; AsyncPromise NativeCxxModuleExample::promiseThrows( - jsi::Runtime &rt) { + jsi::Runtime& rt) { throw std::runtime_error("Intentional exception from Cxx promiseThrows"); }; -void NativeCxxModuleExample::voidFuncAssert(jsi::Runtime &rt) { +void NativeCxxModuleExample::voidFuncAssert(jsi::Runtime& rt) { react_native_assert(false && "Intentional assert from Cxx voidFuncAssert"); }; ObjectStruct NativeCxxModuleExample::getObjectAssert( - jsi::Runtime &rt, + jsi::Runtime& rt, ObjectStruct arg) { react_native_assert(false && "Intentional assert from Cxx getObjectAssert"); @@ -185,7 +185,7 @@ ObjectStruct NativeCxxModuleExample::getObjectAssert( }; AsyncPromise NativeCxxModuleExample::promiseAssert( - jsi::Runtime &rt) { + jsi::Runtime& rt) { react_native_assert(false && "Intentional assert from Cxx promiseAssert"); // Asserts disabled diff --git a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h index 4886e1850a2..fa160030783 100644 --- a/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h +++ b/packages/rn-tester/NativeCxxModuleExample/NativeCxxModuleExample.h @@ -58,7 +58,7 @@ enum CustomEnumInt { A = 23, B = 42 }; template <> struct Bridging { - static CustomEnumInt fromJs(jsi::Runtime &rt, int32_t value) { + static CustomEnumInt fromJs(jsi::Runtime& rt, int32_t value) { if (value == 23) { return CustomEnumInt::A; } else if (value == 42) { @@ -68,7 +68,7 @@ struct Bridging { } } - static jsi::Value toJs(jsi::Runtime &rt, CustomEnumInt value) { + static jsi::Value toJs(jsi::Runtime& rt, CustomEnumInt value) { return bridging::toJs(rt, static_cast(value)); } }; @@ -104,71 +104,71 @@ class NativeCxxModuleExample NativeCxxModuleExample(std::shared_ptr jsInvoker); void getValueWithCallback( - jsi::Runtime &rt, + jsi::Runtime& rt, AsyncCallback callback); std::vector> getArray( - jsi::Runtime &rt, + jsi::Runtime& rt, std::vector> arg); - bool getBool(jsi::Runtime &rt, bool arg); + bool getBool(jsi::Runtime& rt, bool arg); - ConstantsStruct getConstants(jsi::Runtime &rt); + ConstantsStruct getConstants(jsi::Runtime& rt); - CustomEnumInt getCustomEnum(jsi::Runtime &rt, CustomEnumInt arg); + CustomEnumInt getCustomEnum(jsi::Runtime& rt, CustomEnumInt arg); - std::shared_ptr getCustomHostObject(jsi::Runtime &rt); + std::shared_ptr getCustomHostObject(jsi::Runtime& rt); std::string consumeCustomHostObject( - jsi::Runtime &rt, + jsi::Runtime& rt, std::shared_ptr arg); NativeCxxModuleExampleCxxEnumFloat getNumEnum( - jsi::Runtime &rt, + jsi::Runtime& rt, NativeCxxModuleExampleCxxEnumInt arg); NativeCxxModuleExampleCxxEnumStr getStrEnum( - jsi::Runtime &rt, + jsi::Runtime& rt, NativeCxxModuleExampleCxxEnumNone arg); std::map> getMap( - jsi::Runtime &rt, + jsi::Runtime& rt, std::map> arg); - double getNumber(jsi::Runtime &rt, double arg); + double getNumber(jsi::Runtime& rt, double arg); - ObjectStruct getObject(jsi::Runtime &rt, ObjectStruct arg); + ObjectStruct getObject(jsi::Runtime& rt, ObjectStruct arg); - std::set getSet(jsi::Runtime &rt, std::set arg); + std::set getSet(jsi::Runtime& rt, std::set arg); - std::string getString(jsi::Runtime &rt, std::string arg); + std::string getString(jsi::Runtime& rt, std::string arg); - std::string getUnion(jsi::Runtime &rt, float x, std::string y, jsi::Object z); + std::string getUnion(jsi::Runtime& rt, float x, std::string y, jsi::Object z); ValueStruct - getValue(jsi::Runtime &rt, double x, std::string y, ObjectStruct z); + getValue(jsi::Runtime& rt, double x, std::string y, ObjectStruct z); - AsyncPromise getValueWithPromise(jsi::Runtime &rt, bool error); + AsyncPromise getValueWithPromise(jsi::Runtime& rt, bool error); std::optional getWithWithOptionalArgs( - jsi::Runtime &rt, + jsi::Runtime& rt, std::optional optionalArg); - void voidFunc(jsi::Runtime &rt); + void voidFunc(jsi::Runtime& rt); - void emitCustomDeviceEvent(jsi::Runtime &rt, jsi::String eventName); + void emitCustomDeviceEvent(jsi::Runtime& rt, jsi::String eventName); - void voidFuncThrows(jsi::Runtime &rt); + void voidFuncThrows(jsi::Runtime& rt); - ObjectStruct getObjectThrows(jsi::Runtime &rt, ObjectStruct arg); + ObjectStruct getObjectThrows(jsi::Runtime& rt, ObjectStruct arg); - AsyncPromise promiseThrows(jsi::Runtime &rt); + AsyncPromise promiseThrows(jsi::Runtime& rt); - void voidFuncAssert(jsi::Runtime &rt); + void voidFuncAssert(jsi::Runtime& rt); - ObjectStruct getObjectAssert(jsi::Runtime &rt, ObjectStruct arg); + ObjectStruct getObjectAssert(jsi::Runtime& rt, ObjectStruct arg); - AsyncPromise promiseAssert(jsi::Runtime &rt); + AsyncPromise promiseAssert(jsi::Runtime& rt); }; } // namespace facebook::react diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp index bcbaa3367f9..4866263ab59 100644 --- a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp +++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp @@ -31,8 +31,8 @@ void registerComponents( } std::shared_ptr cxxModuleProvider( - const std::string &name, - const std::shared_ptr &jsInvoker) { + const std::string& name, + const std::shared_ptr& jsInvoker) { if (name == NativeCxxModuleExample::kModuleName) { return std::make_shared(jsInvoker); } @@ -40,8 +40,8 @@ std::shared_ptr cxxModuleProvider( } std::shared_ptr javaModuleProvider( - const std::string &name, - const JavaTurboModule::InitParams ¶ms) { + const std::string& name, + const JavaTurboModule::InitParams& params) { auto module = AppSpecs_ModuleProvider(name, params); if (module != nullptr) { return module; @@ -56,7 +56,7 @@ std::shared_ptr javaModuleProvider( } // namespace react } // namespace facebook -JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) { +JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) { return facebook::jni::initialize(vm, [] { facebook::react::DefaultTurboModuleManagerDelegate::cxxModuleProvider = &facebook::react::cxxModuleProvider;