Import WebKit commit 6d0ad27b6bc4209fb8d8cee2692dc0c6a5462051v5.212.0-alpha2

Change-Id: Ifdedb7bc3162434686201813dc1d994cf5ae7e70
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

3 files changed, 25 insertions, 0 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
index c4edb793e..5f62dc600 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp
@@ -110,10 +110,12 @@ void QtPageClient::didChangeViewportProperties(const WebCore::ViewportAttributes
     QQuickWebViewPrivate::get(m_webView)->didChangeViewportProperties(attr);
 }
 
+#if ENABLE(DRAG_SUPPORT)
 void QtPageClient::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
 {
     m_eventHandler->startDrag(dragData, dragImage);
 }
+#endif
 
 void QtPageClient::handleDownloadRequest(DownloadProxy* download)
 {
diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.h b/Source/WebKit2/UIProcess/qt/QtPageClient.h
index 3467ceaa9..b31720bc8 100644
--- a/Source/WebKit2/UIProcess/qt/QtPageClient.h
+++ b/Source/WebKit2/UIProcess/qt/QtPageClient.h
@@ -73,7 +73,9 @@ public:
     void updateAcceleratedCompositingMode(const LayerTreeContext&) override;
     void pageClosed() override { }
     void preferencesDidChange() override { }
+#if ENABLE(DRAG_SUPPORT)
     void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) override;
+#endif
     void setCursor(const WebCore::Cursor&) override;
     void setCursorHiddenUntilMouseMoves(bool) override;
     void toolTipChanged(const String&, const String&) override;
diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
index d05649736..2a7d6f15e 100644
--- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
+++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
@@ -184,16 +184,21 @@ void QtWebPageEventHandler::handleHoverMoveEvent(QHoverEvent* ev)
 
 void QtWebPageEventHandler::handleDragEnterEvent(QDragEnterEvent* ev)
 {
+#if ENABLE(DRAG_SUPPORT)
     m_webPageProxy->resetCurrentDragInformation();
     QTransform fromItemTransform = m_webPage->transformFromItem();
     // FIXME: Should not use QCursor::pos()
     DragData dragData(ev->mimeData(), fromItemTransform.map(ev->pos()), QCursor::pos(), dropActionToDragOperation(ev->possibleActions()));
     m_webPageProxy->dragEntered(dragData);
     ev->acceptProposedAction();
+#else
+    Q_UNUSED(ev);
+#endif
 }
 
 void QtWebPageEventHandler::handleDragLeaveEvent(QDragLeaveEvent* ev)
 {
+#if ENABLE(DRAG_SUPPORT)
     bool accepted = ev->isAccepted();
 
     // FIXME: Should not use QCursor::pos()
@@ -202,10 +207,14 @@ void QtWebPageEventHandler::handleDragLeaveEvent(QDragLeaveEvent* ev)
     m_webPageProxy->resetCurrentDragInformation();
 
     ev->setAccepted(accepted);
+#else
+    Q_UNUSED(ev);
+#endif
 }
 
 void QtWebPageEventHandler::handleDragMoveEvent(QDragMoveEvent* ev)
 {
+#if ENABLE(DRAG_SUPPORT)
     bool accepted = ev->isAccepted();
 
     QTransform fromItemTransform = m_webPage->transformFromItem();
@@ -217,10 +226,14 @@ void QtWebPageEventHandler::handleDragMoveEvent(QDragMoveEvent* ev)
         ev->accept();
 
     ev->setAccepted(accepted);
+#else
+    Q_UNUSED(ev);
+#endif
 }
 
 void QtWebPageEventHandler::handleDropEvent(QDropEvent* ev)
 {
+#if ENABLE(DRAG_SUPPORT)
     bool accepted = ev->isAccepted();
     QTransform fromItemTransform = m_webPage->transformFromItem();
     // FIXME: Should not use QCursor::pos()
@@ -232,6 +245,9 @@ void QtWebPageEventHandler::handleDropEvent(QDropEvent* ev)
     ev->accept();
 
     ev->setAccepted(accepted);
+#else
+    Q_UNUSED(ev);
+#endif
 }
 
 void QtWebPageEventHandler::activateTapHighlight(const QTouchEvent::TouchPoint& point)
@@ -615,6 +631,7 @@ void QtWebPageEventHandler::didFindZoomableArea(const IntPoint& target, const In
 
 void QtWebPageEventHandler::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
 {
+#if ENABLE(DRAG_SUPPORT)
     QImage dragQImage;
     if (dragImage)
         dragQImage = dragImage->createQImage();
@@ -639,6 +656,10 @@ void QtWebPageEventHandler::startDrag(const WebCore::DragData& dragData, PassRef
     }
 
     m_webPageProxy->dragEnded(clientPosition, globalPosition, dropActionToDragOperation(actualDropAction));
+#else
+    Q_UNUSED(dragData);
+    Q_UNUSED(dragImage);
+#endif
 }
 
 } // namespace WebKit