Merge remote-tracking branch 'origin/5.212' into dev

Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144

1 files changed, 58 insertions, 0 deletions

diff --git a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp
index 8e5427b23..2d498c5b8 100644
--- a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp
+++ b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.cpp
@@ -32,7 +32,14 @@
 #include "config.h"
 #include "InspectorClientWebPage.h"
 
+#include <QApplication>
+#include <QClipboard>
+#include <QContextMenuEvent>
+
+#include <qwebelement.h>
 #include <qwebframe.h>
+#include <qwebframe_p.h>
+#include <qwebpage_p.h>
 
 using namespace WebKit;
 
@@ -41,7 +48,21 @@ InspectorClientWebPage::InspectorClientWebPage()
     QWebView* view = new QWebView;
     view->setPage(this);
     setParent(view);
+    settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
+#if !ENABLE(DEVELOPER_MODE)
+    settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, false);
+#endif
     connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), SLOT(javaScriptWindowObjectCleared()));
+
+    // FIXME: Find out what's going on with Settings
+    settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, false);
+
+    // We treat "qrc:" scheme as local, but by default local content is not allowed to use
+    // LocalStorage which is required for Inspector to work.
+    // See https://bugs.webkit.org/show_bug.cgi?id=155265
+    // Alternatively we can make "qrc:" scheme non-local like GTK port does:
+    // https://bugs.webkit.org/show_bug.cgi?id=155497
+    settings()->setAttribute(QWebSettings::LocalContentCanAccessRemoteUrls, true);
 }
 
 QWebPage* InspectorClientWebPage::createWindow(QWebPage::WebWindowType)
@@ -53,6 +74,18 @@ QWebPage* InspectorClientWebPage::createWindow(QWebPage::WebWindowType)
     return page;
 }
 
+bool InspectorClientWebPage::event(QEvent* ev)
+{
+    if (ev->type() == QEvent::ContextMenu) {
+        auto* contextMenuEvent = static_cast<QContextMenuEvent*>(ev);
+
+        if (contextMenuEvent)
+            m_clickPos = contextMenuEvent->pos();
+    }
+
+    return QWebPage::event(ev);
+}
+
 void InspectorClientWebPage::javaScriptWindowObjectCleared()
 {
     QVariant inspectorJavaScriptWindowObjects = property("_q_inspectorJavaScriptWindowObjects");
@@ -69,3 +102,28 @@ void InspectorClientWebPage::javaScriptWindowObjectCleared()
     }
 }
 
+void InspectorClientWebPage::triggerAction(WebAction action, bool checked)
+{
+    const QWebHitTestResult hitTestResult = mainFrame()->hitTestContent(m_clickPos);
+
+    if (hitTestResult.imageUrl().isValid() && hitTestResult.element().hasAttribute(QStringLiteral("data-url"))) {
+        switch (action) {
+        case OpenImageInNewWindow: {
+            auto* frame = static_cast<QWebFramePrivate*>(hitTestResult.frame()->d);
+
+            if (frame) {
+                QWebPagePrivate::openNewWindow(QUrl(hitTestResult.element().attribute(QStringLiteral("data-url"))), frame->frame);
+                return;
+            }
+        }
+
+        case CopyImageUrlToClipboard:
+            QApplication::clipboard()->setText(hitTestResult.element().attribute(QStringLiteral("data-url")));
+            return;
+        default:
+            break;
+        }
+    }
+
+    QWebPage::triggerAction(action, checked);
+}