From a4dcc5b4894aac423f65fcf9a13394078ee72257 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Tue, 20 Sep 2016 03:51:55 -0700
Subject: Remove experimental Quick API

QtWebEngine.experimental import is not working. It is better to
get rid of that.
It also removes some QNX-specific code.

Change-Id: If80c1290b4d5f5e4d436c49bd7d7a6ea882ee6db
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
---
 src/webengine/api/qquickwebengineview.cpp | 86 +------------------------------
 1 file changed, 1 insertion(+), 85 deletions(-)

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

diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index fd1e746a8..2876e4fb4 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -127,8 +127,6 @@ static QAccessibleInterface *webAccessibleFactory(const QString &, QObject *obje
 
 QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     : adapter(0)
-    , e(new QQuickWebEngineViewExperimental(this))
-    , v(new QQuickWebEngineViewport(this))
     , m_history(new QQuickWebEngineHistory(this))
     , m_profile(QQuickWebEngineProfile::defaultProfile())
     , m_settings(new QQuickWebEngineSettings(m_profile->settings()))
@@ -149,23 +147,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     , m_defaultZoomFactor(1.0)
     , m_ui2Enabled(false)
 {
-    // The gold standard for mobile web content is 160 dpi, and the devicePixelRatio expected
-    // is the (possibly quantized) ratio of device dpi to 160 dpi.
-    // However GUI toolkits on non-iOS platforms may be using different criteria than relative
-    // DPI (depending on the history of that platform), dictating the choice of
-    // QScreen::devicePixelRatio().
-    // Where applicable (i.e. non-iOS mobile platforms), override QScreen::devicePixelRatio
-    // and instead use a reasonable default value for viewport.devicePixelRatio to avoid every
-    // app having to use this experimental API.
     QString platform = qApp->platformName().toLower();
-    if (platform == QLatin1String("qnx")) {
-        qreal webPixelRatio = QGuiApplication::primaryScreen()->physicalDotsPerInch() / 160;
-
-        // Quantize devicePixelRatio to increments of 1 to allow JS and media queries to select
-        // 1x, 2x, 3x etc assets that fit an integral number of pixels.
-        setDevicePixelRatio(qMax(1, qRound(webPixelRatio)));
-    }
-
     if (platform == QLatin1Literal("eglfs"))
         m_ui2Enabled = true;
 
@@ -194,16 +176,6 @@ QQuickWebEngineViewPrivate::~QQuickWebEngineViewPrivate()
 {
 }
 
-QQuickWebEngineViewExperimental *QQuickWebEngineViewPrivate::experimental() const
-{
-    return e.data();
-}
-
-QQuickWebEngineViewport *QQuickWebEngineViewPrivate::viewport() const
-{
-    return v.data();
-}
-
 UIDelegatesManager *QQuickWebEngineViewPrivate::ui()
 {
     Q_Q(QQuickWebEngineView);
@@ -891,7 +863,7 @@ QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
     , d_ptr(new QQuickWebEngineViewPrivate)
 {
     Q_D(QQuickWebEngineView);
-    d->e->q_ptr = d->q_ptr = this;
+    d->q_ptr = this;
     this->setActiveFocusOnTab(true);
     this->setFlags(QQuickItem::ItemIsFocusScope | QQuickItem::ItemAcceptsInputMethod
                    | QQuickItem::ItemAcceptsDrops);
@@ -1266,12 +1238,6 @@ void QQuickWebEngineView::runJavaScript(const QString &script, quint32 worldId,
         d->adapter->runJavaScript(script, worldId);
 }
 
-QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const
-{
-    Q_D(const QQuickWebEngineView);
-    return d->e.data();
-}
-
 qreal QQuickWebEngineView::zoomFactor() const
 {
     Q_D(const QQuickWebEngineView);
@@ -1380,19 +1346,6 @@ bool QQuickWebEngineView::isFullScreen() const
     return d->m_fullscreenMode;
 }
 
-void QQuickWebEngineViewExperimental::setExtraContextMenuEntriesComponent(QQmlComponent *contextMenuExtras)
-{
-    if (d_ptr->contextMenuExtraItems == contextMenuExtras)
-        return;
-    d_ptr->contextMenuExtraItems = contextMenuExtras;
-    emit extraContextMenuEntriesComponentChanged();
-}
-
-QQmlComponent *QQuickWebEngineViewExperimental::extraContextMenuEntriesComponent() const
-{
-    return d_ptr->contextMenuExtraItems;
-}
-
 void QQuickWebEngineView::findText(const QString &subString, FindFlags options, const QJSValue &callback)
 {
     Q_D(QQuickWebEngineView);
@@ -1825,42 +1778,5 @@ void QQuickWebEngineFullScreenRequest::reject()
         m_viewPrivate->setFullScreenMode(!m_toggleOn);
 }
 
-QQuickWebEngineViewExperimental::QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate *viewPrivate)
-    : q_ptr(0)
-    , d_ptr(viewPrivate)
-{
-}
-
-QQuickWebEngineViewport *QQuickWebEngineViewExperimental::viewport() const
-{
-    Q_D(const QQuickWebEngineView);
-    return d->viewport();
-}
-
-QQuickWebEngineViewport::QQuickWebEngineViewport(QQuickWebEngineViewPrivate *viewPrivate)
-    : d_ptr(viewPrivate)
-{
-}
-
-qreal QQuickWebEngineViewport::devicePixelRatio() const
-{
-    Q_D(const QQuickWebEngineView);
-    return d->devicePixelRatio;
-}
-
-void QQuickWebEngineViewport::setDevicePixelRatio(qreal devicePixelRatio)
-{
-    Q_D(QQuickWebEngineView);
-    // Valid range is [1, inf)
-    devicePixelRatio = qMax(qreal(1.0), devicePixelRatio);
-    if (d->devicePixelRatio == devicePixelRatio)
-        return;
-    d->setDevicePixelRatio(devicePixelRatio);
-    if (!d->adapter)
-        return;
-    d->adapter->dpiScaleChanged();
-    Q_EMIT devicePixelRatioChanged();
-}
-
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3