Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ hs_err_pid*.log

# Do not commit CEF binaries
/java/org.eclipse.set.browser.cef.win32/cef
/cef
/cef
cef
2 changes: 1 addition & 1 deletion CEF_VERSION.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file contains the CEF browser version used for Jenkins
#
cef_binary_122.1.8+g40272b5+chromium-122.0.6261.69_windows64_minimal
cef_binary_145.0.28+g51162e8+chromium-145.0.7632.160_windows64_minimal
4 changes: 2 additions & 2 deletions cef.deps
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Listed below are the current CEF and Chromium versions for Eclipse Dash
# The CEF version should match CEF_VERSION.txt
# The Chromium version should match the Chromium version used to build CEF
git/github/chromiumembedded/cef/40272b5bc5890fc897011f81ee4e6f86e2f7ece9
git/github/chromium/chromium/122.0.6261.69
git/github/chromiumembedded/cef/51162e83c6f21779c0a3bc110589aff9ead2af33
git/github/chromium/chromium/145.0.7632.160
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,22 @@ private long get_browser_process_handler(final long app) {
}

@SuppressWarnings({ "unused", "static-method" }) // Called via JNI
private void on_before_command_line_processing(final long app, final long process_type, final long command_line) {
private void on_before_command_line_processing(final long app,
final long process_type, final long command_line) {
// Disable updating Chromium components from Google servers
cef_command_line_t.cefswt_append_switch(command_line, "use-gl", "angle");
cef_command_line_t.cefswt_append_switch(command_line, "use-angle", "vulkan");

cef_command_line_t.cefswt_append_switch(command_line, "disable-component-update", null);

cef_command_line_t.cefswt_append_switch(command_line, "use-gl",
"angle");
cef_command_line_t.cefswt_append_switch(command_line, "use-angle",
"vulkan");

cef_command_line_t.cefswt_append_switch(command_line,
"disable-component-update", null);
cef_command_line_t.cefswt_append_switch(command_line,
"force-light-mode", null);
// If debugging is enabled, allow remote debugging
if (ChromiumStatic.getCEFConfiguration().DebugPort != 0) {
cef_command_line_t.cefswt_append_switch(command_line, "remote-allow-origins", "*");
cef_command_line_t.cefswt_append_switch(command_line,
"remote-allow-origins", "*");
}
}
}
31 changes: 10 additions & 21 deletions native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 17 additions & 2 deletions native/chromium/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ fn gen_cef(cef_path: std::path::Display) {
.blocklist_type("char16")
.blocklist_type("u?int64")
.blocklist_type("DWORD")
.blocklist_type("HWND.*")
.blocklist_type("HINSTANCE.*")
.blocklist_type("HMENU.*")
.blocklist_type("HICON.*")
Expand All @@ -103,6 +102,9 @@ fn gen_cef(cef_path: std::path::Display) {
.raw_line("pub type time_t = i64;")
.raw_line("pub type int64 = ::std::os::raw::c_longlong;")
.raw_line("pub type uint64 = ::std::os::raw::c_ulonglong;")
// The API Version should be change by update CEF version.
// See: https://github.com/chromiumembedded/cef/blob/master/cef_api_versions.json
.raw_line("pub const CEF_API_VERSION: std::os::raw::c_int = 14500;")
.generate()
.expect("Failed to gencef")
.to_string();
Expand Down Expand Up @@ -164,8 +166,21 @@ fn generator(cef_path: std::path::Display) -> bindgen::Builder {
.clang_arg(format!("-I{cef_path}"))
.clang_arg(format!(
"-I{}",
"C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v7.1A\\Include"
"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\VC\\Tools\\MSVC\\14.44.35207\\include"
))
.clang_arg(format!(
"-I{}",
"C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\shared"
))
.clang_arg(format!(
"-I{}",
"C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\um"
))
.clang_arg(format!(
"-I{}",
"C:\\Program Files (x86)\\Windows Kits\\10\\Include\\10.0.26100.0\\ucrt"
))
.clang_arg("--target=x86_64-pc-windows-msvc")
.clang_arg("-fparse-all-comments")
.clang_arg("-Wno-nonportable-include-path")
.clang_arg("-Wno-invalid-token-paste")
Expand Down
Loading
Loading