diff --git a/base/files/file_util_win.cc b/base/files/file_util_win.cc index 14c8791c25b756..1ee643a98148f6 100644 --- a/base/files/file_util_win.cc +++ b/base/files/file_util_win.cc @@ -1181,7 +1181,7 @@ bool PreReadFile(const FilePath& file_path, bool PreventExecuteMapping(const FilePath& path) { if (!base::FeatureList::IsEnabled( - features::kEnforceNoExecutableFileHandles)) { + features::kEnforceNoExecutableFileHandles) || base::win::GetVersion() == base::win::Version::PRE_XP) { return true; } diff --git a/skia/ext/font_utils.cc b/skia/ext/font_utils.cc index 3631af6cc95878..01b12a8de68a35 100644 --- a/skia/ext/font_utils.cc +++ b/skia/ext/font_utils.cc @@ -32,6 +32,7 @@ #endif #if BUILDFLAG(IS_WIN) +#include "base/command_line.h" #include "third_party/skia/include/ports/SkTypeface_win.h" #endif @@ -68,7 +69,9 @@ static sk_sp fontmgr_factory() { base::ComponentContextForProcess()->svc()->Connect(provider.NewRequest()); return SkFontMgr_New_Fuchsia(std::move(provider)); #elif BUILDFLAG(IS_WIN) - return SkFontMgr_New_DirectWrite(); + if (base::CommandLine::ForCurrentProcess()->HasSwitch("disable-direct-write")) + return SkFontMgr_New_GDI(); + return SkFontMgr_New_DirectWrite() ? SkFontMgr_New_DirectWrite() : SkFontMgr_New_GDI(); #elif defined(SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE) return SkFontMgr_New_Custom_Empty(); #else diff --git a/third_party/pdfium b/third_party/pdfium index 4c4f9ab25dab14..e59756e9f84d4e 160000 --- a/third_party/pdfium +++ b/third_party/pdfium @@ -1 +1 @@ -Subproject commit 4c4f9ab25dab142d7888f3258ab54df24b97b44f +Subproject commit e59756e9f84d4eb9baf78e35202bb1c632a0e641 diff --git a/third_party/skia b/third_party/skia index c6835e2d5ff641..8334278545cfb3 160000 --- a/third_party/skia +++ b/third_party/skia @@ -1 +1 @@ -Subproject commit c6835e2d5ff641dad9347ce4c2ff79dbc29cf9aa +Subproject commit 8334278545cfb3b92368c1f23c5b411872e9e972