summaryrefslogtreecommitdiffstats
path: root/src/webengine
diff options
context:
space:
mode:
Diffstat (limited to 'src/webengine')
-rw-r--r--src/webengine/api/qquickwebengineview.cpp256
-rw-r--r--src/webengine/api/qquickwebengineview_p.h104
-rw-r--r--src/webengine/api/qquickwebengineview_p_p.h102
-rw-r--r--src/webengine/api/qtwebengineglobal.h60
-rw-r--r--src/webengine/api/qtwebengineglobal_p.h64
-rw-r--r--src/webengine/plugin/experimental/experimental.pro15
-rw-r--r--src/webengine/plugin/experimental/plugin.cpp77
-rw-r--r--src/webengine/plugin/experimental/qmldir3
-rw-r--r--src/webengine/plugin/plugin.cpp64
-rw-r--r--src/webengine/plugin/plugin.pro13
-rw-r--r--src/webengine/plugin/qmldir3
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.cpp102
-rw-r--r--src/webengine/render_widget_host_view_qt_delegate_quick.h239
-rw-r--r--src/webengine/webengine.pro34
14 files changed, 1136 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
new file mode 100644
index 000000000..4cfff0102
--- /dev/null
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -0,0 +1,256 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickwebengineview_p.h"
+#include "qquickwebengineview_p_p.h"
+
+#include "web_contents_adapter.h"
+#include "render_widget_host_view_qt_delegate_quick.h"
+
+#include <QUrl>
+
+QT_BEGIN_NAMESPACE
+
+QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
+ : adapter(new WebContentsAdapter(qApp->property("QQuickWebEngineView_DisableHardwareAcceleration").toBool() ? SoftwareRenderingMode : HardwareAccelerationMode))
+ , e(new QQuickWebEngineViewExperimental(this))
+ , loadProgress(0)
+ , inspectable(false)
+{
+ adapter->initialize(this);
+}
+
+QQuickWebEngineViewExperimental *QQuickWebEngineViewPrivate::experimental() const
+{
+ return e;
+}
+
+RenderWidgetHostViewQtDelegate *QQuickWebEngineViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode mode)
+{
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+ if (mode == HardwareAccelerationMode)
+ return new RenderWidgetHostViewQtDelegateQuick(client);
+#endif
+ return new RenderWidgetHostViewQtDelegateQuickPainted(client);
+}
+
+void QQuickWebEngineViewPrivate::titleChanged(const QString &title)
+{
+ Q_Q(QQuickWebEngineView);
+ Q_UNUSED(title);
+ Q_EMIT q->titleChanged();
+}
+
+void QQuickWebEngineViewPrivate::urlChanged(const QUrl &url)
+{
+ Q_Q(QQuickWebEngineView);
+ Q_UNUSED(url);
+ Q_EMIT q->urlChanged();
+}
+
+void QQuickWebEngineViewPrivate::iconChanged(const QUrl &url)
+{
+ Q_Q(QQuickWebEngineView);
+ icon = url;
+ Q_EMIT q->iconChanged();
+}
+
+void QQuickWebEngineViewPrivate::loadingStateChanged()
+{
+ Q_Q(QQuickWebEngineView);
+ Q_EMIT q->loadingStateChanged();
+}
+
+void QQuickWebEngineViewPrivate::loadProgressChanged(int progress)
+{
+ Q_Q(QQuickWebEngineView);
+ loadProgress = progress;
+ Q_EMIT q->loadProgressChanged();
+}
+
+QRectF QQuickWebEngineViewPrivate::viewportRect() const
+{
+ Q_Q(const QQuickWebEngineView);
+ return QRectF(q->x(), q->y(), q->width(), q->height());
+}
+
+void QQuickWebEngineViewPrivate::loadFinished(bool success)
+{
+ Q_Q(QQuickWebEngineView);
+ Q_UNUSED(success);
+ Q_EMIT q->loadingStateChanged();
+}
+
+void QQuickWebEngineViewPrivate::focusContainer()
+{
+ Q_Q(QQuickWebEngineView);
+ q->forceActiveFocus();
+}
+
+void QQuickWebEngineViewPrivate::adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, const QRect &)
+{
+ Q_UNUSED(newWebContents);
+ Q_UNUSED(disposition);
+ Q_UNREACHABLE();
+}
+
+void QQuickWebEngineViewPrivate::close()
+{
+ Q_UNREACHABLE();
+}
+
+QQuickWebEngineView::QQuickWebEngineView(QQuickItem *parent)
+ : QQuickItem(*(new QQuickWebEngineViewPrivate), parent)
+{
+ Q_D(const QQuickWebEngineView);
+ d->e->q_ptr = this;
+}
+
+QQuickWebEngineView::~QQuickWebEngineView()
+{
+}
+
+QUrl QQuickWebEngineView::url() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->adapter->activeUrl();
+}
+
+void QQuickWebEngineView::setUrl(const QUrl& url)
+{
+ Q_D(QQuickWebEngineView);
+ d->adapter->load(url);
+}
+
+QUrl QQuickWebEngineView::icon() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->icon;
+}
+
+void QQuickWebEngineView::goBack()
+{
+ Q_D(QQuickWebEngineView);
+ d->adapter->navigateToOffset(-1);
+}
+
+void QQuickWebEngineView::goForward()
+{
+ Q_D(QQuickWebEngineView);
+ d->adapter->navigateToOffset(1);
+}
+
+void QQuickWebEngineView::reload()
+{
+ Q_D(QQuickWebEngineView);
+ d->adapter->reload();
+}
+
+void QQuickWebEngineView::stop()
+{
+ Q_D(QQuickWebEngineView);
+ d->adapter->stop();
+}
+
+bool QQuickWebEngineView::isLoading() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->adapter->isLoading();
+}
+
+int QQuickWebEngineView::loadProgress() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->loadProgress;
+}
+
+QString QQuickWebEngineView::title() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->adapter->pageTitle();
+}
+
+bool QQuickWebEngineView::canGoBack() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->adapter->canGoBack();
+}
+
+bool QQuickWebEngineView::canGoForward() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->adapter->canGoForward();
+}
+
+bool QQuickWebEngineView::inspectable() const
+{
+ Q_D(const QQuickWebEngineView);
+ return d->inspectable;
+}
+
+void QQuickWebEngineView::setInspectable(bool enable)
+{
+ Q_D(QQuickWebEngineView);
+ d->inspectable = enable;
+ d->adapter->enableInspector(enable);
+}
+
+void QQuickWebEngineView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+ QQuickItem::geometryChanged(newGeometry, oldGeometry);
+
+ Q_FOREACH(QQuickItem *child, childItems()) {
+ Q_ASSERT(
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+ qobject_cast<RenderWidgetHostViewQtDelegateQuick *>(child) ||
+#endif
+ qobject_cast<RenderWidgetHostViewQtDelegateQuickPainted *>(child));
+ child->setSize(newGeometry.size());
+ }
+}
+
+QQuickWebEngineViewExperimental::QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate *viewPrivate)
+ : q_ptr(0)
+ , d_ptr(viewPrivate)
+{
+}
+
+QT_END_NAMESPACE
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
new file mode 100644
index 000000000..943ce0804
--- /dev/null
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKWEBENGINEVIEW_P_H
+#define QQUICKWEBENGINEVIEW_P_H
+
+#include <qtwebengineglobal_p.h>
+#include <QQuickItem>
+
+QT_BEGIN_NAMESPACE
+
+class QQuickWebEngineViewPrivate;
+
+class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
+ Q_OBJECT
+ Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
+ Q_PROPERTY(QUrl icon READ icon NOTIFY iconChanged)
+ Q_PROPERTY(bool loading READ isLoading NOTIFY loadingStateChanged)
+ Q_PROPERTY(int loadProgress READ loadProgress NOTIFY loadProgressChanged)
+ Q_PROPERTY(QString title READ title NOTIFY titleChanged)
+ Q_PROPERTY(bool canGoBack READ canGoBack NOTIFY loadingStateChanged)
+ Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY loadingStateChanged)
+ Q_PROPERTY(bool inspectable READ inspectable WRITE setInspectable)
+
+public:
+ QQuickWebEngineView(QQuickItem *parent = 0);
+ ~QQuickWebEngineView();
+
+ QUrl url() const;
+ void setUrl(const QUrl&);
+ QUrl icon() const;
+ bool isLoading() const;
+ int loadProgress() const;
+ QString title() const;
+ bool canGoBack() const;
+ bool canGoForward() const;
+ bool inspectable() const;
+ void setInspectable(bool);
+
+public Q_SLOTS:
+ void goBack();
+ void goForward();
+ void reload();
+ void stop();
+
+Q_SIGNALS:
+ void titleChanged();
+ void urlChanged();
+ void iconChanged();
+ void loadingStateChanged();
+ void loadProgressChanged();
+
+protected:
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
+
+private:
+ Q_DECLARE_PRIVATE(QQuickWebEngineView)
+ friend class QQuickWebEngineViewExperimental;
+ friend class QQuickWebEngineViewExperimentalExtension;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QQuickWebEngineView)
+
+#endif // QQUICKWEBENGINEVIEW_P_H
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
new file mode 100644
index 000000000..e7c87ce1d
--- /dev/null
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKWEBENGINEVIEW_P_P_H
+#define QQUICKWEBENGINEVIEW_P_P_H
+
+#include "qquickwebengineview_p.h"
+#include "web_contents_adapter_client.h"
+
+#include <QSharedData>
+#include <QtQuick/private/qquickitem_p.h>
+
+class WebContentsAdapter;
+
+QT_BEGIN_NAMESPACE
+class QQuickWebEngineView;
+
+class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObject {
+ Q_OBJECT
+public:
+
+private:
+ QQuickWebEngineViewExperimental(QQuickWebEngineViewPrivate* viewPrivate);
+ QQuickWebEngineView *q_ptr;
+ QQuickWebEngineViewPrivate *d_ptr;
+
+ Q_DECLARE_PRIVATE(QQuickWebEngineView)
+ Q_DECLARE_PUBLIC(QQuickWebEngineView)
+};
+
+class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewPrivate : public QQuickItemPrivate, public WebContentsAdapterClient
+{
+public:
+ Q_DECLARE_PUBLIC(QQuickWebEngineView)
+ QQuickWebEngineViewPrivate();
+
+ QQuickWebEngineViewExperimental *experimental() const;
+
+ virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQtDelegateClient *client, RenderingMode) Q_DECL_OVERRIDE;
+ virtual void titleChanged(const QString&) Q_DECL_OVERRIDE;
+ virtual void urlChanged(const QUrl&) Q_DECL_OVERRIDE;
+ virtual void iconChanged(const QUrl&) Q_DECL_OVERRIDE;
+ virtual void loadingStateChanged() Q_DECL_OVERRIDE;
+ virtual void loadProgressChanged(int progress) Q_DECL_OVERRIDE;
+ virtual QRectF viewportRect() const Q_DECL_OVERRIDE;
+ virtual void loadFinished(bool success) Q_DECL_OVERRIDE;
+ virtual void focusContainer() Q_DECL_OVERRIDE;
+ virtual void adoptNewWindow(WebContentsAdapter *newWebContents, WindowOpenDisposition disposition, const QRect &) Q_DECL_OVERRIDE;
+ virtual void close() Q_DECL_OVERRIDE;
+ virtual bool contextMenuRequested(const WebEngineContextMenuData &) Q_DECL_OVERRIDE { return false;}
+ virtual bool javascriptDialog(JavascriptDialogType type, const QString &message, const QString &defaultValue = QString(), QString *result = 0) Q_DECL_OVERRIDE { return false; }
+
+ QExplicitlySharedDataPointer<WebContentsAdapter> adapter;
+ QQuickWebEngineViewExperimental *e;
+ QUrl icon;
+ int loadProgress;
+ bool inspectable;
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QQuickWebEngineViewExperimental)
+
+#endif // QQUICKWEBENGINEVIEW_P_P_H
diff --git a/src/webengine/api/qtwebengineglobal.h b/src/webengine/api/qtwebengineglobal.h
new file mode 100644
index 000000000..46f77c55f
--- /dev/null
+++ b/src/webengine/api/qtwebengineglobal.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QTWEBENGINEGLOBAL_H
+#define QTWEBENGINEGLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_STATIC
+# if defined(QT_BUILD_WEBENGINE_LIB)
+# define Q_WEBENGINE_EXPORT Q_DECL_EXPORT
+# else
+# define Q_WEBENGINE_EXPORT Q_DECL_IMPORT
+# endif
+#else
+# define Q_WEBENGINE_EXPORT
+#endif
+
+QT_END_NAMESPACE
+
+#endif // QTWEBENGINEGLOBAL_H
diff --git a/src/webengine/api/qtwebengineglobal_p.h b/src/webengine/api/qtwebengineglobal_p.h
new file mode 100644
index 000000000..1600dad63
--- /dev/null
+++ b/src/webengine/api/qtwebengineglobal_p.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTWEBENGINEGLOBAL_P_H
+#define QTWEBENGINEGLOBAL_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qtwebengineglobal.h"
+
+QT_BEGIN_NAMESPACE
+
+#define Q_WEBENGINE_PRIVATE_EXPORT Q_WEBENGINE_EXPORT
+
+QT_END_NAMESPACE
+
+#endif // QTWEBENGINEGLOBAL_P_H
diff --git a/src/webengine/plugin/experimental/experimental.pro b/src/webengine/plugin/experimental/experimental.pro
new file mode 100644
index 000000000..ad2e0b8a3
--- /dev/null
+++ b/src/webengine/plugin/experimental/experimental.pro
@@ -0,0 +1,15 @@
+CXX_MODULE = qml
+TARGET = qtwebengineexperimentalplugin
+TARGETPATH = QtWebEngine/experimental
+IMPORT_VERSION = 1.0
+
+QT += webengine qml quick
+QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
+
+qtHaveModule(v8): QT_PRIVATE += v8-private
+
+INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick
+
+SOURCES = plugin.cpp
+
+load(qml_plugin)
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp
new file mode 100644
index 000000000..08d482508
--- /dev/null
+++ b/src/webengine/plugin/experimental/plugin.cpp
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+
+#include "qquickwebengineview_p.h"
+#include "qquickwebengineview_p_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QQuickWebEngineViewExperimentalExtension : public QObject {
+ Q_OBJECT
+ Q_PROPERTY(QQuickWebEngineViewExperimental* experimental READ experimental CONSTANT FINAL)
+public:
+ QQuickWebEngineViewExperimentalExtension(QObject *parent = 0) : QObject(parent) { }
+ QQuickWebEngineViewExperimental* experimental() { return static_cast<QQuickWebEngineView*>(parent())->d_func()->experimental(); }
+};
+
+class QtWebEngineExperimentalPlugin : public QQmlExtensionPlugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+public:
+ virtual void registerTypes(const char *uri)
+ {
+ qWarning("\nWARNING: This project is using the experimental QML API extensions for QtWebEngine and is therefore tied to a specific QtWebEngine release.\n"
+ "WARNING: The experimental API will change from version to version, or even be removed. You have been warned!\n");
+
+ Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine.experimental"));
+
+ qmlRegisterExtendedType<QQuickWebEngineView, QQuickWebEngineViewExperimentalExtension>(uri, 1, 0, "WebEngineView");
+ qmlRegisterUncreatableType<QQuickWebEngineViewExperimental>(uri, 1, 0, "WebEngineViewExperimental",
+ QObject::tr("Cannot create a separate instance of WebEngineViewExperimental"));
+ }
+};
+
+QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/webengine/plugin/experimental/qmldir b/src/webengine/plugin/experimental/qmldir
new file mode 100644
index 000000000..56ad22e70
--- /dev/null
+++ b/src/webengine/plugin/experimental/qmldir
@@ -0,0 +1,3 @@
+module QtWebEngine.experimental
+plugin qtwebengineexperimentalplugin
+typeinfo plugins.qmltypes
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
new file mode 100644
index 000000000..5efde6dd8
--- /dev/null
+++ b/src/webengine/plugin/plugin.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+
+#include "qquickwebengineview_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QtWebEnginePlugin : public QQmlExtensionPlugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+public:
+ virtual void registerTypes(const char *uri) Q_DECL_OVERRIDE
+ {
+ Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebEngine"));
+ Q_UNUSED(uri);
+
+ qmlRegisterType<QQuickWebEngineView>(uri, 1, 0, "WebEngineView");
+ }
+};
+
+QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro
new file mode 100644
index 000000000..93e04f97a
--- /dev/null
+++ b/src/webengine/plugin/plugin.pro
@@ -0,0 +1,13 @@
+CXX_MODULE = qml
+TARGET = qtwebengineplugin
+TARGETPATH = QtWebEngine
+IMPORT_VERSION = 1.0
+
+QT += webengine qml quick
+QT_PRIVATE += webengine-private qml-private quick-private gui-private core-private
+
+INCLUDEPATH += $$QTWEBENGINE_ROOT/lib $$QTWEBENGINE_ROOT/lib/quick
+
+SOURCES = plugin.cpp
+
+load(qml_plugin)
diff --git a/src/webengine/plugin/qmldir b/src/webengine/plugin/qmldir
new file mode 100644
index 000000000..e24f55ed9
--- /dev/null
+++ b/src/webengine/plugin/qmldir
@@ -0,0 +1,3 @@
+module QtWebEngine
+plugin qtwebengineplugin
+typeinfo plugins.qmltypes
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.cpp b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
new file mode 100644
index 000000000..8d0f5f0cc
--- /dev/null
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.cpp
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "render_widget_host_view_qt_delegate_quick.h"
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent)
+ : RenderWidgetHostViewQtDelegateQuickBase<QQuickItem>(client, parent)
+{
+ setFlag(ItemHasContents);
+}
+
+WId RenderWidgetHostViewQtDelegateQuick::nativeWindowIdForCompositor() const
+{
+ return QQuickItem::window() ? QQuickItem::window()->winId() : 0;
+}
+
+void RenderWidgetHostViewQtDelegateQuick::update(const QRect&)
+{
+ QQuickItem::update();
+}
+
+void RenderWidgetHostViewQtDelegateQuick::itemChange(ItemChange change, const ItemChangeData &value)
+{
+ QQuickItem::itemChange(change, value);
+ if (change == QQuickItem::ItemSceneChange && value.window)
+ m_client->compositingSurfaceUpdated();
+}
+
+QSGNode *RenderWidgetHostViewQtDelegateQuick::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
+{
+ return m_client->updatePaintNode(oldNode, QQuickItem::window());
+}
+#endif // QT_VERSION
+
+RenderWidgetHostViewQtDelegateQuickPainted::RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent)
+ : RenderWidgetHostViewQtDelegateQuickBase<QQuickPaintedItem>(client, parent)
+{
+}
+
+WId RenderWidgetHostViewQtDelegateQuickPainted::nativeWindowIdForCompositor() const
+{
+ // This causes a failure of the compositor initialization which ends up disabling it completely.
+ return 0;
+}
+
+void RenderWidgetHostViewQtDelegateQuickPainted::update(const QRect& rect)
+{
+ polish();
+ QQuickPaintedItem::update(rect);
+}
+
+void RenderWidgetHostViewQtDelegateQuickPainted::paint(QPainter *painter)
+{
+ m_client->paint(painter, boundingRect());
+}
+
+void RenderWidgetHostViewQtDelegateQuickPainted::updatePolish()
+{
+ // paint will be called from the scene graph thread and this doesn't play well
+ // with chromium's use of TLS while getting the backing store.
+ // updatePolish() should be called from the GUI thread right before the rendering thread starts.
+ m_client->fetchBackingStore();
+}
diff --git a/src/webengine/render_widget_host_view_qt_delegate_quick.h b/src/webengine/render_widget_host_view_qt_delegate_quick.h
new file mode 100644
index 000000000..e8e073c24
--- /dev/null
+++ b/src/webengine/render_widget_host_view_qt_delegate_quick.h
@@ -0,0 +1,239 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICK_H
+#define RENDER_WIDGET_HOST_VIEW_QT_DELEGATE_QUICK_H
+
+#include "render_widget_host_view_qt_delegate.h"
+
+#include "qquickwebengineview_p.h"
+#include "qquickwebengineview_p_p.h"
+#include <QGuiApplication>
+#include <QQuickPaintedItem>
+#include <QQuickWindow>
+#include <QVariant>
+#include <QWindow>
+
+template<typename ItemBaseT>
+class RenderWidgetHostViewQtDelegateQuickBase : public ItemBaseT, public RenderWidgetHostViewQtDelegate
+{
+public:
+ RenderWidgetHostViewQtDelegateQuickBase(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0)
+ : ItemBaseT(parent)
+ , m_client(client)
+ {
+ this->setAcceptedMouseButtons(Qt::AllButtons);
+ this->setAcceptHoverEvents(true);
+ }
+
+ virtual void initAsChild(WebContentsAdapterClient* container) Q_DECL_OVERRIDE
+ {
+ QQuickWebEngineViewPrivate *viewPrivate = static_cast<QQuickWebEngineViewPrivate *>(container);
+ this->setParentItem(viewPrivate->q_func());
+ }
+
+ virtual void initAsPopup(const QRect& rect) Q_DECL_OVERRIDE
+ {
+ this->setX(rect.x());
+ this->setY(rect.y());
+ this->setWidth(rect.width());
+ this->setHeight(rect.height());
+ this->setVisible(true);
+ }
+
+ virtual QRectF screenRect() const Q_DECL_OVERRIDE
+ {
+ QPointF pos = this->mapToScene(QPointF(0,0));
+ return QRectF(pos.x(), pos.y(), this->width(), this->height());
+ }
+
+ virtual void setKeyboardFocus() Q_DECL_OVERRIDE
+ {
+ this->setFocus(true);
+ }
+
+ virtual bool hasKeyboardFocus() Q_DECL_OVERRIDE
+ {
+ return this->hasFocus();
+ }
+
+ virtual void show() Q_DECL_OVERRIDE
+ {
+ this->setVisible(true);
+ }
+
+ virtual void hide() Q_DECL_OVERRIDE
+ {
+ this->setVisible(false);
+ }
+
+ virtual bool isVisible() const Q_DECL_OVERRIDE
+ {
+ return ItemBaseT::isVisible();
+ }
+
+ virtual QWindow* window() const Q_DECL_OVERRIDE
+ {
+ return ItemBaseT::window();
+ }
+
+ virtual void updateCursor(const QCursor &cursor) Q_DECL_OVERRIDE
+ {
+ this->setCursor(cursor);
+ }
+
+ virtual void resize(int width, int height) Q_DECL_OVERRIDE
+ {
+ this->setSize(QSizeF(width, height));
+ }
+
+ void focusInEvent(QFocusEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void focusOutEvent(QFocusEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void mousePressEvent(QMouseEvent *event)
+ {
+ this->setFocus(true);
+ m_client->forwardEvent(event);
+ }
+
+ void mouseMoveEvent(QMouseEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void mouseReleaseEvent(QMouseEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void mouseDoubleClickEvent(QMouseEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void keyPressEvent(QKeyEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void keyReleaseEvent(QKeyEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void wheelEvent(QWheelEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void touchEvent(QTouchEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void hoverMoveEvent(QHoverEvent *event)
+ {
+ m_client->forwardEvent(event);
+ }
+
+ void inputMethodStateChanged(bool editorVisible)
+ {
+ if (qApp->inputMethod()->isVisible() == editorVisible)
+ return;
+
+ this->setFlag(QQuickItem::ItemAcceptsInputMethod, editorVisible);
+ qApp->inputMethod()->update(Qt::ImQueryInput | Qt::ImEnabled | Qt::ImHints);
+ qApp->inputMethod()->setVisible(editorVisible);
+ }
+
+ QVariant inputMethodQuery(Qt::InputMethodQuery query) const
+ {
+ return m_client->inputMethodQuery(query);
+ }
+
+protected:
+ void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+ {
+ ItemBaseT::geometryChanged(newGeometry, oldGeometry);
+ m_client->notifyResize();
+ }
+
+ RenderWidgetHostViewQtDelegateClient *m_client;
+};
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))
+class RenderWidgetHostViewQtDelegateQuick : public RenderWidgetHostViewQtDelegateQuickBase<QQuickItem>
+{
+ Q_OBJECT
+public:
+ RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0);
+
+ virtual WId nativeWindowIdForCompositor() const;
+ virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
+
+ virtual void itemChange(ItemChange change, const ItemChangeData &value) Q_DECL_OVERRIDE;
+ virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *) Q_DECL_OVERRIDE;
+};
+#endif // QT_VERSION
+
+class RenderWidgetHostViewQtDelegateQuickPainted : public RenderWidgetHostViewQtDelegateQuickBase<QQuickPaintedItem>
+{
+ Q_OBJECT
+public:
+ RenderWidgetHostViewQtDelegateQuickPainted(RenderWidgetHostViewQtDelegateClient *client, QQuickItem *parent = 0);
+
+ virtual WId nativeWindowIdForCompositor() const Q_DECL_OVERRIDE;
+ virtual void update(const QRect& rect = QRect()) Q_DECL_OVERRIDE;
+
+ void paint(QPainter *painter);
+
+protected:
+ void updatePolish();
+};
+
+#endif
diff --git a/src/webengine/webengine.pro b/src/webengine/webengine.pro
new file mode 100644
index 000000000..50353066b
--- /dev/null
+++ b/src/webengine/webengine.pro
@@ -0,0 +1,34 @@
+TARGET = QtWebEngine
+MODULE = webengine
+
+# For our export macros
+DEFINES += QT_BUILD_WEBENGINE_LIB
+
+QT += qml quick
+QT_PRIVATE += qml-private quick-private gui-private core-private
+
+# Remove this as soon as we have a hard-dependency on Qt 5.2
+qtHaveModule(v8): QT_PRIVATE += v8-private
+
+INCLUDEPATH += ../
+
+# FIXME: all this should eventually be turned into QT += webenginecore
+macx:LIBPATH = $$getOutDir()/$$getConfigDir()
+else:LIBPATH = $$getOutDir()/$$getConfigDir()/lib
+LIBS_PRIVATE += -lQt5WebEngineCore -L$$LIBPATH
+QMAKE_RPATHDIR += $$LIBPATH
+
+#DESTDIR = $$LIBPATH
+
+SOURCES = \
+ qquickwebengineview.cpp \
+ render_widget_host_view_qt_delegate_quick.cpp
+
+HEADERS = \
+ qtwebengineglobal.h \
+ qtwebengineglobal_p.h \
+ qquickwebengineview_p.h \
+ qquickwebengineview_p_p.h \
+ render_widget_host_view_qt_delegate_quick.h
+
+load(qt_module)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 13:51:33 +0000