diff --git a/include/cef_api_hash.h b/include/cef_api_hash.h index de98789a6..9690c255e 100644 --- a/include/cef_api_hash.h +++ b/include/cef_api_hash.h @@ -42,9 +42,9 @@ // way that may cause binary incompatibility with other builds. The universal // hash value will change if any platform is affected whereas the platform hash // values will change only if that particular platform is affected. -#define CEF_API_HASH_UNIVERSAL "3aeebca8c3036dc66e9100f9d19681908f39f321" +#define CEF_API_HASH_UNIVERSAL "847b71b49130895cf4fb59fdb5be490ca29ef4ac" #if defined(OS_WIN) -#define CEF_API_HASH_PLATFORM "5dcd05c3516709113ae110e1602907bd0e027802" +#define CEF_API_HASH_PLATFORM "34ef9830e2b8dc5e4c930db28e279e2a70d9f4bf" #elif defined(OS_MAC) #define CEF_API_HASH_PLATFORM "9152ecd1a004d3c800af9c2ca12246554f91723c" #elif defined(OS_LINUX) diff --git a/include/internal/cef_app_win.h b/include/internal/cef_app_win.h index 3e8a3eeb9..a28d90596 100644 --- a/include/internal/cef_app_win.h +++ b/include/internal/cef_app_win.h @@ -86,13 +86,6 @@ CEF_EXPORT int cef_run_main_with_preferred_stack_size(mainPtr main, char* argv[]); #endif // defined(ARCH_CPU_32_BITS) -/// -/// Call during process startup to enable High-DPI support on Windows 7 or -/// newer. Older versions of Windows should be left DPI-unaware because they do -/// not support DirectWrite and GDI fonts are kerned very badly. -/// -CEF_EXPORT void cef_enable_highdpi_support(void); - /// /// Set to true (1) before calling Windows APIs like TrackPopupMenu that enter a /// modal message loop. Set to false (0) after exiting the modal message loop. diff --git a/include/internal/cef_win.h b/include/internal/cef_win.h index cccc6d52a..a37d21c5a 100644 --- a/include/internal/cef_win.h +++ b/include/internal/cef_win.h @@ -168,13 +168,6 @@ int CefRunWinMainWithPreferredStackSize(wWinMainPtr wWinMain, int CefRunMainWithPreferredStackSize(mainPtr main, int argc, char* argv[]); #endif // defined(ARCH_CPU_32_BITS) -/// -/// Call during process startup to enable High-DPI support on Windows 7 or -/// newer. Older versions of Windows should be left DPI-unaware because they do -/// not support DirectWrite and GDI fonts are kerned very badly. -/// -void CefEnableHighDPISupport(); - /// /// Set to true before calling Windows APIs like TrackPopupMenu that enter a /// modal message loop. Set to false after exiting the modal message loop. diff --git a/libcef/browser/context.cc b/libcef/browser/context.cc index e4539f31a..a9907219b 100644 --- a/libcef/browser/context.cc +++ b/libcef/browser/context.cc @@ -23,7 +23,6 @@ #if BUILDFLAG(IS_WIN) #include "base/debug/alias.h" #include "base/strings/utf_string_conversions.h" -#include "base/win/win_util.h" #include "chrome/chrome_elf/chrome_elf_main.h" #include "chrome/install_static/initialize_from_primary_module.h" #include "include/internal/cef_win.h" @@ -401,10 +400,6 @@ int CefRunMainWithPreferredStackSize(mainPtr main, int argc, char* argv[]) { } #endif // defined(ARCH_CPU_32_BITS) -void CefEnableHighDPISupport() { - base::win::EnableHighDPISupport(); -} - void CefSetOSModalLoop(bool osModalLoop) { // Verify that the context is in a valid state. if (!CONTEXT_STATE_VALID()) { diff --git a/libcef_dll/libcef_dll2.cc b/libcef_dll/libcef_dll2.cc index cdf6ebe75..94ecd77e5 100644 --- a/libcef_dll/libcef_dll2.cc +++ b/libcef_dll/libcef_dll2.cc @@ -67,10 +67,6 @@ CEF_EXPORT int cef_run_main_with_preferred_stack_size(mainPtr main, } #endif // defined(ARCH_CPU_32_BITS) -CEF_EXPORT void cef_enable_highdpi_support() { - CefEnableHighDPISupport(); -} - CEF_EXPORT void cef_set_osmodal_loop(int osModalLoop) { CefSetOSModalLoop(osModalLoop ? true : false); } diff --git a/libcef_dll/wrapper/libcef_dll_wrapper2.cc b/libcef_dll/wrapper/libcef_dll_wrapper2.cc index 02b1f8547..2eef0ada8 100644 --- a/libcef_dll/wrapper/libcef_dll_wrapper2.cc +++ b/libcef_dll/wrapper/libcef_dll_wrapper2.cc @@ -44,17 +44,6 @@ int CefRunMainWithPreferredStackSize(mainPtr main, int argc, char* argv[]) { } #endif // defined(ARCH_CPU_32_BITS) -NO_SANITIZE("cfi-icall") void CefEnableHighDPISupport() { - const char* api_hash = cef_api_hash(0); - if (strcmp(api_hash, CEF_API_HASH_PLATFORM)) { - // The libcef API hash does not match the current header API hash. - NOTREACHED(); - return; - } - - cef_enable_highdpi_support(); -} - NO_SANITIZE("cfi-icall") void CefSetOSModalLoop(bool osModalLoop) { cef_set_osmodal_loop(osModalLoop); } diff --git a/tests/cefclient/cefclient_win.cc b/tests/cefclient/cefclient_win.cc index d41108ea5..e4d4b34c7 100644 --- a/tests/cefclient/cefclient_win.cc +++ b/tests/cefclient/cefclient_win.cc @@ -35,9 +35,6 @@ namespace client { namespace { int RunMain(HINSTANCE hInstance, int nCmdShow) { - // Enable High-DPI support on Windows 7 or newer. - CefEnableHighDPISupport(); - CefMainArgs main_args(hInstance); void* sandbox_info = nullptr; diff --git a/tests/cefsimple/cefsimple_win.cc b/tests/cefsimple/cefsimple_win.cc index ad803c562..e44311669 100644 --- a/tests/cefsimple/cefsimple_win.cc +++ b/tests/cefsimple/cefsimple_win.cc @@ -46,9 +46,6 @@ int APIENTRY wWinMain(HINSTANCE hInstance, } #endif - // Enable High-DPI support on Windows 7 or newer. - CefEnableHighDPISupport(); - void* sandbox_info = nullptr; #if defined(CEF_USE_SANDBOX) diff --git a/tests/ceftests/run_all_unittests.cc b/tests/ceftests/run_all_unittests.cc index 427b3a708..392f1f84c 100644 --- a/tests/ceftests/run_all_unittests.cc +++ b/tests/ceftests/run_all_unittests.cc @@ -142,11 +142,6 @@ int main(int argc, char* argv[]) { CefTestSuite test_suite(argc, argv); #if defined(OS_WIN) - if (test_suite.command_line()->HasSwitch("enable-high-dpi-support")) { - // Enable High-DPI support on Windows 7 and newer. - CefEnableHighDPISupport(); - } - CefMainArgs main_args(::GetModuleHandle(nullptr)); #else CefMainArgs main_args(argc, argv);