From 798134400a22f878b6cfd186b3792ecedb4d9123 Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Tue, 1 Apr 2014 14:46:37 +0200
Subject: Get rid of the BackingStore rendering path

Now that the widgets view is also using the delegated renderer,
there are no supported configuration that use the BackingStore
rendering path, itself on the way of deprecation in Chromium.

Change-Id: I4ab889f6a7c65e8447c259faf2c7a98b88c1acf5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/webengine/api/qquickwebengineview.cpp | 36 ++++++++++---------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

(limited to 'src/webengine/api/qquickwebengineview.cpp')

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 587d3aa9f..93cc1c9a1 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -68,7 +68,7 @@
 QT_BEGIN_NAMESPACE
 
 QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
-    : adapter(new WebContentsAdapter(qApp->property("QQuickWebEngineView_DisableHardwareAcceleration").toBool() ? SoftwareRenderingMode : HardwareAccelerationMode))
+    : adapter(new WebContentsAdapter)
     , e(new QQuickWebEngineViewExperimental(this))
     , v(new QQuickWebEngineViewport(this))
     , m_history(new QQuickWebEngineHistory(this))
@@ -119,35 +119,23 @@ UIDelegatesManager *QQuickWebEngineViewPrivate::ui()
     return m_uIDelegatesManager.data();
 }
 
-RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode mode)
+RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client)
 {
-    if (mode == HardwareAccelerationMode)
-        return new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ false);
-    return new RenderWidgetHostViewQtDelegateQuickPainted(client, false);
+    return new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ false);
 }
 
-RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client, WebContentsAdapterClient::RenderingMode mode)
+RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegateForPopup(RenderWidgetHostViewQtDelegateClient *client)
 {
     Q_Q(QQuickWebEngineView);
     const bool hasWindowCapability = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MultipleWindows);
-    if (mode == HardwareAccelerationMode) {
-        RenderWidgetHostViewQtDelegateQuick *quickDelegate = new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */true);
-        if (hasWindowCapability) {
-            RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(quickDelegate);
-            quickDelegate->setParentItem(wrapperWindow->contentItem());
-            return wrapperWindow;
-        }
-        quickDelegate->setParentItem(q);
-        return quickDelegate;
-    }
-    RenderWidgetHostViewQtDelegateQuickPainted *paintedDelegate = new RenderWidgetHostViewQtDelegateQuickPainted(client, /*isPopup = */true);
+    RenderWidgetHostViewQtDelegateQuick *quickDelegate = new RenderWidgetHostViewQtDelegateQuick(client, /*isPopup = */ true);
     if (hasWindowCapability) {
-        RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(paintedDelegate);
-        paintedDelegate->setParentItem(wrapperWindow->contentItem());
+        RenderWidgetHostViewQtDelegateQuickWindow *wrapperWindow = new RenderWidgetHostViewQtDelegateQuickWindow(quickDelegate);
+        quickDelegate->setParentItem(wrapperWindow->contentItem());
         return wrapperWindow;
     }
-    paintedDelegate->setParentItem(q);
-    return paintedDelegate;
+    quickDelegate->setParentItem(q);
+    return quickDelegate;
 }
 
 bool QQuickWebEngineViewPrivate::contextMenuRequested(const WebEngineContextMenuData &data)
@@ -509,8 +497,7 @@ void QQuickWebEngineView::setInspectable(bool enable)
 void QQuickWebEngineView::forceActiveFocus()
 {
     Q_FOREACH (QQuickItem *child, childItems()) {
-        if (qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)
-            || qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child)) {
+        if (qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)) {
             child->forceActiveFocus();
             break;
         }
@@ -578,8 +565,7 @@ void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRect
     QQuickItem::geometryChanged(newGeometry, oldGeometry);
 
     Q_FOREACH(QQuickItem *child, childItems()) {
-        Q_ASSERT(qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child)
-                 || qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child));
+        Q_ASSERT(qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child));
         child->setSize(newGeometry.size());
     }
 }
-- 
cgit v1.2.3