Imported WebKit commit 12fbea815480c3b3fad139cd8dfb82e8c954bc9a

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

7 files changed, 44 insertions, 35 deletions

diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index b730df61c..e9c39f9b2 100755..100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -109,18 +109,18 @@ void NetworkAccessManager::sslErrorsEncountered(QNetworkReply* reply, const QLis
 
 
 #if !defined(QT_NO_PRINTER) && HAVE(QTPRINTSUPPORT)
-class NullPrinter : public QPrinter {
+class NullPrinter final : public QPrinter {
 public:
     class NullPaintEngine : public QPaintEngine {
     public:
-        virtual bool begin(QPaintDevice*) { return true; }
-        virtual bool end() { return true; }
-        virtual QPaintEngine::Type type() const { return QPaintEngine::User; }
-        virtual void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) { }
-        virtual void updateState(const QPaintEngineState& state) { }
+        bool begin(QPaintDevice*) final { return true; }
+        bool end() final { return true; }
+        QPaintEngine::Type type() const final { return QPaintEngine::User; }
+        void drawPixmap(const QRectF& r, const QPixmap& pm, const QRectF& sr) final { }
+        void updateState(const QPaintEngineState& state) final { }
     };
 
-    virtual QPaintEngine* paintEngine() const { return const_cast<NullPaintEngine*>(&m_engine); }
+    QPaintEngine* paintEngine() const final { return const_cast<NullPaintEngine*>(&m_engine); }
 
     NullPaintEngine m_engine;
 };
@@ -155,6 +155,8 @@ WebPage::WebPage(QObject* parent, DumpRenderTree* drt)
 
     connect(this, SIGNAL(featurePermissionRequested(QWebFrame*, QWebPage::Feature)), this, SLOT(requestPermission(QWebFrame*, QWebPage::Feature)));
     connect(this, SIGNAL(featurePermissionRequestCanceled(QWebFrame*, QWebPage::Feature)), this, SLOT(cancelPermission(QWebFrame*, QWebPage::Feature)));
+
+    connect(this, &QWebPage::fullScreenRequested, this, &WebPage::requestFullScreen);
 }
 
 WebPage::~WebPage()
@@ -191,6 +193,7 @@ void WebPage::resetSettings()
     settings()->resetAttribute(QWebSettings::CSSRegionsEnabled);
     settings()->resetAttribute(QWebSettings::CSSGridLayoutEnabled);
     settings()->resetAttribute(QWebSettings::AcceleratedCompositingEnabled);
+    settings()->resetAttribute(QWebSettings::FullScreenSupportEnabled);
 
     m_drt->testRunner()->setCaretBrowsingEnabled(false);
     m_drt->testRunner()->setAuthorAndUserStylesEnabled(true);
@@ -273,6 +276,11 @@ void WebPage::permissionSet(QWebPage::Feature feature)
     }
 }
 
+void WebPage::requestFullScreen(QWebFullScreenRequest request)
+{
+    request.accept();
+}
+
 // FIXME (119591): Make this match other platforms better.
 static QString urlSuitableForTestResult(const QString& url)
 {
diff --git a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
index be1559d33..880f9ca83 100644
--- a/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/Tools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -67,7 +67,7 @@ class GCController;
 class WebPage;
 class NetworkAccessManager;
 
-class DumpRenderTree : public QObject {
+class DumpRenderTree final : public QObject {
 Q_OBJECT
 
 public:
@@ -173,7 +173,7 @@ private:
     QString m_redirectErrorFileName;
 };
 
-class NetworkAccessManager : public QNetworkAccessManager {
+class NetworkAccessManager final : public QNetworkAccessManager {
     Q_OBJECT
 public:
     NetworkAccessManager(QObject* parent);
@@ -184,7 +184,7 @@ private Q_SLOTS:
 #endif
 };
 
-class WebPage : public QWebPage {
+class WebPage final : public QWebPage {
     Q_OBJECT
 public:
     WebPage(QObject* parent, DumpRenderTree*);
@@ -192,30 +192,31 @@ public:
     QWebInspector* webInspector();
     void closeWebInspector();
 
-    QWebPage *createWindow(QWebPage::WebWindowType);
+    QWebPage *createWindow(QWebPage::WebWindowType) final;
 
-    void javaScriptAlert(QWebFrame *frame, const QString& message);
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID);
-    bool javaScriptConfirm(QWebFrame *frame, const QString& msg);
-    bool javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result);
+    void javaScriptAlert(QWebFrame*, const QString& message) final;
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString& sourceID) final;
+    bool javaScriptConfirm(QWebFrame*, const QString& msg) final;
+    bool javaScriptPrompt(QWebFrame*, const QString& msg, const QString& defaultValue, QString* result) final;
 
     void resetSettings();
 
-    virtual bool supportsExtension(QWebPage::Extension extension) const;
-    virtual bool extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output);
+    bool supportsExtension(QWebPage::Extension) const final;
+    bool extension(Extension, const ExtensionOption*, ExtensionReturn*) final;
 
-    QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&);
+    QObject* createPlugin(const QString&, const QUrl&, const QStringList&, const QStringList&) final;
 
     void permissionSet(QWebPage::Feature feature);
 
-    virtual bool shouldInterruptJavaScript() { return false; }
+    bool shouldInterruptJavaScript() final { return false; }
 
 public Q_SLOTS:
-    void requestPermission(QWebFrame* frame, QWebPage::Feature feature);
-    void cancelPermission(QWebFrame* frame, QWebPage::Feature feature);
+    void requestPermission(QWebFrame*, QWebPage::Feature);
+    void cancelPermission(QWebFrame*, QWebPage::Feature);
+    void requestFullScreen(QWebFullScreenRequest);
 
 protected:
-    bool acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest& request, NavigationType type);
+    bool acceptNavigationRequest(QWebFrame*, const QNetworkRequest&, NavigationType) final;
     bool isTextOutputEnabled() { return m_drt->isTextOutputEnabled(); }
 
 private Q_SLOTS:
@@ -227,7 +228,7 @@ private:
     DumpRenderTree *m_drt;
 };
 
-class WebViewGraphicsBased : public QGraphicsView {
+class WebViewGraphicsBased final : public QGraphicsView {
     Q_OBJECT
 
 public:
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.cpp b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
index 352f1de98..666a2475e 100644
--- a/Tools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/Tools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -291,7 +291,7 @@ void EventSender::keyDown(const QString& string, const QStringList& modifiers, u
         code = string.unicode()->unicode();
         //qDebug() << ">>>>>>>>> keyDown" << code << (char)code;
         // map special keycodes used by the tests to something that works for Qt/X11
-        if (code == '\r') {
+        if (code == '\r' || code == '\n') {
             code = Qt::Key_Return;
         } else if (code == '\t') {
             code = Qt::Key_Tab;
diff --git a/Tools/DumpRenderTree/qt/EventSenderQt.h b/Tools/DumpRenderTree/qt/EventSenderQt.h
index 94fb1556f..087d475a7 100644
--- a/Tools/DumpRenderTree/qt/EventSenderQt.h
+++ b/Tools/DumpRenderTree/qt/EventSenderQt.h
@@ -50,11 +50,11 @@
 #include <qwebframe.h>
 
 
-class EventSender : public QObject {
+class EventSender final : public QObject {
     Q_OBJECT
 public:
     EventSender(QWebPage* parent);
-    virtual bool eventFilter(QObject* watched, QEvent*);
+    bool eventFilter(QObject* watched, QEvent*) final;
     void resetClickCount() { m_clickCount = 0; }
 
 public Q_SLOTS:
@@ -93,7 +93,7 @@ public Q_SLOTS:
     void beginDragWithFiles(const QStringList& files);
 
 protected:
-    void timerEvent(QTimerEvent*);
+    void timerEvent(QTimerEvent*) final;
 
 private:
     bool isGraphicsBased() const { return qobject_cast<WebViewGraphicsBased*>(m_page->view()); }
diff --git a/Tools/DumpRenderTree/qt/TestRunnerQt.h b/Tools/DumpRenderTree/qt/TestRunnerQt.h
index 8f2ef1f45..daf8dddba 100644
--- a/Tools/DumpRenderTree/qt/TestRunnerQt.h
+++ b/Tools/DumpRenderTree/qt/TestRunnerQt.h
@@ -51,7 +51,7 @@ class QWebFrame;
 class DumpRenderTreeSupportQt;
 class DumpRenderTree;
 
-class TestRunnerQt : public QObject {
+class TestRunnerQt final : public QObject {
     Q_OBJECT
     Q_PROPERTY(int webHistoryItemCount READ webHistoryItemCount)
     Q_PROPERTY(bool globalFlag READ globalFlag WRITE setGlobalFlag)
@@ -72,7 +72,7 @@ public:
     void setShouldTimeout(bool flag) { m_shouldTimeout = flag; }
 
 protected:
-    void timerEvent(QTimerEvent*);
+    void timerEvent(QTimerEvent*) final;
 
 Q_SIGNALS:
     void done();
diff --git a/Tools/DumpRenderTree/qt/WorkQueueItemQt.h b/Tools/DumpRenderTree/qt/WorkQueueItemQt.h
index f57abb0e2..22a6a1d66 100644
--- a/Tools/DumpRenderTree/qt/WorkQueueItemQt.h
+++ b/Tools/DumpRenderTree/qt/WorkQueueItemQt.h
@@ -34,7 +34,7 @@
 #include <qwebframe.h>
 #include <qwebpage.h>
 
-class LoadAlternateHTMLStringItem : public WorkQueueItem {
+class LoadAlternateHTMLStringItem final : public WorkQueueItem {
 public:
     LoadAlternateHTMLStringItem(const JSRetainPtr<JSStringRef>& content, const JSRetainPtr<JSStringRef>& baseURL,  const JSRetainPtr<JSStringRef>& failingURL)
         : m_content(content)
@@ -44,7 +44,7 @@ public:
     }
 
 private:
-    virtual bool invoke() const;
+    bool invoke() const final;
 
     JSRetainPtr<JSStringRef> m_content;
     JSRetainPtr<JSStringRef> m_baseURL;
diff --git a/Tools/DumpRenderTree/qt/testplugin.h b/Tools/DumpRenderTree/qt/testplugin.h
index 3d8a28cf3..bda9f582c 100644
--- a/Tools/DumpRenderTree/qt/testplugin.h
+++ b/Tools/DumpRenderTree/qt/testplugin.h
@@ -28,18 +28,18 @@
 #include <qwebpluginfactory.h>
 
 
-class TestPlugin : public QWebPluginFactory
+class TestPlugin final : public QWebPluginFactory
 {
 public:
     explicit TestPlugin(QObject *parent = 0);
     virtual ~TestPlugin();
 
-    virtual QList<Plugin> plugins() const;
+    QList<Plugin> plugins() const final;
 
-    virtual QObject *create(const QString &mimeType,
+    QObject *create(const QString &mimeType,
                             const QUrl &url,
                             const QStringList &argumentNames,
-                            const QStringList &argumentValues) const;
+                            const QStringList &argumentValues) const final;
 
 };