diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2023-09-15 14:44:53 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2023-09-18 12:08:23 +0200 |
| commit | 17c036b2a20f55daf7edcdafaf603a77130b8b04 (patch) | |
| tree | ace15979889870cd0bae6e3485aec9946a1207ae | |
| parent | 18d7d96ef86802696e8cb81d4c272a782e59304e (diff) | |
Update Chromium
Submodule src/3rdparty a71ba6ff..14780aaa:
* [Backport] Security bug 1427288 (2/2)
* [Backport] Security bug 1427288 (1/2)
* [Backport] Security bug 1449166
* [Backport] Security bug 1469534
* [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
Pick-to: dev 6.6
Task-number: QTBUG-117059
Change-Id: I22da560b291cb984fffe1599a5f9845192458107
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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 1876305bd..a9ed5a339 100644 --- a/CHROMIUM_VERSION +++ b/CHROMIUM_VERSION @@ -1,3 +1,3 @@ Based on Chromium version: 112.0.5615.213 -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 a71ba6ffc8e34033b93c0727e8d7eb17f7d6a25 +Subproject 14780aaa6b0f85a6912878b3874c18e63c99a5d diff --git a/src/core/devtools_frontend_qt.cpp b/src/core/devtools_frontend_qt.cpp index 49fc0d3aa..047026826 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 6c19428e5..545205de8 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -931,7 +931,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 |