diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-13 11:14:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-15 13:49:20 +0100 |
| commit | 42a4854214a7440f482f0ba613725701688a7efe (patch) | |
| tree | 56f52c9a3141de3cb06759c87845b5ed2b03e831 /lib/quick/qquickwebengineview.cpp | |
| parent | f5be472e0ba4aa19d0c0f91a848dfa5be9ebaa3b (diff) | |
Delegated renderer: enable by default for QQuickWebView.
This also allows the software code path to be enabled:
- Programmatically by setting this dynamic property on the QCoreApplication:
"QQuickWebEngineView_DisableHardwareAcceleration"
- Through the Chromium command line switch "--disable-delegated-renderer"
for quick development use cases.
Change-Id: I32136d880444e0a24f042c7c4862950b7ed0c910
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/quick/qquickwebengineview.cpp')
| -rw-r--r-- | lib/quick/qquickwebengineview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/quick/qquickwebengineview.cpp b/lib/quick/qquickwebengineview.cpp index 0fad5c985..970033a22 100644 --- a/lib/quick/qquickwebengineview.cpp +++ b/lib/quick/qquickwebengineview.cpp @@ -50,17 +50,17 @@ QT_BEGIN_NAMESPACE QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() - : adapter(new WebContentsAdapter) + : adapter(new WebContentsAdapter(qApp->property("QQuickWebEngineView_DisableHardwareAcceleration").toBool() ? SoftwareRenderingMode : HardwareAccelerationMode)) , loadProgress(0) , inspectable(false) { adapter->initialize(this); } -RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, CompositingMode mode) +RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode mode) { #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0)) - if (mode == DelegatedCompositing) + if (mode == HardwareAccelerationMode) return new RenderWidgetHostViewQtDelegateQuick(client); #endif return new RenderWidgetHostViewQtDelegateQuickPainted(client); |