Add a DownloadType enum property to WebEngineDownloadItem

With this property the user gets the requested download's type.
In other words, the user can identify the download where it comes from
based on the type.

Update public API list as well.

Change-Id: I2b066d7eb4df1134266ad67ade0066e3bcc2b454
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

4 files changed, 40 insertions, 0 deletions

diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index 3b75480f9..5efe4337d 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -80,6 +80,7 @@ QWebEngineDownloadItemPrivate::QWebEngineDownloadItemPrivate(QWebEngineProfilePr
     , downloadId(-1)
     , downloadState(QWebEngineDownloadItem::DownloadCancelled)
     , savePageFormat(QWebEngineDownloadItem::MimeHtmlSaveFormat)
+    , type(QWebEngineDownloadItem::Attachment)
     , downloadUrl(url)
     , totalBytes(-1)
     , receivedBytes(0)
@@ -219,6 +220,22 @@ quint32 QWebEngineDownloadItem::id() const
 */
 
 /*!
+    \enum QWebEngineDownloadItem::DownloadType
+    \since 5.8
+
+    Describes the requested download's type.
+
+    \value Attachment The web server's response includes a \c Content-Disposition header with the \c attachment directive.
+           If \c Content-Disposition is present in the reply, the web server is indicating that
+           the client should prompt the user to save the content regardless of the content type.
+           See \l {RFC 2616 section 19.5.1} for details.
+    \value DownloadAttribute The user clicked the hyperlink.
+           See \l {HTML download Attribute} for details.
+    \value UserRequested The user initiated the download.
+    \value SavePage The user saved a web page.
+*/
+
+/*!
     Returns the download item's current state.
 
     \sa QWebEngineDownloadItem::DownloadState
@@ -343,6 +360,18 @@ void QWebEngineDownloadItem::setSavePageFormat(QWebEngineDownloadItem::SavePageF
     d->savePageFormat = format;
 }
 
+/*!
+    Returns the requested download's type.
+    \since 5.8
+
+ */
+
+QWebEngineDownloadItem::DownloadType QWebEngineDownloadItem::type() const
+{
+    Q_D(const QWebEngineDownloadItem);
+    return d->type;
+}
+
 QWebEngineDownloadItem::QWebEngineDownloadItem(QWebEngineDownloadItemPrivate *p, QObject *parent)
     : QObject(parent)
     , d_ptr(p)
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index 80b5c06c5..4b58748ad 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -72,6 +72,14 @@ public:
     };
     Q_ENUM(SavePageFormat)
 
+    enum DownloadType {
+        Attachment = 0,
+        DownloadAttribute,
+        UserRequested,
+        SavePage
+    };
+    Q_ENUM(DownloadType)
+
     quint32 id() const;
     DownloadState state() const;
     qint64 totalBytes() const;
@@ -83,6 +91,7 @@ public:
     bool isFinished() const;
     SavePageFormat savePageFormat() const;
     void setSavePageFormat(SavePageFormat format);
+    DownloadType type() const;
 
 public Q_SLOTS:
     void accept();
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem_p.h b/src/webenginewidgets/api/qwebenginedownloaditem_p.h
index ddb3b443a..9ddb45444 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem_p.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem_p.h
@@ -72,6 +72,7 @@ public:
     quint32 downloadId;
     QWebEngineDownloadItem::DownloadState downloadState;
     QWebEngineDownloadItem::SavePageFormat savePageFormat;
+    QWebEngineDownloadItem::DownloadType type;
     QString downloadPath;
     const QUrl downloadUrl;
     QString mimeType;
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 7e87aed50..83b6f9714 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -185,6 +185,7 @@ void QWebEngineProfilePrivate::downloadRequested(DownloadItemInfo &info)
     itemPrivate->downloadPath = info.path;
     itemPrivate->mimeType = info.mimeType;
     itemPrivate->savePageFormat = static_cast<QWebEngineDownloadItem::SavePageFormat>(info.savePageFormat);
+    itemPrivate->type = static_cast<QWebEngineDownloadItem::DownloadType>(info.downloadType);
 
     QWebEngineDownloadItem *download = new QWebEngineDownloadItem(itemPrivate, q);