diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:59:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:59:38 +0100 |
| commit | 9cbab1f88659b1cb7f92994b73043a431deace73 (patch) | |
| tree | 350e7fcfa1e49a095141251fe4cd248c87974718 | |
| parent | 6921ebd6d8bc8bb62d9118c7a1a750f2fd787897 (diff) | |
| parent | efa6d3f0d3a01753dd40823ce119e7d4f9765c8e (diff) | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I331f4b2b0348d5ee1fb8ff83803bfc9cd359c2d3
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 3 | ||||
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 4368c7380883fd6b32d913d27a5b8f51f615068 +Subproject e36dcec23b79a52fd7794ed2fad49bbf65a8146 diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index bc8d1d3eb..3f008fe49 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -69,6 +69,7 @@ #include "content/renderer/in_process_renderer_thread.h" #include "content/utility/in_process_utility_thread.h" #include "gpu/command_buffer/service/gpu_switches.h" +#include "gpu/ipc/host/gpu_switches.h" #include "net/base/port_util.h" #include "ppapi/features/features.h" #include "ui/events/event_switches.h" @@ -342,6 +343,8 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kDisableAcceleratedVideoDecode); // Same problem with Pepper using OpenGL images. parsedCommandLine->AppendSwitch(switches::kDisablePepper3DImageChromium); + // Same problem with select popups. + parsedCommandLine->AppendSwitch(switches::kDisableNativeGpuMemoryBuffers); #endif #if defined(Q_OS_WIN) diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index e9ca573b7..904e4a551 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -89,7 +89,7 @@ \l{https://chromium.googlesource.com/chromium/src/+/master/docs/chromium_browser_vs_google_chrome.md}{overview} that is part of the documentation in the \l {Chromium Project} upstream source tree. - This version of Qt WebEngine is based on Chromium version 56.0.2924.122, with + This version of Qt WebEngine is based on Chromium version 61.0.3163.99, with additional security fixes from newer versions. \section2 Qt WebEngine Process |