diff options
Diffstat (limited to 'src/core/web_engine_context.cpp')
| -rw-r--r-- | src/core/web_engine_context.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 9199bd102..e98dcd961 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -84,12 +84,14 @@ #include "content_browser_client_qt.h" #include "content_client_qt.h" #include "content_main_delegate_qt.h" -#include "dev_tools_http_handler_delegate_qt.h" +#include "devtools_manager_delegate_qt.h" #include "gl_context_qt.h" #include "media_capture_devices_dispatcher.h" #include "type_conversion.h" #include "surface_factory_qt.h" #include "web_engine_library_info.h" +#include "webui/webui_controller_factory_qt.h" + #include <QFileInfo> #include <QGuiApplication> #include <QOffscreenSurface> @@ -375,6 +377,8 @@ WebEngineContext::WebEngineContext() // upstream Chromium commit ba52f56207a4b9d70b34880fbff2352e71a06422. parsedCommandLine->AppendSwitchASCII(switches::kEnableFeatures, features::kAllowContentInitiatedDataUrlNavigations.name); + // If the renderer renders the validation messages, we no longer get the callbacks we have in the API. + parsedCommandLine->AppendSwitchASCII(switches::kDisableBlinkFeatures, "ValidationBubbleInRenderer"); if (useEmbeddedSwitches) { parsedCommandLine->AppendSwitchASCII(switches::kEnableFeatures, features::kOverlayScrollbar.name); @@ -386,7 +390,6 @@ WebEngineContext::WebEngineContext() parsedCommandLine->AppendSwitch(switches::kDisableGpuShaderDiskCache); parsedCommandLine->AppendSwitch(switches::kDisable2dCanvasAntialiasing); parsedCommandLine->AppendSwitch(cc::switches::kDisableCompositedAntialiasing); - parsedCommandLine->AppendSwitchASCII(switches::kProfilerTiming, switches::kProfilerTimingDisabledValue); } GLContextHelper::initialize(); @@ -462,8 +465,9 @@ WebEngineContext::WebEngineContext() } } - if (qt_gl_global_share_context()->format().profile() == QSurfaceFormat::CompatibilityProfile) - parsedCommandLine->AppendSwitch(switches::kCreateDefaultGLContext); +// FIXME: +// if (qt_gl_global_share_context()->format().profile() == QSurfaceFormat::CompatibilityProfile) +// parsedCommandLine->AppendSwitch(switches::kCreateDefaultGLContext); } else { qWarning("WebEngineContext used before QtWebEngine::initialize() or OpenGL context creation failed."); } @@ -530,6 +534,8 @@ WebEngineContext::WebEngineContext() #if BUILDFLAG(ENABLE_BASIC_PRINTING) m_printJobManager.reset(new printing::PrintJobManager()); #endif // defined(ENABLE_BASIC_PRINTING) + + content::WebUIControllerFactory::RegisterFactory(WebUIControllerFactoryQt::GetInstance()); } #if BUILDFLAG(ENABLE_BASIC_PRINTING) |