diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2022-11-21 13:44:21 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2022-11-23 09:03:19 +0100 |
| commit | da2aa11b3a104fac2213d105460d0cb6c18fff99 (patch) | |
| tree | dcdc378cb3f951a7e6e5126b5be3f59fb4f07d06 | |
| parent | 3534d899857b4e9cff31dc3114b0fb2ecf3d9a47 (diff) | |
Update Chromium
Submodule src/3rdparty 9457651e..5e7f517e:
* [Backport] Security bug 1375290 (2/2)
* [Backport] Security bug 1375290 (1/2)
* [Backport] Dependency for security bug 1375290 (2/2)
* [Backport] Dependency for security bug 1375290 (1/2)
* [Backport] Security bug 1376639
* [Backport] Security bug 1378916
* [Backport] CVE-2022-3890: Heap buffer overflow in Crashpad
* [Backport] CVE-2022-3889: Type Confusion in V8
* [Backport] CVE-2022-3887: Use after free in Web Workers
* [Backport] CVE-2022-3888: Use after free in WebCodecs
* [Backport] CVE-2022-3885: Use after free in V8
* [Backport] Fix build in Python 3.11 (invalid mode: 'rU')
* mojo: fix compilation with C++20
* Make GrVkImage external
Also adds stubs to enable building with external GrVkImage.
Task-number: QTBUG-108106
Change-Id: I473d75421ab2099ce6d53a5ca09d68c3067413f7
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/chromium_overrides.cpp | 17 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
4 files changed, 19 insertions, 2 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 7a0c0d115..dbb6e8307 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ Based on Chromium version: 102.0.5005.177 -Patched with security patches up to Chromium version: 107.0.5304.88 +Patched with security patches up to Chromium version: 107.0.5304.110 diff --git a/src/3rdparty b/src/3rdparty -Subproject 9457651ead9b7034edb37532c2f33a558b1700b +Subproject 5e7f517eade60dd5f9409f32a44a8c5f897bb8c diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 3a183d0d8..3830c8683 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -10,6 +10,7 @@ #include "base/values.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/common/font_list.h" +#include "gpu/vulkan/buildflags.h" #include "extensions/buildflags/buildflags.h" #include "extensions/common/constants.h" #include "ui/base/dragdrop/os_exchange_data.h" @@ -19,6 +20,10 @@ #include <QFontDatabase> #include <QLibraryInfo> +#if BUILDFLAG(ENABLE_VULKAN) +#include "gpu/vulkan/init/vulkan_factory.h" +#endif + #if !QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions) #include "chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h" #endif @@ -28,6 +33,18 @@ void *GetQtXDisplay() return GLContextHelper::getXDisplay(); } +#if BUILDFLAG(ENABLE_VULKAN) +namespace gpu { +std::unique_ptr<VulkanImplementation> CreateVulkanImplementation(bool use_swiftshader, + bool allow_protected_memory) +{ + NOTIMPLEMENTED(); + return nullptr; +} +} // namespace gpu + +#endif + namespace content { class WebContentsView; class WebContentsViewDelegate; diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 94ff5f7b2..ff47b00e7 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -891,7 +891,7 @@ const char *qWebEngineChromiumVersion() noexcept } const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "107.0.5304.88"; // FIXME: Remember to update + return "107.0.5304.110"; // FIXME: Remember to update } QT_END_NAMESPACE |