Skip to content

Commit b2a0464

Browse files
magreenblattmagreenblatt
committed
Apply clang-format to all C, C++ and ObjC files (issue chromiumembedded#272)
1 parent 99931b2 commit b2a0464

128 files changed

Lines changed: 4388 additions & 3284 deletions

File tree

Some content is hidden

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

‎native/CefApp.cpp‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,57 +8,64 @@
88

99
#include "include/cef_app.h"
1010
#include "include/cef_version.h"
11+
1112
#include "context.h"
1213
#include "jcef_version.h"
1314
#include "jni_util.h"
1415
#include "scheme_handler_factory.h"
1516
#include "util.h"
1617

17-
JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1PreInitialize
18-
(JNIEnv *env, jobject c) {
18+
JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1PreInitialize(JNIEnv* env,
19+
jobject c) {
1920
Context::Create();
2021
return Context::GetInstance()->PreInitialize(env, c) ? JNI_TRUE : JNI_FALSE;
2122
}
2223

23-
JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1Initialize
24-
(JNIEnv *env, jobject c, jstring argPathToJavaDLL, jobject appHandler,
25-
jobject jsettings) {
26-
return Context::GetInstance()->Initialize(
27-
env, c, argPathToJavaDLL, appHandler, jsettings) ? JNI_TRUE : JNI_FALSE;
24+
JNIEXPORT jboolean JNICALL
25+
Java_org_cef_CefApp_N_1Initialize(JNIEnv* env,
26+
jobject c,
27+
jstring argPathToJavaDLL,
28+
jobject appHandler,
29+
jobject jsettings) {
30+
return Context::GetInstance()->Initialize(env, c, argPathToJavaDLL,
31+
appHandler, jsettings)
32+
? JNI_TRUE
33+
: JNI_FALSE;
2834
}
2935

30-
JNIEXPORT void JNICALL Java_org_cef_CefApp_N_1Shutdown
31-
(JNIEnv *env, jobject) {
36+
JNIEXPORT void JNICALL Java_org_cef_CefApp_N_1Shutdown(JNIEnv* env, jobject) {
3237
Context::GetInstance()->Shutdown();
3338
Context::Destroy();
3439
}
3540

36-
JNIEXPORT void JNICALL Java_org_cef_CefApp_N_1DoMessageLoopWork
37-
(JNIEnv *env, jobject) {
41+
JNIEXPORT void JNICALL Java_org_cef_CefApp_N_1DoMessageLoopWork(JNIEnv* env,
42+
jobject) {
3843
Context::GetInstance()->DoMessageLoopWork();
3944
}
4045

41-
JNIEXPORT jobject JNICALL Java_org_cef_CefApp_N_1GetVersion
42-
(JNIEnv *env, jobject obj) {
43-
return NewJNIObject(env,
44-
"org/cef/CefApp$CefVersion",
45-
"(Lorg/cef/CefApp;IIIIIII)V",
46-
obj,
47-
JCEF_COMMIT_NUMBER,
48-
cef_version_info(0), // CEF_VERSION_MAJOR
49-
cef_version_info(1), // CEF_COMMIT_NUMBER
50-
cef_version_info(2), // CHROME_VERSION_MAJOR
51-
cef_version_info(3), // CHROME_VERSION_MINOR
52-
cef_version_info(4), // CHROME_VERSION_BUILD
53-
cef_version_info(5)); // CHROME_VERSION_PATCH
46+
JNIEXPORT jobject JNICALL Java_org_cef_CefApp_N_1GetVersion(JNIEnv* env,
47+
jobject obj) {
48+
return NewJNIObject(env, "org/cef/CefApp$CefVersion",
49+
"(Lorg/cef/CefApp;IIIIIII)V", obj, JCEF_COMMIT_NUMBER,
50+
cef_version_info(0), // CEF_VERSION_MAJOR
51+
cef_version_info(1), // CEF_COMMIT_NUMBER
52+
cef_version_info(2), // CHROME_VERSION_MAJOR
53+
cef_version_info(3), // CHROME_VERSION_MINOR
54+
cef_version_info(4), // CHROME_VERSION_BUILD
55+
cef_version_info(5)); // CHROME_VERSION_PATCH
5456
}
5557

56-
JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1RegisterSchemeHandlerFactory
57-
(JNIEnv *env, jobject, jstring jSchemeName, jstring jDomainName, jobject jFactory) {
58+
JNIEXPORT jboolean JNICALL
59+
Java_org_cef_CefApp_N_1RegisterSchemeHandlerFactory(JNIEnv* env,
60+
jobject,
61+
jstring jSchemeName,
62+
jstring jDomainName,
63+
jobject jFactory) {
5864
if (!jFactory)
5965
return JNI_FALSE;
6066

61-
CefRefPtr<SchemeHandlerFactory> factory = new SchemeHandlerFactory(env, jFactory);
67+
CefRefPtr<SchemeHandlerFactory> factory =
68+
new SchemeHandlerFactory(env, jFactory);
6269
if (!factory)
6370
return JNI_FALSE;
6471

@@ -68,7 +75,7 @@ JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1RegisterSchemeHandlerFactory
6875
return result ? JNI_TRUE : JNI_FALSE;
6976
}
7077

71-
JNIEXPORT jboolean JNICALL Java_org_cef_CefApp_N_1ClearSchemeHandlerFactories
72-
(JNIEnv *, jobject) {
78+
JNIEXPORT jboolean JNICALL
79+
Java_org_cef_CefApp_N_1ClearSchemeHandlerFactories(JNIEnv*, jobject) {
7380
return CefClearSchemeHandlerFactories() ? JNI_TRUE : JNI_FALSE;
7481
}

‎native/CefApp.h‎

Lines changed: 20 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎native/CefAuthCallback_N.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@
66
#include "include/cef_request_handler.h"
77
#include "jni_util.h"
88

9-
JNIEXPORT void JNICALL Java_org_cef_callback_CefAuthCallback_1N_N_1Continue
10-
(JNIEnv *env, jobject obj, jstring username, jstring password) {
9+
JNIEXPORT void JNICALL
10+
Java_org_cef_callback_CefAuthCallback_1N_N_1Continue(JNIEnv* env,
11+
jobject obj,
12+
jstring username,
13+
jstring password) {
1114
CefRefPtr<CefAuthCallback> callback =
1215
GetCefFromJNIObject<CefAuthCallback>(env, obj, "CefAuthCallback");
1316
if (!callback.get())
@@ -18,8 +21,8 @@ JNIEXPORT void JNICALL Java_org_cef_callback_CefAuthCallback_1N_N_1Continue
1821
SetCefForJNIObject<CefAuthCallback>(env, obj, NULL, "CefAuthCallback");
1922
}
2023

21-
JNIEXPORT void JNICALL Java_org_cef_callback_CefAuthCallback_1N_N_1Cancel
22-
(JNIEnv *env, jobject obj) {
24+
JNIEXPORT void JNICALL
25+
Java_org_cef_callback_CefAuthCallback_1N_N_1Cancel(JNIEnv* env, jobject obj) {
2326
CefRefPtr<CefAuthCallback> callback =
2427
GetCefFromJNIObject<CefAuthCallback>(env, obj, "CefAuthCallback");
2528
if (!callback.get())

‎native/CefAuthCallback_N.h‎

Lines changed: 7 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎native/CefBeforeDownloadCallback_N.cpp‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,22 @@
66
#include "include/cef_download_handler.h"
77
#include "jni_util.h"
88

9-
JNIEXPORT void JNICALL Java_org_cef_callback_CefBeforeDownloadCallback_1N_N_1Continue
10-
(JNIEnv *env, jobject obj, jstring jdownloadPath, jboolean jshowDialog) {
9+
JNIEXPORT void JNICALL
10+
Java_org_cef_callback_CefBeforeDownloadCallback_1N_N_1Continue(
11+
JNIEnv* env,
12+
jobject obj,
13+
jstring jdownloadPath,
14+
jboolean jshowDialog) {
1115
CefRefPtr<CefBeforeDownloadCallback> callback =
12-
GetCefFromJNIObject<CefBeforeDownloadCallback>(env, obj, "CefBeforeDownloadCallback");
16+
GetCefFromJNIObject<CefBeforeDownloadCallback>(
17+
env, obj, "CefBeforeDownloadCallback");
1318
if (!callback.get())
1419
return;
1520

1621
callback->Continue(GetJNIString(env, jdownloadPath),
1722
jshowDialog != JNI_FALSE);
1823

1924
// Clear the reference added in DownloadHandler::OnBeforeDownload.
20-
SetCefForJNIObject<CefBeforeDownloadCallback>(env, obj, NULL, "CefBeforeDownloadCallback");
25+
SetCefForJNIObject<CefBeforeDownloadCallback>(env, obj, NULL,
26+
"CefBeforeDownloadCallback");
2127
}

‎native/CefBeforeDownloadCallback_N.h‎

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)