diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-21 10:15:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-10-23 12:30:14 +0200 |
| commit | 9bba6cf6ebdb1f174312d447711f3a9a2d33fbe2 (patch) | |
| tree | ecb0a3b40a5efaf04e66aa64166ea8a527ae5ad4 | |
| parent | d8295dc15d8dd80089c8493a35c88d046d6a4884 (diff) | |
Update Chromium
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 <michael.bruning@qt.io>
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 18d4c6e8250324d084d89b17ad80721bb46ddbd +Subproject 843d70ac87de7482c1c1195aa73899bc05efc8f 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; } |