Skip to content

Commit d5ba113

Browse files
passyfacebook-github-bot
authored andcommitted
clang-format cpp
Summary: Ran `arc f` against some CPP files to be modified with the next diff to reduce the churn on it. ## Changelog [Android] [Changed] - Formatted cpp/h code with clang-format Reviewed By: javache Differential Revision: D19371785 fbshipit-source-id: b7f7b92c4cb9ec7f8da728bb577db29cf11fbb39
1 parent 8d57691 commit d5ba113

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+924
-658
lines changed

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp

+134-87
Large diffs are not rendered by default.

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ class Binding : public jni::HybridClass<Binding>, public SchedulerDelegate {
7676
const ShadowView &shadowView);
7777

7878
void schedulerDidDispatchCommand(
79-
const ShadowView &shadowView,
80-
std::string const &commandName,
81-
folly::dynamic const args);
79+
const ShadowView &shadowView,
80+
std::string const &commandName,
81+
folly::dynamic const args);
8282

8383
void setPixelDensity(float pointScaleFactor);
8484

8585
void schedulerDidSetJSResponder(
86-
SurfaceId surfaceId,
87-
const ShadowView &shadowView,
88-
const ShadowView &initialShadowView,
89-
bool blockNativeResponder);
86+
SurfaceId surfaceId,
87+
const ShadowView &shadowView,
88+
const ShadowView &initialShadowView,
89+
bool blockNativeResponder);
9090

9191
void schedulerDidClearJSResponder();
9292

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ComponentFactoryDelegate.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <fb/fbjni.h>
1111
#include <jsi/jsi.h>
1212
#include <react/uimanager/ComponentDescriptorRegistry.h>
13-
#include <react/utils/ContextContainer.h>
1413
#include <react/uimanager/Scheduler.h>
14+
#include <react/utils/ContextContainer.h>
1515
#include <mutex>
1616
#include <unordered_set>
1717

@@ -25,7 +25,7 @@ class Instance;
2525
class ComponentFactoryDelegate
2626
: public jni::HybridClass<ComponentFactoryDelegate> {
2727
public:
28-
constexpr static const char* const kJavaDescriptor =
28+
constexpr static const char *const kJavaDescriptor =
2929
"Lcom/facebook/react/fabric/ComponentFactoryDelegate;";
3030

3131
static void registerNatives();

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventBeatManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace facebook {
1313
namespace react {
1414

1515
EventBeatManager::EventBeatManager(
16-
jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject)
17-
: jhybridobject_(jhybridobject) {}
16+
jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject)
17+
: jhybridobject_(jhybridobject) {}
1818

1919
jni::local_ref<EventBeatManager::jhybriddata> EventBeatManager::initHybrid(
2020
jni::alias_ref<EventBeatManager::jhybriddata> jhybridobject) {

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ EventEmitterWrapper::initHybrid(jni::alias_ref<jclass>) {
2020

2121
void EventEmitterWrapper::invokeEvent(
2222
std::string eventName,
23-
NativeMap* payload) {
23+
NativeMap *payload) {
2424
eventEmitter->dispatchEvent(
2525
eventName, payload->consume(), EventPriority::AsynchronousBatched);
2626
}
@@ -33,4 +33,4 @@ void EventEmitterWrapper::registerNatives() {
3333
}
3434

3535
} // namespace react
36-
} // namespace facebook
36+
} // namespace facebook

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/EventEmitterWrapper.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ class Instance;
1818

1919
class EventEmitterWrapper : public jni::HybridClass<EventEmitterWrapper> {
2020
public:
21-
constexpr static const char* const kJavaDescriptor =
21+
constexpr static const char *const kJavaDescriptor =
2222
"Lcom/facebook/react/fabric/events/EventEmitterWrapper;";
2323

2424
static void registerNatives();
2525

2626
SharedEventEmitter eventEmitter;
2727

28-
void invokeEvent(std::string eventName, NativeMap* params);
28+
void invokeEvent(std::string eventName, NativeMap *params);
2929

3030
private:
3131
static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ using namespace facebook::jni;
1414
namespace facebook {
1515
namespace react {
1616

17-
jni::local_ref<NodeStateWrapper::jhybriddata>
18-
NodeStateWrapper::initHybrid(jni::alias_ref<jclass>) {
17+
jni::local_ref<NodeStateWrapper::jhybriddata> NodeStateWrapper::initHybrid(
18+
jni::alias_ref<jclass>) {
1919
return makeCxxInstance();
2020
}
2121

@@ -26,7 +26,7 @@ jni::local_ref<ReadableNativeMap::jhybridobject> NodeStateWrapper::getState() {
2626
return readableNativeMap;
2727
}
2828

29-
void NodeStateWrapper::updateState(ReadableNativeMap* map) {
29+
void NodeStateWrapper::updateState(ReadableNativeMap *map) {
3030
// Get folly::dynamic from map
3131
auto dynamicMap = map->consume();
3232
// Set state

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/NodeStateWrapper.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@ namespace react {
1616

1717
class NodeStateWrapper : public jni::HybridClass<NodeStateWrapper> {
1818
public:
19-
constexpr static const char* const kJavaDescriptor =
19+
constexpr static const char *const kJavaDescriptor =
2020
"Lcom/facebook/react/fabric/NodeStateWrapper;";
2121

2222
NodeStateWrapper() {}
2323

2424
static void registerNatives();
2525

2626
jni::local_ref<ReadableNativeMap::jhybridobject> getState();
27-
void updateState(ReadableNativeMap* map);
27+
void updateState(ReadableNativeMap *map);
28+
29+
const State *state_;
2830

29-
const State* state_;
3031
private:
3132
static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
3233
};

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/OnLoad.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "EventEmitterWrapper.h"
1414
#include "StateWrapperImpl.h"
1515

16-
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
16+
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
1717
return facebook::xplat::initialize(vm, [] {
1818
facebook::react::Binding::registerNatives();
1919
facebook::react::EventBeatManager::registerNatives();

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,29 @@
1111

1212
using namespace facebook::react;
1313

14-
bool ReactNativeConfigHolder::getBool(const std::string& param) const {
14+
bool ReactNativeConfigHolder::getBool(const std::string &param) const {
1515
static const auto method = facebook::jni::findClassStatic(
1616
"com/facebook/react/fabric/ReactNativeConfig")
1717
->getMethod<jboolean(jstring)>("getBool");
1818
return method(reactNativeConfig_, facebook::jni::make_jstring(param).get());
1919
}
2020

21-
std::string ReactNativeConfigHolder::getString(const std::string& param) const {
21+
std::string ReactNativeConfigHolder::getString(const std::string &param) const {
2222
static const auto method = facebook::jni::findClassStatic(
2323
"com/facebook/react/fabric/ReactNativeConfig")
2424
->getMethod<jstring(jstring)>("getString");
2525
return method(reactNativeConfig_, facebook::jni::make_jstring(param).get())
2626
->toString();
2727
}
2828

29-
int64_t ReactNativeConfigHolder::getInt64(const std::string& param) const {
29+
int64_t ReactNativeConfigHolder::getInt64(const std::string &param) const {
3030
static const auto method = facebook::jni::findClassStatic(
3131
"com/facebook/react/fabric/ReactNativeConfig")
3232
->getMethod<jint(jstring)>("getInt64");
3333
return method(reactNativeConfig_, facebook::jni::make_jstring(param).get());
3434
}
3535

36-
double ReactNativeConfigHolder::getDouble(const std::string& param) const {
36+
double ReactNativeConfigHolder::getDouble(const std::string &param) const {
3737
static const auto method = facebook::jni::findClassStatic(
3838
"com/facebook/react/fabric/ReactNativeConfig")
3939
->getMethod<jdouble(jstring)>("getDouble");

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/ReactNativeConfigHolder.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ class ReactNativeConfigHolder : public ReactNativeConfig {
2525
ReactNativeConfigHolder(jni::alias_ref<jobject> reactNativeConfig)
2626
: reactNativeConfig_(make_global(reactNativeConfig)){};
2727

28-
bool getBool(const std::string& param) const override;
29-
std::string getString(const std::string& param) const override;
30-
int64_t getInt64(const std::string& param) const override;
31-
double getDouble(const std::string& param) const override;
28+
bool getBool(const std::string &param) const override;
29+
std::string getString(const std::string &param) const override;
30+
int64_t getInt64(const std::string &param) const override;
31+
double getDouble(const std::string &param) const override;
3232

3333
private:
3434
jni::global_ref<jobject> reactNativeConfig_;

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ namespace react {
1717
/**
1818
* Called from Java constructor through the JNI.
1919
*/
20-
jni::local_ref<StateWrapperImpl::jhybriddata>
21-
StateWrapperImpl::initHybrid(jni::alias_ref<jclass>) {
20+
jni::local_ref<StateWrapperImpl::jhybriddata> StateWrapperImpl::initHybrid(
21+
jni::alias_ref<jclass>) {
2222
return makeCxxInstance();
2323
}
2424

@@ -29,7 +29,7 @@ jni::local_ref<ReadableNativeMap::jhybridobject> StateWrapperImpl::getState() {
2929
return readableNativeMap;
3030
}
3131

32-
void StateWrapperImpl::updateStateImpl(NativeMap* map) {
32+
void StateWrapperImpl::updateStateImpl(NativeMap *map) {
3333
// Get folly::dynamic from map
3434
auto dynamicMap = map->consume();
3535
// Set state
@@ -38,8 +38,8 @@ void StateWrapperImpl::updateStateImpl(NativeMap* map) {
3838

3939
void StateWrapperImpl::registerNatives() {
4040
registerHybrid({
41-
makeNativeMethod("initHybrid", StateWrapperImpl::initHybrid),
42-
makeNativeMethod("getState", StateWrapperImpl::getState),
41+
makeNativeMethod("initHybrid", StateWrapperImpl::initHybrid),
42+
makeNativeMethod("getState", StateWrapperImpl::getState),
4343
makeNativeMethod("updateStateImpl", StateWrapperImpl::updateStateImpl),
4444
});
4545
}

ReactAndroid/src/main/java/com/facebook/react/fabric/jni/StateWrapperImpl.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Instance;
1818

1919
class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
2020
public:
21-
constexpr static const char* const kJavaDescriptor =
21+
constexpr static const char *const kJavaDescriptor =
2222
"Lcom/facebook/react/fabric/StateWrapperImpl;";
2323

2424
static void registerNatives();
@@ -27,6 +27,7 @@ class StateWrapperImpl : public jni::HybridClass<StateWrapperImpl> {
2727
void updateStateImpl(NativeMap *map);
2828

2929
State::Shared state_;
30+
3031
private:
3132
jni::alias_ref<StateWrapperImpl::jhybriddata> jhybridobject_;
3233

ReactAndroid/src/main/java/com/facebook/react/modules/blob/jni/BlobCollector.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ BlobCollector::BlobCollector(
2727
BlobCollector::~BlobCollector() {
2828
jni::ThreadScope::WithClassLoader([&] {
2929
static auto removeMethod = jni::findClassStatic(kBlobModuleJavaDescriptor)
30-
->getMethod<void(jstring)>("remove");
30+
->getMethod<void(jstring)>("remove");
3131
removeMethod(blobModule_, jni::make_jstring(blobId_).get());
3232
});
3333
}
@@ -36,7 +36,7 @@ void BlobCollector::nativeInstall(
3636
jni::alias_ref<jhybridobject> jThis,
3737
jni::alias_ref<jobject> blobModule,
3838
jlong jsContextNativePointer) {
39-
auto &runtime = *((jsi::Runtime *) jsContextNativePointer);
39+
auto &runtime = *((jsi::Runtime *)jsContextNativePointer);
4040
auto blobModuleRef = jni::make_global(blobModule);
4141
runtime.global().setProperty(
4242
runtime,

ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/CallInvokerHolder.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77

88
#pragma once
99

10-
#include <fb/fbjni.h>
1110
#include <ReactCommon/CallInvoker.h>
11+
#include <fb/fbjni.h>
1212
#include <memory>
1313

1414
namespace facebook {
1515
namespace react {
1616

17-
class CallInvokerHolder
18-
: public jni::HybridClass<CallInvokerHolder> {
17+
class CallInvokerHolder : public jni::HybridClass<CallInvokerHolder> {
1918
public:
2019
static auto constexpr kJavaDescriptor =
2120
"Lcom/facebook/react/turbomodule/core/CallInvokerHolderImpl;";

ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/ReactCommon/OnLoad.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212

1313
JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
1414
return facebook::xplat::initialize(vm, [] {
15-
// TODO: dvacca ramanpreet unify this with the way "ComponentDescriptorFactory" is defined in Fabric
15+
// TODO: dvacca ramanpreet unify this with the way
16+
// "ComponentDescriptorFactory" is defined in Fabric
1617
facebook::react::TurboModuleManager::registerNatives();
1718
});
1819
}

0 commit comments

Comments
 (0)