diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2023-09-15 14:54:08 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2023-09-18 13:40:16 +0200 |
| commit | b1bfad0a8ff5fa563751d4949238d75223b59fcd (patch) | |
| tree | 5b1c8b5c4de3213a88b2a59110591c801601f849 | |
| parent | 07352bf1ca359cb6bd944537bbe80f3063f326cf (diff) | |
Update Chromium
Submodule src/3rdparty 31f287a0..ef090c47:
* [Backport] Security bug 1427288 (2/2)
* [Backport] Security bug 1427288 (1/2)
* [Backport] Security bug 1449166
* [Backport] CVE-2023-4909: Inappropriate implementation in Interstitials
* [Backport] CVE-2023-4908: Inappropriate implementation in Picture in Picture
* [Backport] CVE-2023-4902: Inappropriate implementation in Input
* Fixup [Backport] CVE-2023-2724: Type Confusion in V8
Pick-to: 6.5
Task-number: QTBUG-116934
Change-Id: Id747cab635a75215d52156c139b73e671c79380b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | CHROMIUM_VERSION | 2 | ||||
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/devtools_frontend_qt.cpp | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/CHROMIUM_VERSION b/CHROMIUM_VERSION index 5d8248fa5..ea03ba173 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ Based on Chromium version: 108.0.5359.181 -Patched with security patches up to Chromium version: 116.0.5845.187 +Patched with security patches up to Chromium version: 117.0.5938.63 diff --git a/src/3rdparty b/src/3rdparty -Subproject 31f287a0142b6b78698504b528d35c9506dcdb4 +Subproject ef090c47d08c734ae2b3c1db508982aca0f3ee1 diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp index a1b9ae91c..3fddd3410 100644 --- a/src/core/devtools_frontend_qt.cpp +++ b/src/core/devtools_frontend_qt.cpp @@ -62,7 +62,7 @@ DevToolsFrontendQt *DevToolsFrontendQt::Show(QSharedPointer<WebContentsAdapter> new DevToolsFrontendQt(frontendAdapter, inspectedContents); if (contents->GetURL() == GURL(GetFrontendURL())) { - contents->GetController().Reload(content::ReloadType::ORIGINAL_REQUEST_URL, false); + contents->GetController().LoadOriginalRequestURL(); } else { content::NavigationController::LoadURLParams loadParams((GURL(GetFrontendURL()))); loadParams.transition_type = ui::PageTransitionFromInt(ui::PAGE_TRANSITION_AUTO_TOPLEVEL diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 7bff7edca..be462a22d 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -937,7 +937,7 @@ const char *qWebEngineChromiumVersion() noexcept const char *qWebEngineChromiumSecurityPatchVersion() noexcept { - return "116.0.5845.187"; // FIXME: Remember to update + return "117.0.5938.63"; // FIXME: Remember to update } QT_END_NAMESPACE |