1 files changed, 44 insertions, 14 deletions

diff --git a/src/core/web_contents_adapter.h b/src/core/web_contents_adapter.h
index ce033bdb4..0de1fb1d5 100644
--- a/src/core/web_contents_adapter.h
+++ b/src/core/web_contents_adapter.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
 **
@@ -11,24 +11,27 @@
 ** 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 The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
 ** packaging of this file. Please review the following information to
 ** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
 ** GNU General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later 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 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -52,6 +55,10 @@ struct WebPreferences;
 
 QT_BEGIN_NAMESPACE
 class QAccessibleInterface;
+class QDragEnterEvent;
+class QDragMoveEvent;
+class QPageLayout;
+class QString;
 class QWebChannel;
 QT_END_NAMESPACE
 
@@ -60,6 +67,7 @@ namespace QtWebEngineCore {
 class BrowserContextQt;
 class MessagePassingInterface;
 class WebContentsAdapterPrivate;
+class FaviconManager;
 
 class QWEBENGINE_EXPORT WebContentsAdapter : public QSharedData {
 public:
@@ -77,6 +85,7 @@ public:
     void reloadAndBypassCache();
     void load(const QUrl&);
     void setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl);
+    void save();
     QUrl activeUrl() const;
     QUrl requestedUrl() const;
     QString pageTitle() const;
@@ -90,6 +99,7 @@ public:
     void paste();
     void pasteAndMatchStyle();
     void selectAll();
+    void unselect();
 
     void navigateToIndex(int);
     void navigateToOffset(int);
@@ -104,14 +114,17 @@ public:
     void serializeNavigationHistory(QDataStream &output);
     void setZoomFactor(qreal);
     qreal currentZoomFactor() const;
-    void runJavaScript(const QString &javaScript);
-    quint64 runJavaScriptCallbackResult(const QString &javaScript);
+    void runJavaScript(const QString &javaScript, quint32 worldId);
+    quint64 runJavaScriptCallbackResult(const QString &javaScript, quint32 worldId);
     quint64 fetchDocumentMarkup();
     quint64 fetchDocumentInnerText();
     quint64 findText(const QString &subString, bool caseSensitively, bool findBackward);
     void stopFinding();
     void updateWebPreferences(const content::WebPreferences &webPreferences);
     void download(const QUrl &url, const QString &suggestedFileName);
+    bool isAudioMuted() const;
+    void setAudioMuted(bool mute);
+    bool recentlyAudible();
 
     // Must match blink::WebMediaPlayerAction::Type.
     enum MediaPlayerAction {
@@ -143,10 +156,27 @@ public:
     BrowserContextQt* browserContext();
     BrowserContextAdapter* browserContextAdapter();
     QWebChannel *webChannel() const;
-    void setWebChannel(QWebChannel *);
+    void setWebChannel(QWebChannel *, uint worldId);
+    FaviconManager *faviconManager();
+
+    QPointF lastScrollOffset() const;
+    QSizeF lastContentsSize() const;
+
+    void startDragging(QObject *dragSource, const content::DropData &dropData,
+                       Qt::DropActions allowedActions, const QPixmap &pixmap, const QPoint &offset);
+    void enterDrag(QDragEnterEvent *e, const QPoint &screenPos);
+    Qt::DropAction updateDragPosition(QDragMoveEvent *e, const QPoint &screenPos);
+    void updateDragAction(Qt::DropAction action);
+    void finishDragUpdate();
+    void endDragging(const QPoint &clientPos, const QPoint &screenPos);
+    void leaveDrag();
+    void initUpdateDragCursorMessagePollingTimer();
+    void printToPDF(const QPageLayout&, const QString&);
+    quint64 printToPDFCallbackResult(const QPageLayout &);
 
     // meant to be used within WebEngineCore only
     content::WebContents *webContents() const;
+    void replaceMisspelling(const QString &word);
 
 private:
     Q_DISABLE_COPY(WebContentsAdapter)