Skip to content

Commit 23a6e96

Browse files
S1artiemagreenblatt
S1artie
authored and
magreenblatt
committed
Update to CEF version 94.4.2+g6a963ca+chromium-94.0.4606.61
CEF issue #3140 - Update include/base for C++11/14 features: - OVERRIDE -> override - NULL -> nullptr - scoped_ptr → std::unique_ptr - Implicit conversion of CefRefPtr<T> or scoped_refptr<T> to T* is gone; use .get() instead - The base::Bind() API has been deprecated and will be removed in M94. Use base::BindOnce or base::BindRepeating instead as appropriate. CEF commit 0cbc0a7: - Add two missing resource types to cef_resource_type_t enum
1 parent f5a19bc commit 23a6e96

94 files changed

Lines changed: 476 additions & 455 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.

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ set_property(GLOBAL PROPERTY OS_FOLDERS ON)
126126

127127
# Specify the CEF distribution version.
128128
if(NOT DEFINED CEF_VERSION)
129-
set(CEF_VERSION "92.0.25+gd15cfa8+chromium-92.0.4515.131")
129+
set(CEF_VERSION "94.4.2+g6a963ca+chromium-94.0.4606.61")
130130
endif()
131131

132132
# Determine the platform.

‎java/org/cef/network/CefRequest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public enum ResourceType {
3838
RT_SERVICE_WORKER, //!< Main resource of a service worker.
3939
RT_CSP_REPORT, //!< A report of Content Security Policy violations.
4040
RT_PLUGIN_RESOURCE, //!< A resource that a plugin requested.
41+
RT_NAVIGATION_PRELOAD_MAIN_FRAME, //!< A main-frame service worker navigation preload
42+
//!< request.
43+
RT_NAVIGATION_PRELOAD_SUB_FRAME, //!< A sub-frame service worker navigation preload request.
4144
}
4245

4346
/**

‎native/CefApp.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Java_org_cef_CefApp_N_1Startup(JNIEnv* env,
9797
// Can't use GetJNIString before the CEF library is loaded.
9898
std::string framework_path;
9999
if (pathToCefFramework) {
100-
const char* chr = env->GetStringUTFChars(pathToCefFramework, NULL);
100+
const char* chr = env->GetStringUTFChars(pathToCefFramework, nullptr);
101101
if (chr) {
102102
framework_path = chr;
103103
env->ReleaseStringUTFChars(pathToCefFramework, chr);

‎native/CefAuthCallback_N.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CefRefPtr<CefAuthCallback> GetSelf(jlong self) {
1515

1616
void ClearSelf(JNIEnv* env, jobject obj) {
1717
// Clear the reference added in RequestHandler::GetAuthCredentials.
18-
SetCefForJNIObject<CefAuthCallback>(env, obj, NULL, "CefAuthCallback");
18+
SetCefForJNIObject<CefAuthCallback>(env, obj, nullptr, "CefAuthCallback");
1919
}
2020

2121
} // namespace

‎native/CefBeforeDownloadCallback_N.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ CefRefPtr<CefBeforeDownloadCallback> GetSelf(jlong self) {
1515

1616
void ClearSelf(JNIEnv* env, jobject obj) {
1717
// Clear the reference added in DownloadHandler::OnBeforeDownload.
18-
SetCefForJNIObject<CefBeforeDownloadCallback>(env, obj, NULL,
18+
SetCefForJNIObject<CefBeforeDownloadCallback>(env, obj, nullptr,
1919
"CefBeforeDownloadCallback");
2020
}
2121

‎native/CefBrowser_N.cpp‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include "CefBrowser_N.h"
66

7-
#include "include/base/cef_bind.h"
7+
#include "include/base/cef_callback.h"
88
#include "include/cef_browser.h"
99
#include "include/cef_task.h"
1010
#include "include/wrapper/cef_closure_task.h"
@@ -944,7 +944,7 @@ void create(std::shared_ptr<JNIObjectsForCreate> objs,
944944
}
945945
#if defined(OS_WIN)
946946
CefWindowHandle parent = TempWindow::GetWindowHandle();
947-
if (objs->canvas != NULL) {
947+
if (objs->canvas != nullptr) {
948948
parent = GetHwndOfCanvas(objs->canvas, env);
949949
} else {
950950
// Do not activate hidden browser windows on creation.
@@ -965,7 +965,7 @@ void create(std::shared_ptr<JNIObjectsForCreate> objs,
965965
rect.height);
966966
#elif defined(OS_LINUX)
967967
CefWindowHandle parent = TempWindow::GetWindowHandle();
968-
if (objs->canvas != NULL) {
968+
if (objs->canvas != nullptr) {
969969
parent = GetDrawableOfCanvas(objs->canvas, env);
970970
}
971971
windowInfo.SetAsChild(parent, rect);
@@ -995,9 +995,9 @@ void create(std::shared_ptr<JNIObjectsForCreate> objs,
995995
lifeSpanHandler->registerJBrowser(globalRef);
996996

997997
// If parentBrowser is set, we want to show the DEV-Tools for that browser
998-
if (parentBrowser.get() != NULL) {
998+
if (parentBrowser.get() != nullptr) {
999999
CefPoint inspectAt;
1000-
if (objs->jinspectAt != NULL) {
1000+
if (objs->jinspectAt != nullptr) {
10011001
int x, y;
10021002
GetJNIPoint(env, objs->jinspectAt, &x, &y);
10031003
inspectAt.Set(x, y);
@@ -1039,7 +1039,7 @@ void getZoomLevel(CefRefPtr<CefBrowserHost> host,
10391039

10401040
void OnAfterParentChanged(CefRefPtr<CefBrowser> browser) {
10411041
if (!CefCurrentlyOn(TID_UI)) {
1042-
CefPostTask(TID_UI, base::Bind(&OnAfterParentChanged, browser));
1042+
CefPostTask(TID_UI, base::BindOnce(&OnAfterParentChanged, browser));
10431043
return;
10441044
}
10451045

@@ -1058,7 +1058,7 @@ void OnAfterParentChanged(CefRefPtr<CefBrowser> browser) {
10581058
jobject NewJNILongVector(JNIEnv* env, const std::vector<int64>& vals) {
10591059
ScopedJNIObjectLocal jvector(env, "java/util/Vector");
10601060
if (!jvector)
1061-
return NULL;
1061+
return nullptr;
10621062

10631063
std::vector<int64>::const_iterator iter;
10641064
for (iter = vals.begin(); iter != vals.end(); ++iter) {
@@ -1108,7 +1108,7 @@ CefPdfPrintSettings GetJNIPdfPrintSettings(JNIEnv* env, jobject obj) {
11081108

11091109
GetJNIFieldInt(env, cls, obj, "scale_factor", &settings.scale_factor);
11101110

1111-
jobject obj_margin_type = NULL;
1111+
jobject obj_margin_type = nullptr;
11121112
if (GetJNIFieldObject(env, cls, obj, "margin_type", &obj_margin_type,
11131113
"Lorg/cef/misc/CefPdfPrintSettings$MarginType;")) {
11141114
ScopedJNIObjectLocal margin_type(env, obj_margin_type);
@@ -1157,7 +1157,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1CreateBrowser(JNIEnv* env,
11571157
create(objs, windowHandle, osr, transparent);
11581158
} else {
11591159
CefPostTask(TID_UI,
1160-
base::Bind(&create, objs, windowHandle, osr, transparent));
1160+
base::BindOnce(&create, objs, windowHandle, osr, transparent));
11611161
}
11621162
return JNI_FALSE; // set asynchronously
11631163
}
@@ -1179,7 +1179,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1CreateDevTools(JNIEnv* env,
11791179
create(objs, windowHandle, osr, transparent);
11801180
} else {
11811181
CefPostTask(TID_UI,
1182-
base::Bind(&create, objs, windowHandle, osr, transparent));
1182+
base::BindOnce(&create, objs, windowHandle, osr, transparent));
11831183
}
11841184
return JNI_FALSE; // set asynchronously
11851185
}
@@ -1259,21 +1259,21 @@ Java_org_cef_browser_CefBrowser_1N_N_1GetIdentifier(JNIEnv* env, jobject obj) {
12591259

12601260
JNIEXPORT jobject JNICALL
12611261
Java_org_cef_browser_CefBrowser_1N_N_1GetMainFrame(JNIEnv* env, jobject obj) {
1262-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1262+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
12631263
CefRefPtr<CefFrame> frame = browser->GetMainFrame();
12641264
if (!frame)
1265-
return NULL;
1265+
return nullptr;
12661266
ScopedJNIFrame jframe(env, frame);
12671267
return jframe.Release();
12681268
}
12691269

12701270
JNIEXPORT jobject JNICALL
12711271
Java_org_cef_browser_CefBrowser_1N_N_1GetFocusedFrame(JNIEnv* env,
12721272
jobject obj) {
1273-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1273+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
12741274
CefRefPtr<CefFrame> frame = browser->GetFocusedFrame();
12751275
if (!frame)
1276-
return NULL;
1276+
return nullptr;
12771277
ScopedJNIFrame jframe(env, frame);
12781278
return jframe.Release();
12791279
}
@@ -1282,10 +1282,10 @@ JNIEXPORT jobject JNICALL
12821282
Java_org_cef_browser_CefBrowser_1N_N_1GetFrame(JNIEnv* env,
12831283
jobject obj,
12841284
jlong identifier) {
1285-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1285+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
12861286
CefRefPtr<CefFrame> frame = browser->GetFrame(identifier);
12871287
if (!frame)
1288-
return NULL;
1288+
return nullptr;
12891289
ScopedJNIFrame jframe(env, frame);
12901290
return jframe.Release();
12911291
}
@@ -1294,10 +1294,10 @@ JNIEXPORT jobject JNICALL
12941294
Java_org_cef_browser_CefBrowser_1N_N_1GetFrame2(JNIEnv* env,
12951295
jobject obj,
12961296
jstring name) {
1297-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1297+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
12981298
CefRefPtr<CefFrame> frame = browser->GetFrame(GetJNIString(env, name));
12991299
if (!frame)
1300-
return NULL;
1300+
return nullptr;
13011301
ScopedJNIFrame jframe(env, frame);
13021302
return jframe.Release();
13031303
}
@@ -1311,15 +1311,15 @@ Java_org_cef_browser_CefBrowser_1N_N_1GetFrameCount(JNIEnv* env, jobject obj) {
13111311
JNIEXPORT jobject JNICALL
13121312
Java_org_cef_browser_CefBrowser_1N_N_1GetFrameIdentifiers(JNIEnv* env,
13131313
jobject obj) {
1314-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1314+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
13151315
std::vector<int64> identifiers;
13161316
browser->GetFrameIdentifiers(identifiers);
13171317
return NewJNILongVector(env, identifiers);
13181318
}
13191319

13201320
JNIEXPORT jobject JNICALL
13211321
Java_org_cef_browser_CefBrowser_1N_N_1GetFrameNames(JNIEnv* env, jobject obj) {
1322-
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, NULL);
1322+
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj, nullptr);
13231323
std::vector<CefString> names;
13241324
browser->GetFrameNames(names);
13251325
return NewJNIStringVector(env, names);
@@ -1343,7 +1343,7 @@ JNIEXPORT void JNICALL
13431343
Java_org_cef_browser_CefBrowser_1N_N_1ViewSource(JNIEnv* env, jobject obj) {
13441344
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj);
13451345
CefRefPtr<CefFrame> mainFrame = browser->GetMainFrame();
1346-
CefPostTask(TID_UI, base::Bind(&CefFrame::ViewSource, mainFrame.get()));
1346+
CefPostTask(TID_UI, base::BindOnce(&CefFrame::ViewSource, mainFrame.get()));
13471347
}
13481348

13491349
JNIEXPORT void JNICALL
@@ -1414,7 +1414,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1Close(JNIEnv* env,
14141414
if (CefCurrentlyOn(TID_UI))
14151415
util::DestroyCefBrowser(browser);
14161416
else
1417-
CefPostTask(TID_UI, base::Bind(&util::DestroyCefBrowser, browser));
1417+
CefPostTask(TID_UI, base::BindOnce(&util::DestroyCefBrowser, browser));
14181418
}
14191419
} else {
14201420
browser->GetHost()->CloseBrowser(false);
@@ -1458,7 +1458,7 @@ Java_org_cef_browser_CefBrowser_1N_N_1GetZoomLevel(JNIEnv* env, jobject obj) {
14581458
CriticalLock lock;
14591459
CriticalWait waitCond(&lock);
14601460
lock.Lock();
1461-
CefPostTask(TID_UI, base::Bind(getZoomLevel, host, &waitCond, &result));
1461+
CefPostTask(TID_UI, base::BindOnce(getZoomLevel, host, &waitCond, &result));
14621462
waitCond.Wait(1000);
14631463
lock.Unlock();
14641464
}
@@ -1589,8 +1589,8 @@ Java_org_cef_browser_CefBrowser_1N_N_1WasResized(JNIEnv* env,
15891589
if (CefCurrentlyOn(TID_UI)) {
15901590
util::SetWindowSize(browserHandle, width, height);
15911591
} else {
1592-
CefPostTask(TID_UI, base::Bind(util::SetWindowSize, browserHandle,
1593-
(int)width, (int)height));
1592+
CefPostTask(TID_UI, base::BindOnce(util::SetWindowSize, browserHandle,
1593+
(int)width, (int)height));
15941594
}
15951595
}
15961596
#endif
@@ -2027,8 +2027,8 @@ Java_org_cef_browser_CefBrowser_1N_N_1UpdateUI(JNIEnv* env,
20272027
if (CefCurrentlyOn(TID_UI)) {
20282028
util::SetWindowBounds(windowHandle, contentRect);
20292029
} else {
2030-
CefPostTask(TID_UI,
2031-
base::Bind(util::SetWindowBounds, windowHandle, contentRect));
2030+
CefPostTask(TID_UI, base::BindOnce(util::SetWindowBounds, windowHandle,
2031+
contentRect));
20322032
}
20332033
#endif
20342034
}
@@ -2039,29 +2039,30 @@ Java_org_cef_browser_CefBrowser_1N_N_1SetParent(JNIEnv* env,
20392039
jlong windowHandle,
20402040
jobject canvas) {
20412041
CefRefPtr<CefBrowser> browser = JNI_GET_BROWSER_OR_RETURN(env, obj);
2042-
const base::Closure& callback = base::Bind(OnAfterParentChanged, browser);
2042+
base::OnceClosure callback = base::BindOnce(&OnAfterParentChanged, browser);
20432043

20442044
#if defined(OS_MACOSX)
20452045
util::SetParent(browser->GetHost()->GetWindowHandle(), windowHandle,
2046-
callback);
2046+
std::move(callback));
20472047
#else
20482048
CefWindowHandle browserHandle = browser->GetHost()->GetWindowHandle();
20492049
CefWindowHandle parentHandle =
20502050
canvas ? util::GetWindowHandle(env, canvas) : kNullWindowHandle;
20512051
if (CefCurrentlyOn(TID_UI)) {
2052-
util::SetParent(browserHandle, parentHandle, callback);
2052+
util::SetParent(browserHandle, parentHandle, std::move(callback));
20532053
} else {
20542054
#if defined(OS_LINUX)
20552055
CriticalLock lock;
20562056
CriticalWait waitCond(&lock);
20572057
lock.Lock();
2058-
CefPostTask(TID_UI, base::Bind(util::SetParentSync, browserHandle,
2059-
parentHandle, &waitCond, callback));
2058+
CefPostTask(TID_UI,
2059+
base::BindOnce(util::SetParentSync, browserHandle, parentHandle,
2060+
&waitCond, std::move(callback)));
20602061
waitCond.Wait(1000);
20612062
lock.Unlock();
20622063
#else
2063-
CefPostTask(TID_UI, base::Bind(util::SetParent, browserHandle, parentHandle,
2064-
callback));
2064+
CefPostTask(TID_UI, base::BindOnce(util::SetParent, browserHandle,
2065+
parentHandle, std::move(callback)));
20652066
#endif
20662067
}
20672068
#endif

‎native/CefCallback_N.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CefRefPtr<CefCallback> GetSelf(jlong self) {
1414

1515
void ClearSelf(JNIEnv* env, jobject obj) {
1616
// Clear the reference added in ResourceHandler.
17-
SetCefForJNIObject<CefCallback>(env, obj, NULL, "CefCallback");
17+
SetCefForJNIObject<CefCallback>(env, obj, nullptr, "CefCallback");
1818
}
1919

2020
} // namespace

0 commit comments

Comments
 (0)