From 9bba6cf6ebdb1f174312d447711f3a9a2d33fbe2 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 21 Oct 2019 10:15:53 +0200 Subject: Update Chromium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes: b5d06a458283 [Backport] Security issue 946978 [1/2] 4f553e3a0c62 [Backport] Security issue 946978 [2/2] 32d77d99be3f [Backport] CVE-2019-13674 2a45953d844a [Backport] CVE-2019-13675 2708f4fe1f1a [Backport] Plumb initiating origin info to download stack. 1d21cbce407f [Backport] CVE-2019-13678/CVE-2019-13681 0da18c7f04e3 [Backport] Security issue 960354 4e50fd02436d [Backport] Security issue 973628 9e3becc64121 [Backport] Security issue 979373 729e9b30bbf2 [Backport] Security issue 981459 28150e5eb962 [Backport] Security issue 981597 843d70ac87de [Backport] Security issue 971904 Fixes: QTBUG-79193 Change-Id: Ic90455446f79500d5971a975e2a04344f65238ac Reviewed-by: Michael Brüning --- src/3rdparty | 2 +- src/core/content_browser_client_qt.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty b/src/3rdparty index 18d4c6e82..843d70ac8 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 18d4c6e8250324d084d89b17ad80721bb46ddbd9 +Subproject commit 843d70ac87de7482c1c1195aa73899bc05efc8f3 diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index 04a8fc363..6d1bf07a9 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -196,7 +196,7 @@ public: void* GetHandle() override { return m_handle; } // Qt currently never creates contexts using robustness attributes. - bool WasAllocatedUsingRobustnessExtension() override { return false; } + unsigned int CheckStickyGraphicsResetStatus() override { return 0 /*GL_NO_ERROR*/; } // We don't care about the rest, this context shouldn't be used except for its handle. bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) override { Q_UNREACHABLE(); return false; } -- cgit v1.2.3