Imported WebKit commit 490f716dd2dd07fb0d6652795c62586e2e28ae27

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

39 files changed, 408 insertions, 365 deletions

diff --git a/Source/WebKit/CMakeLists.txt b/Source/WebKit/CMakeLists.txt
index f316298e7..72f36b19b 100644
--- a/Source/WebKit/CMakeLists.txt
+++ b/Source/WebKit/CMakeLists.txt
@@ -71,7 +71,7 @@ install(TARGETS WebKit EXPORT WebKitTargets
 )
 
 add_dependencies(WebKit WebCore)
-if (WIN32)
+if (TARGET WebKitGUID)
     add_dependencies(WebKit WebKitGUID)
 endif ()
 
diff --git a/Source/WebKit/PlatformQt.cmake b/Source/WebKit/PlatformQt.cmake
index 4675a3abb..81f7e95f6 100644
--- a/Source/WebKit/PlatformQt.cmake
+++ b/Source/WebKit/PlatformQt.cmake
@@ -188,6 +188,7 @@ list(APPEND WebKit_SOURCES
     qt/WebCoreSupport/PopupMenuQt.cpp
     qt/WebCoreSupport/ProgressTrackerClientQt.cpp
     qt/WebCoreSupport/QWebFrameAdapter.cpp
+    qt/WebCoreSupport/QWebFrameData.cpp
     qt/WebCoreSupport/QWebPageAdapter.cpp
     qt/WebCoreSupport/QtPlatformPlugin.cpp
     qt/WebCoreSupport/QtPluginWidgetAdapter.cpp
@@ -253,8 +254,6 @@ if (ENABLE_TEST_SUPPORT)
     )
     if (SHARED_CORE)
         list(APPEND WebKit_LIBRARIES PUBLIC WebCoreTestSupport)
-        install(TARGETS WebCoreTestSupport EXPORT WebKitTargets
-                DESTINATION "${LIB_INSTALL_DIR}")
     else ()
         list(APPEND WebKit_LIBRARIES PRIVATE WebCoreTestSupport)
     endif ()
diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 7dab52d67..5ce067db2 100644
--- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -88,7 +88,7 @@
 namespace WebCore {
 
 #if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
-class RefreshAnimation : public QAbstractAnimation {
+class RefreshAnimation final : public QAbstractAnimation {
 public:
     RefreshAnimation(ChromeClientQt* chromeClient)
         : QAbstractAnimation()
@@ -96,7 +96,7 @@ public:
         , m_animationScheduled(false)
     { }
 
-    virtual int duration() const { return -1; }
+    int duration() const final { return -1; }
 
     void scheduleAnimation()
     {
@@ -106,7 +106,7 @@ public:
     }
 
 protected:
-    virtual void updateCurrentTime(int currentTime)
+    void updateCurrentTime(int currentTime) final
     {
         UNUSED_PARAM(currentTime);
         if (m_animationScheduled) {
@@ -397,11 +397,6 @@ void ChromeClientQt::setStatusbarText(const String& msg)
     QMetaObject::invokeMethod(m_webPage->handle(), "statusBarMessage", Q_ARG(QString, x));
 }
 
-bool ChromeClientQt::shouldInterruptJavaScript()
-{
-    return m_webPage->shouldInterruptJavaScript();
-}
-
 KeyboardUIMode ChromeClientQt::keyboardUIMode()
 {
     return m_webPage->settings->testAttribute(QWebSettings::LinksIncludedInFocusChain)
diff --git a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index 31c806120..9aef6baef 100644
--- a/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -63,137 +63,136 @@ class TextureMapperLayerClientQt;
 class ChromeClientQt final : public ChromeClient {
 public:
     ChromeClientQt(QWebPageAdapter*);
-    virtual ~ChromeClientQt();
-    void chromeDestroyed() override;
+    ~ChromeClientQt();
+    void chromeDestroyed() final;
 
-    void setWindowRect(const FloatRect&) override;
-    FloatRect windowRect() override;
+    void setWindowRect(const FloatRect&) final;
+    FloatRect windowRect() final;
 
-    FloatRect pageRect() override;
+    FloatRect pageRect() final;
 
-    void focus() override;
-    void unfocus() override;
+    void focus() final;
+    void unfocus() final;
 
-    bool canTakeFocus(FocusDirection) override;
-    void takeFocus(FocusDirection) override;
+    bool canTakeFocus(FocusDirection) final;
+    void takeFocus(FocusDirection) final;
 
-    void focusedElementChanged(Element*) override;
-    void focusedFrameChanged(Frame*) override;
+    void focusedElementChanged(Element*) final;
+    void focusedFrameChanged(Frame*) final;
 
-    Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) override;
-    void show() override;
+    Page* createWindow(Frame*, const FrameLoadRequest&, const WindowFeatures&, const NavigationAction&) final;
+    void show() final;
 
-    bool canRunModal() override;
-    void runModal() override;
+    bool canRunModal() final;
+    void runModal() final;
 
-    void setToolbarsVisible(bool) override;
-    bool toolbarsVisible() override;
+    void setToolbarsVisible(bool) final;
+    bool toolbarsVisible() final;
 
-    void setStatusbarVisible(bool) override;
-    bool statusbarVisible() override;
+    void setStatusbarVisible(bool) final;
+    bool statusbarVisible() final;
 
-    void setScrollbarsVisible(bool) override;
-    bool scrollbarsVisible() override;
+    void setScrollbarsVisible(bool) final;
+    bool scrollbarsVisible() final;
 
-    void setMenubarVisible(bool) override;
-    bool menubarVisible() override;
+    void setMenubarVisible(bool) final;
+    bool menubarVisible() final;
 
-    void setResizable(bool) override;
+    void setResizable(bool) final;
 
-    void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) override;
+    void addMessageToConsole(MessageSource, MessageLevel, const String& message, unsigned lineNumber, unsigned columnNumber, const String& sourceID) final;
 
-    bool canRunBeforeUnloadConfirmPanel() override;
-    bool runBeforeUnloadConfirmPanel(const String& message, Frame*) override;
+    bool canRunBeforeUnloadConfirmPanel() final;
+    bool runBeforeUnloadConfirmPanel(const String& message, Frame*) final;
 
-    void closeWindowSoon() override;
+    void closeWindowSoon() final;
 
-    void runJavaScriptAlert(Frame*, const String&) override;
-    bool runJavaScriptConfirm(Frame*, const String&) override;
-    bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) override;
-    virtual bool shouldInterruptJavaScript();
+    void runJavaScriptAlert(Frame*, const String&) final;
+    bool runJavaScriptConfirm(Frame*, const String&) final;
+    bool runJavaScriptPrompt(Frame*, const String& message, const String& defaultValue, String& result) final;
 
-    void setStatusbarText(const String&) override;
+    void setStatusbarText(const String&) final;
 
-    KeyboardUIMode keyboardUIMode() override;
+    KeyboardUIMode keyboardUIMode() final;
 
-    void invalidateRootView(const IntRect&) override;
-    void invalidateContentsAndRootView(const IntRect&) override;
-    void invalidateContentsForSlowScroll(const IntRect&) override;
-    void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) override;
+    void invalidateRootView(const IntRect&) final;
+    void invalidateContentsAndRootView(const IntRect&) final;
+    void invalidateContentsForSlowScroll(const IntRect&) final;
+    void scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect) final;
 #if USE(TILED_BACKING_STORE)
-    virtual void delegatedScrollRequested(const IntPoint& scrollPoint);
+    void delegatedScrollRequested(const IntPoint& scrollPoint) final;
 #endif
 
-    IntPoint screenToRootView(const IntPoint&) const override;
-    IntRect rootViewToScreen(const IntRect&) const override;
-    PlatformPageClient platformPageClient() const override;
-    void contentsSizeChanged(Frame*, const IntSize&) const override;
+    IntPoint screenToRootView(const IntPoint&) const final;
+    IntRect rootViewToScreen(const IntRect&) const final;
+    PlatformPageClient platformPageClient() const final;
+    void contentsSizeChanged(Frame*, const IntSize&) const final;
 
-    void scrollbarsModeDidChange() const override { }
-    void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) override;
+    void scrollbarsModeDidChange() const final { }
+    void mouseDidMoveOverElement(const HitTestResult&, unsigned modifierFlags) final;
 
-    void setToolTip(const String&, TextDirection) override;
+    void setToolTip(const String&, TextDirection) final;
 
-    void print(Frame*) override;
-    void exceededDatabaseQuota(Frame*, const String&, DatabaseDetails) override;
-    void reachedMaxAppCacheSize(int64_t spaceNeeded) override;
-    void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded) override;
+    void print(Frame*) final;
+    void exceededDatabaseQuota(Frame*, const String&, DatabaseDetails) final;
+    void reachedMaxAppCacheSize(int64_t spaceNeeded) final;
+    void reachedApplicationCacheOriginQuota(SecurityOrigin*, int64_t totalSpaceNeeded) final;
 
     // This is a hook for WebCore to tell us what we need to do with the GraphicsLayers.
-    void attachRootGraphicsLayer(Frame*, GraphicsLayer*) override;
-    void setNeedsOneShotDrawingSynchronization() override;
-    void scheduleCompositingLayerFlush() override;
-    CompositingTriggerFlags allowedCompositingTriggers() const override;
-    bool allowsAcceleratedCompositing() const override;
+    void attachRootGraphicsLayer(Frame*, GraphicsLayer*) final;
+    void setNeedsOneShotDrawingSynchronization() final;
+    void scheduleCompositingLayerFlush() final;
+    CompositingTriggerFlags allowedCompositingTriggers() const final;
+    bool allowsAcceleratedCompositing() const final;
 
 #if USE(TILED_BACKING_STORE)
     virtual IntRect visibleRectForTiledBackingStore() const;
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
-    void needTouchEvents(bool) override { }
+    void needTouchEvents(bool) final { }
 #endif
 
-    void isPlayingMediaDidChange(MediaProducer::MediaStateFlags, uint64_t) override;
+    void isPlayingMediaDidChange(MediaProducer::MediaStateFlags, uint64_t) final;
 
 #if ENABLE(VIDEO) && ((USE(GSTREAMER) && USE(NATIVE_FULLSCREEN_VIDEO)) || USE(QT_MULTIMEDIA))
-    bool supportsVideoFullscreen(MediaPlayerEnums::VideoFullscreenMode) override;
-    void enterVideoFullscreenForVideoElement(HTMLVideoElement&, MediaPlayerEnums::VideoFullscreenMode) override;
-    void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) override;
-    bool requiresFullscreenForVideoPlayback() override;
+    bool supportsVideoFullscreen(MediaPlayerEnums::VideoFullscreenMode) final;
+    void enterVideoFullscreenForVideoElement(HTMLVideoElement&, MediaPlayerEnums::VideoFullscreenMode) final;
+    void exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement&) final;
+    bool requiresFullscreenForVideoPlayback() final;
     FullScreenVideoQt* fullScreenVideo();
 #endif
 
 #if ENABLE(INPUT_TYPE_COLOR)
-    std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) override;
+    std::unique_ptr<ColorChooser> createColorChooser(ColorChooserClient*, const Color&) final;
 #endif
 
-    void runOpenPanel(Frame*, PassRefPtr<FileChooser>) override;
-    void loadIconForFiles(const Vector<String>&, FileIconLoader*) override;
+    void runOpenPanel(Frame*, PassRefPtr<FileChooser>) final;
+    void loadIconForFiles(const Vector<String>&, FileIconLoader*) final;
 
-    void setCursor(const Cursor&) override;
-    void setCursorHiddenUntilMouseMoves(bool) override { }
+    void setCursor(const Cursor&) final;
+    void setCursorHiddenUntilMouseMoves(bool) final { }
 
 #if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
-    void scheduleAnimation() override;
+    void scheduleAnimation() final;
     void serviceScriptedAnimations();
 #endif
 
-    void scrollRectIntoView(const IntRect&) const override { }
+    void scrollRectIntoView(const IntRect&) const final { }
 
-    bool selectItemWritingDirectionIsNatural() override;
-    bool selectItemAlignmentFollowsMenuWritingDirection() override;
-    bool hasOpenedPopup() const override;
-    RefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const override;
-    RefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const override;
+    bool selectItemWritingDirectionIsNatural() final;
+    bool selectItemAlignmentFollowsMenuWritingDirection() final;
+    bool hasOpenedPopup() const final;
+    RefPtr<PopupMenu> createPopupMenu(PopupMenuClient*) const final;
+    RefPtr<SearchPopupMenu> createSearchPopupMenu(PopupMenuClient*) const final;
 
     std::unique_ptr<QWebSelectMethod> createSelectPopup() const;
 
-    void dispatchViewportPropertiesDidChange(const ViewportArguments&) const override;
+    void dispatchViewportPropertiesDidChange(const ViewportArguments&) const final;
 
-    void wheelEventHandlersChanged(bool) override { }
+    void wheelEventHandlersChanged(bool) final { }
 
-    void attachViewOverlayGraphicsLayer(Frame *, GraphicsLayer *) override;
+    void attachViewOverlayGraphicsLayer(Frame *, GraphicsLayer *) final;
 
     QWebFullScreenVideoHandler* createFullScreenVideoHandler();
 
diff --git a/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp
index 5f0568c18..93c2fc20b 100644
--- a/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.cpp
@@ -40,11 +40,6 @@ void ContextMenuClientQt::contextMenuDestroyed()
     delete this;
 }
 
-void ContextMenuClientQt::contextMenuItemSelected(ContextMenuItem*, const ContextMenu*)
-{
-    notImplemented();
-}
-
 void ContextMenuClientQt::downloadURL(const URL&)
 {
     notImplemented();
diff --git a/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h b/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h
index 67e708330..67a374861 100644
--- a/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/ContextMenuClientQt.h
@@ -33,18 +33,16 @@
 namespace WebCore {
 class ContextMenu;
 
-class ContextMenuClientQt : public ContextMenuClient {
+class ContextMenuClientQt final : public ContextMenuClient {
 public:
-    virtual void contextMenuDestroyed();
-
-    virtual void contextMenuItemSelected(ContextMenuItem*, const ContextMenu*);
-
-    virtual void downloadURL(const URL&);
-    virtual void lookUpInDictionary(Frame*);
-    virtual void speak(const String&);
-    virtual bool isSpeaking();
-    virtual void stopSpeaking();
-    virtual void searchWithGoogle(const Frame*);
+    void contextMenuDestroyed() final;
+
+    void downloadURL(const URL&) final;
+    void lookUpInDictionary(Frame*) final;
+    void speak(const String&) final;
+    bool isSpeaking() final;
+    void stopSpeaking() final;
+    void searchWithGoogle(const Frame*) final;
 };
 }
 
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index b238f4f4f..37658861f 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -62,6 +62,7 @@
 #include "PolicyChecker.h"
 #include "QNetworkReplyHandler.h"
 #include "QWebFrameAdapter.h"
+#include "QWebFrameData.h"
 #include "QWebPageAdapter.h"
 #include "QWebPageClient.h"
 #include "QtPluginWidgetAdapter.h"
diff --git a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
index da14d6673..e85185f67 100644
--- a/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/FrameNetworkingContextQt.cpp
@@ -20,6 +20,7 @@
 #include "config.h"
 #include "FrameNetworkingContextQt.h"
 
+#include "NotImplemented.h"
 #include "QWebFrameAdapter.h"
 #include "QWebPageAdapter.h"
 #include "qwebsettings.h"
diff --git a/Source/WebKit/qt/WebCoreSupport/IconDatabaseClientQt.h b/Source/WebKit/qt/WebCoreSupport/IconDatabaseClientQt.h
index 6ac211980..bd28baf54 100644
--- a/Source/WebKit/qt/WebCoreSupport/IconDatabaseClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/IconDatabaseClientQt.h
@@ -33,23 +33,23 @@
 
 namespace WebCore {
 
-class IconDatabaseClientQt : public QObject, public IconDatabaseClient {
+class IconDatabaseClientQt final : public QObject, public IconDatabaseClient {
     Q_OBJECT
 public:
     static IconDatabaseClientQt* instance();
 
-    virtual void didRemoveAllIcons();
-    virtual void didImportIconURLForPageURL(const String&);
-    virtual void didImportIconDataForPageURL(const String&);
-    virtual void didChangeIconForPageURL(const String&);
-    virtual void didFinishURLImport();
+    void didRemoveAllIcons() final;
+    void didImportIconURLForPageURL(const String&) final;
+    void didImportIconDataForPageURL(const String&) final;
+    void didChangeIconForPageURL(const String&) final;
+    void didFinishURLImport() final;
 
 Q_SIGNALS:
     void iconLoadedForPageURL(const QString&);
 
 private:
     IconDatabaseClientQt();
-    virtual ~IconDatabaseClientQt();
+    ~IconDatabaseClientQt();
 };
 
 }
diff --git a/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index c809797ba..597ba95dd 100644
--- a/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -145,6 +145,9 @@ InspectorClientQt::InspectorClientQt(QWebPageAdapter* page)
 
 void InspectorClientQt::inspectedPageDestroyed()
 {
+    if (m_frontendClient)
+        m_frontendClient->inspectorClientDestroyed();
+
     InspectorServerQt* webInspectorServer = InspectorServerQt::server();
     if (webInspectorServer)
         webInspectorServer->unregisterClient(this);
diff --git a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
index 1d0abf465..5c53e93f3 100644
--- a/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h
@@ -49,7 +49,7 @@ class Document;
 class Frame;
 class ScriptExecutionContext;
 
-class NotificationWrapper : public QObject, public QWebNotificationData {
+class NotificationWrapper final : public QObject, public QWebNotificationData {
     Q_OBJECT
 public:
     NotificationWrapper();
@@ -57,10 +57,10 @@ public:
 
     void close();
     void sendDisplayEvent();
-    const QString title() const;
-    const QString message() const;
-    const QUrl iconUrl() const;
-    const QUrl openerPageUrl() const;
+    const QString title() const final;
+    const QString message() const final;
+    const QUrl iconUrl() const final;
+    const QUrl openerPageUrl() const final;
 
 public Q_SLOTS:
     void notificationClosed();
diff --git a/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h b/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h
index a676fdd13..4d560894c 100644
--- a/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/PopupMenuQt.h
@@ -32,16 +32,16 @@ class ChromeClientQt;
 class FrameView;
 class PopupMenuClient;
 
-class PopupMenuQt : public QObject, public PopupMenu {
+class PopupMenuQt final : public QObject, public PopupMenu {
     Q_OBJECT
 public:
     PopupMenuQt(PopupMenuClient*, const ChromeClientQt*);
     ~PopupMenuQt();
 
-    virtual void show(const IntRect&, FrameView*, int index);
-    virtual void hide();
-    virtual void updateFromElement();
-    virtual void disconnectClient();
+    void show(const IntRect&, FrameView*, int index) final;
+    void hide() final;
+    void updateFromElement() final;
+    void disconnectClient() final;
 
 private Q_SLOTS:
     void didHide();
diff --git a/Source/WebKit/qt/WebCoreSupport/ProgressTrackerClientQt.cpp b/Source/WebKit/qt/WebCoreSupport/ProgressTrackerClientQt.cpp
index 73e4366a3..7cf620bd4 100644
--- a/Source/WebKit/qt/WebCoreSupport/ProgressTrackerClientQt.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/ProgressTrackerClientQt.cpp
@@ -28,6 +28,7 @@
 
 #include "EventHandler.h"
 #include "Frame.h"
+#include "FrameLoaderClientQt.h"
 #include "ProgressTracker.h"
 #include "QWebFrameAdapter.h"
 #include "QWebPageAdapter.h"
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
index 245e56bc9..9fcddeb55 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
@@ -41,6 +41,7 @@
 #include "NetworkingContext.h"
 #include "NodeList.h"
 #include "Page.h"
+#include "QWebFrameData.h"
 #include "QWebPageAdapter.h"
 #include "RenderObject.h"
 #include "ScriptController.h"
@@ -85,29 +86,6 @@ static inline ResourceRequestCachePolicy cacheLoadControlToCachePolicy(uint cach
     return WebCore::UseProtocolCachePolicy;
 }
 
-QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame, WebCore::HTMLFrameOwnerElement* ownerFrameElement, const WTF::String& frameName)
-    : name(frameName)
-    , ownerElement(ownerFrameElement)
-    , page(parentPage)
-    , allowsScrolling(true)
-    , marginWidth(0)
-    , marginHeight(0)
-{
-    // mainframe is already created in WebCore::Page, just use it.
-    if (!parentFrame || !ownerElement) {
-        frame = &parentPage->mainFrame();
-        frameLoaderClient = static_cast<FrameLoaderClientQt*>(&frame->loader().client());
-    } else {
-        frameLoaderClient = new FrameLoaderClientQt();
-        frame = Frame::create(page, ownerElement, frameLoaderClient);
-    }
-
-    // FIXME: All of the below should probably be moved over into WebCore
-    frame->tree().setName(name);
-    if (parentFrame)
-        parentFrame->tree().appendChild(frame);
-}
-
 QWebFrameAdapter::QWebFrameAdapter()
     : pageAdapter(0)
     , allowsScrolling(true)
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
index 5e763a2e3..026b2fb26 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.h
@@ -20,9 +20,6 @@
 #ifndef QWebFrameAdapter_h
 #define QWebFrameAdapter_h
 
-#include "FrameLoaderClientQt.h"
-#include "PlatformEvent.h"
-#include "PlatformExportMacros.h"
 #if ENABLE(ORIENTATION_EVENTS) && HAVE(QTSENSORS)
 #include "qorientationsensor.h"
 #endif // ENABLE(ORIENTATION_EVENTS).
@@ -35,12 +32,10 @@
 #include <QRect>
 #include <QSize>
 #include <QUrl>
-#include <wtf/ExportMacros.h>
-#include <wtf/RefPtr.h>
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 class Frame;
+class FrameLoaderClientQt;
 class HitTestResult;
 class GraphicsContext;
 class IntRect;
@@ -56,6 +51,7 @@ QT_END_NAMESPACE
 class QGestureEventFacade;
 #endif
 class QWebFrame;
+class QWebFrameData;
 class QWebPageAdapter;
 class QWebSecurityOrigin;
 
@@ -100,22 +96,6 @@ private:
     friend class QWebPageAdapter;
 };
 
-class QWebFrameData {
-public:
-    QWebFrameData(WebCore::Page*, WebCore::Frame* parentFrame = 0, WebCore::HTMLFrameOwnerElement* = 0, const WTF::String& frameName = WTF::String());
-
-    WTF::String name;
-    WebCore::HTMLFrameOwnerElement* ownerElement;
-    WebCore::Page* page;
-    RefPtr<WebCore::Frame> frame;
-    WebCore::FrameLoaderClientQt* frameLoaderClient;
-
-    WTF::String referrer;
-    bool allowsScrolling;
-    int marginWidth;
-    int marginHeight;
-};
-
 class QWEBKIT_EXPORT QWebFrameAdapter {
 public:
     enum ValueOwnership {
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameData.cpp b/Source/WebKit/qt/WebCoreSupport/QWebFrameData.cpp
new file mode 100644
index 000000000..d09ad3a35
--- /dev/null
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameData.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+#include "QWebFrameData.h"
+
+#include "FrameLoaderClientQt.h"
+#include "MainFrame.h"
+#include "Page.h"
+
+using namespace WebCore;
+
+QWebFrameData::QWebFrameData(WebCore::Page* parentPage, WebCore::Frame* parentFrame, WebCore::HTMLFrameOwnerElement* ownerFrameElement, const WTF::String& frameName)
+    : name(frameName)
+    , ownerElement(ownerFrameElement)
+    , page(parentPage)
+    , allowsScrolling(true)
+    , marginWidth(0)
+    , marginHeight(0)
+{
+    // mainframe is already created in WebCore::Page, just use it.
+    if (!parentFrame || !ownerElement) {
+        frame = &parentPage->mainFrame();
+        frameLoaderClient = static_cast<FrameLoaderClientQt*>(&frame->loader().client());
+    } else {
+        frameLoaderClient = new FrameLoaderClientQt();
+        frame = Frame::create(page, ownerElement, frameLoaderClient);
+    }
+
+    // FIXME: All of the below should probably be moved over into WebCore
+    frame->tree().setName(name);
+    if (parentFrame)
+        parentFrame->tree().appendChild(frame);
+}
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebFrameData.h b/Source/WebKit/qt/WebCoreSupport/QWebFrameData.h
new file mode 100644
index 000000000..85216b56d
--- /dev/null
+++ b/Source/WebKit/qt/WebCoreSupport/QWebFrameData.h
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2015 The Qt Company Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#pragma once
+
+#include <wtf/RefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+class Frame;
+class FrameLoaderClientQt;
+class HTMLFrameOwnerElement;
+class Page;
+}
+
+class QWebFrameData {
+public:
+    QWebFrameData(WebCore::Page*, WebCore::Frame* parentFrame = 0, WebCore::HTMLFrameOwnerElement* = 0, const WTF::String& frameName = WTF::String());
+
+    WTF::String name;
+    WebCore::HTMLFrameOwnerElement* ownerElement;
+    WebCore::Page* page;
+    RefPtr<WebCore::Frame> frame;
+    WebCore::FrameLoaderClientQt* frameLoaderClient;
+
+    WTF::String referrer;
+    bool allowsScrolling;
+    int marginWidth;
+    int marginHeight;
+};
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
index bbbe42992..49031d512 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
@@ -39,6 +39,7 @@
 #include "EventHandler.h"
 #include "FocusController.h"
 #include "FrameLoadRequest.h"
+#include "FrameLoaderClientQt.h"
 #include "FrameSelection.h"
 #include "FrameView.h"
 #include "GeolocationPermissionClientQt.h"
diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h
index 040a2c16d..4017f6fc3 100644
--- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h
+++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.h
@@ -20,9 +20,7 @@
 #ifndef QWebPageAdapter_h
 #define QWebPageAdapter_h
 
-#include "PlatformExportMacros.h"
 #include "QWebPageClient.h"
-#include "ViewportArguments.h"
 #include "qwebhistory.h"
 
 #include <qbasictimer.h>
@@ -33,7 +31,7 @@
 #include <qsharedpointer.h>
 #include <qstring.h>
 #include <qurl.h>
-#include <wtf/ExportMacros.h>
+#include <wtf/Forward.h>
 
 QT_BEGIN_NAMESPACE
 class QBitArray;
@@ -52,6 +50,7 @@ class DeviceMotionClient;
 class GeolocationClientQt;
 class Page;
 class UndoStep;
+struct ViewportArguments;
 }
 
 class QtPluginWidgetAdapter;
diff --git a/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h b/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h
index dc7d4c4b2..96c5dea74 100644
--- a/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/TextCheckerClientQt.h
@@ -37,16 +37,16 @@
 
 namespace WebCore {
 
-class TextCheckerClientQt : public TextCheckerClient {
+class TextCheckerClientQt final : public TextCheckerClient {
 public:
-    virtual bool shouldEraseMarkersAfterChangeSelection(TextCheckingType) const;
-    virtual void ignoreWordInSpellDocument(const String&);
-    virtual void learnWord(const String&);
-    virtual void checkSpellingOfString(StringView, int* misspellingLocation, int* misspellingLength);
-    virtual String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord);
-    virtual void checkGrammarOfString(StringView, Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength);
-    virtual void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses);
-    virtual void requestCheckingOfString(WTF::PassRefPtr<WebCore::TextCheckingRequest>) { }
+    bool shouldEraseMarkersAfterChangeSelection(TextCheckingType) const final;
+    void ignoreWordInSpellDocument(const String&) final;
+    void learnWord(const String&) final;
+    void checkSpellingOfString(StringView, int* misspellingLocation, int* misspellingLength) final;
+    String getAutoCorrectSuggestionForMisspelledWord(const String& misspelledWord) final;
+    void checkGrammarOfString(StringView, Vector<GrammarDetail>&, int* badGrammarLocation, int* badGrammarLength) final;
+    void getGuessesForWord(const String& word, const String& context, Vector<String>& guesses) final;
+    void requestCheckingOfString(WTF::PassRefPtr<WebCore::TextCheckingRequest>) final { }
 
     virtual bool isContinousSpellCheckingEnabled();
     virtual void toggleContinousSpellChecking();
diff --git a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h
index f1b8c896e..f34a1b2ce 100644
--- a/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h
+++ b/Source/WebKit/qt/WebCoreSupport/TextureMapperLayerClientQt.h
@@ -32,7 +32,7 @@ namespace WebCore {
 
 class TextureMapperLayer;
 
-class TextureMapperLayerClientQt : public GraphicsLayerClient {
+class TextureMapperLayerClientQt final : public GraphicsLayerClient {
 public:
     TextureMapperLayerClientQt(QWebFrameAdapter*);
     ~TextureMapperLayerClientQt();
diff --git a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
index 0d990086f..1aa5b66c8 100644
--- a/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
+++ b/Source/WebKit/qt/WidgetApi/qgraphicswebview.h
@@ -92,15 +92,15 @@ public:
     bool isTiledBackingStoreFrozen() const;
     void setTiledBackingStoreFrozen(bool frozen);
 
-    virtual void setGeometry(const QRectF& rect);
-    virtual void updateGeometry();
-    virtual void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR);
-    virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value);
-    virtual bool event(QEvent*);
+    void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE;
+    void updateGeometry() Q_DECL_OVERRIDE;
+    void paint(QPainter*, const QStyleOptionGraphicsItem* options, QWidget* widget = Q_NULLPTR) Q_DECL_OVERRIDE;
+    QVariant itemChange(GraphicsItemChange change, const QVariant& value) Q_DECL_OVERRIDE;
+    bool event(QEvent*) Q_DECL_OVERRIDE;
 
-    virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF& constraint) const Q_DECL_OVERRIDE;
 
-    virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+    QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE;
 
     QPainter::RenderHints renderHints() const;
     void setRenderHints(QPainter::RenderHints);
@@ -124,30 +124,30 @@ Q_SIGNALS:
     void linkClicked(const QUrl&);
 
 protected:
-    virtual void mousePressEvent(QGraphicsSceneMouseEvent*);
-    virtual void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*);
-    virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent*);
-    virtual void mouseMoveEvent(QGraphicsSceneMouseEvent*);
-    virtual void hoverMoveEvent(QGraphicsSceneHoverEvent*);
-    virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent*);
+    void mousePressEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QGraphicsSceneMouseEvent*) Q_DECL_OVERRIDE;
+    void hoverMoveEvent(QGraphicsSceneHoverEvent*) Q_DECL_OVERRIDE;
+    void hoverLeaveEvent(QGraphicsSceneHoverEvent*) Q_DECL_OVERRIDE;
 #ifndef QT_NO_WHEELEVENT
-    virtual void wheelEvent(QGraphicsSceneWheelEvent*);
+    void wheelEvent(QGraphicsSceneWheelEvent*) Q_DECL_OVERRIDE;
 #endif
-    virtual void keyPressEvent(QKeyEvent*);
-    virtual void keyReleaseEvent(QKeyEvent*);
+    void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
 #ifndef QT_NO_CONTEXTMENU
-    virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
+    void contextMenuEvent(QGraphicsSceneContextMenuEvent*) Q_DECL_OVERRIDE;
 #endif
-    virtual void dragEnterEvent(QGraphicsSceneDragDropEvent*);
-    virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent*);
-    virtual void dragMoveEvent(QGraphicsSceneDragDropEvent*);
-    virtual void dropEvent(QGraphicsSceneDragDropEvent*);
-    virtual void focusInEvent(QFocusEvent*);
-    virtual void focusOutEvent(QFocusEvent*);
-    virtual void inputMethodEvent(QInputMethodEvent*);
-    virtual bool focusNextPrevChild(bool next);
-
-    virtual bool sceneEvent(QEvent*);
+    void dragEnterEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE;
+    void dropEvent(QGraphicsSceneDragDropEvent*) Q_DECL_OVERRIDE;
+    void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE;
+    void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE;
+    void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE;
+    bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE;
+
+    bool sceneEvent(QEvent*) Q_DECL_OVERRIDE;
 
 private:
     Q_PRIVATE_SLOT(d, void _q_doLoadFinished(bool success))
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.cpp b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
index dd08725eb..b62557eb1 100644
--- a/Source/WebKit/qt/WidgetApi/qwebframe.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebframe.cpp
@@ -26,10 +26,7 @@
 #include "qwebframe_p.h"
 #include "qwebpage.h"
 #include "qwebpage_p.h"
-#include "qwebscriptworld.h"
-#include "qwebscriptworld_p.h"
 #include "qwebsecurityorigin.h"
-#include "DOMWrapperWorld.h"
 #include <QMultiMap>
 #include <qdebug.h>
 #include <qevent.h>
diff --git a/Source/WebKit/qt/WidgetApi/qwebframe.h b/Source/WebKit/qt/WidgetApi/qwebframe.h
index 619594336..1c3cb07c3 100644
--- a/Source/WebKit/qt/WidgetApi/qwebframe.h
+++ b/Source/WebKit/qt/WidgetApi/qwebframe.h
@@ -202,7 +202,7 @@ public:
 
     QWebHitTestResult hitTestContent(const QPoint &pos) const;
 
-    virtual bool event(QEvent *);
+    bool event(QEvent *) Q_DECL_OVERRIDE;
 
     QWebSecurityOrigin securityOrigin() const;
     QWebFrameAdapter* handle() const;
diff --git a/Source/WebKit/qt/WidgetApi/qwebinspector.h b/Source/WebKit/qt/WidgetApi/qwebinspector.h
index d6a4aad3c..c5f097e27 100644
--- a/Source/WebKit/qt/WidgetApi/qwebinspector.h
+++ b/Source/WebKit/qt/WidgetApi/qwebinspector.h
@@ -36,14 +36,14 @@ public:
     void setPage(QWebPage* page);
     QWebPage* page() const;
 
-    QSize sizeHint() const;
-    bool event(QEvent*);
+    QSize sizeHint() const Q_DECL_OVERRIDE;
+    bool event(QEvent*) Q_DECL_OVERRIDE;
 
 protected:
-    void resizeEvent(QResizeEvent* event);
-    void showEvent(QShowEvent* event);
-    void hideEvent(QHideEvent* event);
-    void closeEvent(QCloseEvent* event);
+    void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE;
+    void showEvent(QShowEvent* event) Q_DECL_OVERRIDE;
+    void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE;
+    void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE;
 
 private:
     QWebInspectorPrivate* d;
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index 058d64019..82f59e916 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -23,9 +23,7 @@
 #include "qwebpage.h"
 
 #include "InitWebKitQt.h"
-#include "InspectorClientQt.h"
 #include "InspectorClientWebPage.h"
-#include "InspectorServerQt.h"
 #include "PageClientQt.h"
 #include "QGraphicsWidgetPluginImpl.h"
 #include "QWebUndoCommand.h"
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.h b/Source/WebKit/qt/WidgetApi/qwebpage.h
index e709ef767..6b465e557 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.h
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.h
@@ -337,7 +337,7 @@ public:
     void setPreferredContentsSize(const QSize &size) const;
     void setActualVisibleContentRect(const QRect& rect) const;
 
-    virtual bool event(QEvent*);
+    bool event(QEvent*) Q_DECL_OVERRIDE;
     bool focusNextPrevChild(bool next);
 
     QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
diff --git a/Source/WebKit/qt/WidgetApi/qwebview.h b/Source/WebKit/qt/WidgetApi/qwebview.h
index ac0946773..0ed324da1 100644
--- a/Source/WebKit/qt/WidgetApi/qwebview.h
+++ b/Source/WebKit/qt/WidgetApi/qwebview.h
@@ -55,7 +55,7 @@ class QWEBKITWIDGETS_EXPORT QWebView : public QWidget {
     Q_FLAGS(QPainter::RenderHints)
 public:
     explicit QWebView(QWidget* parent = Q_NULLPTR);
-    virtual ~QWebView();
+    ~QWebView();
 
     QWebPage* page() const;
     void setPage(QWebPage* page);
@@ -90,9 +90,9 @@ public:
     void setTextInteractionFlag(Qt::TextInteractionFlag flag);
     */
 
-    QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+    QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE;
 
-    QSize sizeHint() const;
+    QSize sizeHint() const Q_DECL_OVERRIDE;
 
     qreal zoomFactor() const;
     void setZoomFactor(qreal factor);
@@ -106,7 +106,7 @@ public:
 
     bool findText(const QString& subString, QWebPage::FindFlags options = QWebPage::FindFlags());
 
-    virtual bool event(QEvent*);
+    bool event(QEvent*) Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
     void stop();
@@ -128,33 +128,33 @@ Q_SIGNALS:
     void urlChanged(const QUrl&);
 
 protected:
-    void resizeEvent(QResizeEvent*);
-    void paintEvent(QPaintEvent*);
+    void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE;
 
     virtual QWebView *createWindow(QWebPage::WebWindowType type);
 
-    virtual void changeEvent(QEvent*);
-    virtual void mouseMoveEvent(QMouseEvent*);
-    virtual void mousePressEvent(QMouseEvent*);
-    virtual void mouseDoubleClickEvent(QMouseEvent*);
-    virtual void mouseReleaseEvent(QMouseEvent*);
+    void changeEvent(QEvent*) Q_DECL_OVERRIDE;
+    void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+    void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QMouseEvent*) Q_DECL_OVERRIDE;
+    void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE;
 #ifndef QT_NO_CONTEXTMENU
-    virtual void contextMenuEvent(QContextMenuEvent*);
+    void contextMenuEvent(QContextMenuEvent*) Q_DECL_OVERRIDE;
 #endif
 #ifndef QT_NO_WHEELEVENT
-    virtual void wheelEvent(QWheelEvent*);
+    void wheelEvent(QWheelEvent*) Q_DECL_OVERRIDE;
 #endif
-    virtual void keyPressEvent(QKeyEvent*);
-    virtual void keyReleaseEvent(QKeyEvent*);
-    virtual void dragEnterEvent(QDragEnterEvent*);
-    virtual void dragLeaveEvent(QDragLeaveEvent*);
-    virtual void dragMoveEvent(QDragMoveEvent*);
-    virtual void dropEvent(QDropEvent*);
-    virtual void focusInEvent(QFocusEvent*);
-    virtual void focusOutEvent(QFocusEvent*);
-    virtual void inputMethodEvent(QInputMethodEvent*);
-
-    virtual bool focusNextPrevChild(bool next);
+    void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;
+    void keyReleaseEvent(QKeyEvent*) Q_DECL_OVERRIDE;
+    void dragEnterEvent(QDragEnterEvent*) Q_DECL_OVERRIDE;
+    void dragLeaveEvent(QDragLeaveEvent*) Q_DECL_OVERRIDE;
+    void dragMoveEvent(QDragMoveEvent*) Q_DECL_OVERRIDE;
+    void dropEvent(QDropEvent*) Q_DECL_OVERRIDE;
+    void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE;
+    void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE;
+    void inputMethodEvent(QInputMethodEvent*) Q_DECL_OVERRIDE;
+
+    bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE;
 
 private:
     friend class QWebPage;
diff --git a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h
index 237852dda..0630f1d55 100644
--- a/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h
+++ b/Source/WebKit/qt/WidgetApi/qwebviewaccessible_p.h
@@ -43,15 +43,15 @@ public:
 
     QWebFrame* frame() const;
 
-    QAccessibleInterface* parent() const;
-    int childCount() const;
-    QAccessibleInterface* child(int index) const;
-    int indexOfChild(const QAccessibleInterface*) const;
+    QAccessibleInterface* parent() const Q_DECL_OVERRIDE;
+    int childCount() const Q_DECL_OVERRIDE;
+    QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
+    int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
     int navigate(QAccessible::RelationFlag, int, QAccessibleInterface** target) const;
 
-    QString text(QAccessible::Text) const;
-    QAccessible::Role role() const;
-    QAccessible::State state() const;
+    QString text(QAccessible::Text) const Q_DECL_OVERRIDE;
+    QAccessible::Role role() const Q_DECL_OVERRIDE;
+    QAccessible::State state() const Q_DECL_OVERRIDE;
 };
 
 class QWebPageAccessible : public QAccessibleObject {
@@ -60,15 +60,15 @@ public:
 
     QWebPage* page() const;
 
-    QAccessibleInterface* parent() const;
-    int childCount() const;
-    QAccessibleInterface* child(int index) const;
-    int indexOfChild(const QAccessibleInterface*) const;
+    QAccessibleInterface* parent() const Q_DECL_OVERRIDE;
+    int childCount() const Q_DECL_OVERRIDE;
+    QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
+    int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE;
     int navigate(QAccessible::RelationFlag, int, QAccessibleInterface** target) const;
 
-    QString text(QAccessible::Text) const;
-    QAccessible::Role role() const;
-    QAccessible::State state() const;
+    QString text(QAccessible::Text) const Q_DECL_OVERRIDE;
+    QAccessible::Role role() const Q_DECL_OVERRIDE;
+    QAccessible::State state() const Q_DECL_OVERRIDE;
 };
 
 class QWebViewAccessible : public QAccessibleWidget {
@@ -77,8 +77,8 @@ public:
 
     QWebView* view() const;
 
-    int childCount() const;
-    QAccessibleInterface* child(int index) const;
+    int childCount() const Q_DECL_OVERRIDE;
+    QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
 };
 
 #endif // !QT_NO_ACCESSIBILITY
diff --git a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h
index a6ab065e5..59cf74135 100644
--- a/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h
+++ b/Source/WebKit/qt/WidgetSupport/InspectorClientWebPage.h
@@ -36,13 +36,13 @@
 
 namespace WebKit {
 
-class InspectorClientWebPage : public QWebPage {
+class InspectorClientWebPage final : public QWebPage {
     Q_OBJECT
     friend class InspectorClientQt;
 public:
     InspectorClientWebPage();
 
-    QWebPage* createWindow(QWebPage::WebWindowType);
+    QWebPage* createWindow(QWebPage::WebWindowType) final;
 
 public Q_SLOTS:
     void javaScriptWindowObjectCleared();
diff --git a/Source/WebKit/qt/WidgetSupport/PageClientQt.h b/Source/WebKit/qt/WidgetSupport/PageClientQt.h
index 94de09494..649882990 100644
--- a/Source/WebKit/qt/WidgetSupport/PageClientQt.h
+++ b/Source/WebKit/qt/WidgetSupport/PageClientQt.h
@@ -38,7 +38,7 @@
 
 namespace WebCore {
 
-class PageClientQWidget : public QWebPageClient {
+class PageClientQWidget final : public QWebPageClient {
 public:
     PageClientQWidget(QWidget* newView, QWebPage* newPage)
         : view(newView)
@@ -46,38 +46,38 @@ public:
     {
         Q_ASSERT(view);
     }
-    virtual ~PageClientQWidget();
+    ~PageClientQWidget() final;
 
-    virtual bool isQWidgetClient() const { return true; }
+    bool isQWidgetClient() const final { return true; }
 
-    virtual void scroll(int dx, int dy, const QRect&);
-    virtual void update(const QRect& dirtyRect);
-    virtual void repaintViewport();
-    virtual void setInputMethodEnabled(bool);
-    virtual bool inputMethodEnabled() const;
-    virtual void setInputMethodHints(Qt::InputMethodHints);
+    void scroll(int dx, int dy, const QRect&) final;
+    void update(const QRect& dirtyRect) final;
+    void repaintViewport() final;
+    void setInputMethodEnabled(bool) final;
+    bool inputMethodEnabled() const final;
+    void setInputMethodHints(Qt::InputMethodHints) final;
 
 #ifndef QT_NO_CURSOR
-    virtual QCursor cursor() const;
-    virtual void updateCursor(const QCursor&);
+    QCursor cursor() const final;
+    void updateCursor(const QCursor&) final;
 #endif
 
-    virtual QPalette palette() const;
-    virtual int screenNumber() const;
-    virtual QObject* ownerWidget() const;
-    virtual QRect geometryRelativeToOwnerWidget() const;
-    virtual QPoint mapToOwnerWindow(const QPoint&) const;
+    QPalette palette() const final;
+    int screenNumber() const final;
+    QObject* ownerWidget() const final;
+    QRect geometryRelativeToOwnerWidget() const final;
+    QPoint mapToOwnerWindow(const QPoint&) const final;
 
-    virtual QObject* pluginParent() const;
+    QObject* pluginParent() const final;
 
-    virtual QStyle* style() const;
+    QStyle* style() const final;
 
-    virtual bool viewResizesToContentsEnabled() const { return false; }
+    bool viewResizesToContentsEnabled() const final { return false; }
 
-    virtual QRectF windowRect() const;
+    QRectF windowRect() const final;
 
-    virtual void setWidgetVisible(Widget*, bool visible);
-    virtual bool isViewVisible();
+    void setWidgetVisible(Widget*, bool visible) final;
+    bool isViewVisible() final;
 
     QWidget* view;
     QWebPage* page;
@@ -86,7 +86,7 @@ public:
 #if !defined(QT_NO_GRAPHICSVIEW)
 // the overlay is here for one reason only: to have the scroll-bars and other
 // extra UI elements appear on top of any QGraphicsItems created by CSS compositing layers
-class QGraphicsItemOverlay : public QGraphicsObject {
+class QGraphicsItemOverlay final : public QGraphicsObject {
     public:
     QGraphicsItemOverlay(QGraphicsWidget* view, QWebPage* p)
         : QGraphicsObject(view)
@@ -98,12 +98,12 @@ class QGraphicsItemOverlay : public QGraphicsObject {
         setCacheMode(QGraphicsItem::DeviceCoordinateCache);
     }
 
-    QRectF boundingRect() const
+    QRectF boundingRect() const final
     {
         return q->boundingRect();
     }
 
-    void paint(QPainter* painter, const QStyleOptionGraphicsItem* options, QWidget*)
+    void paint(QPainter* painter, const QStyleOptionGraphicsItem* options, QWidget*) final
     {
         page->mainFrame()->render(painter, static_cast<QWebFrame::RenderLayer>(QWebFrame::AllLayers&(~QWebFrame::ContentsLayer)), options->exposedRect.toRect());
     }
@@ -118,7 +118,7 @@ class QGraphicsItemOverlay : public QGraphicsObject {
 };
 
 
-class PageClientQGraphicsWidget : public QWebPageClient {
+class PageClientQGraphicsWidget final : public QWebPageClient {
 public:
     PageClientQGraphicsWidget(QGraphicsWebView* newView, QWebPage* newPage)
         : view(newView)
@@ -132,44 +132,44 @@ public:
         view->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption);
     }
 
-    virtual ~PageClientQGraphicsWidget();
+    ~PageClientQGraphicsWidget() final;
 
-    virtual bool isQWidgetClient() const { return false; }
+    bool isQWidgetClient() const final { return false; }
 
-    virtual void scroll(int dx, int dy, const QRect&);
-    virtual void update(const QRect& dirtyRect);
-    virtual void repaintViewport();
-    virtual void setInputMethodEnabled(bool);
-    virtual bool inputMethodEnabled() const;
-    virtual void setInputMethodHints(Qt::InputMethodHints);
+    void scroll(int dx, int dy, const QRect&) final;
+    void update(const QRect& dirtyRect) final;
+    void repaintViewport() final;
+    void setInputMethodEnabled(bool) final;
+    bool inputMethodEnabled() const final;
+    void setInputMethodHints(Qt::InputMethodHints) final;
 
 #ifndef QT_NO_CURSOR
-    virtual QCursor cursor() const;
-    virtual void updateCursor(const QCursor&);
+    QCursor cursor() const final;
+    void updateCursor(const QCursor&) final;
 #endif
 
-    virtual QPalette palette() const;
-    virtual int screenNumber() const;
-    virtual QObject* ownerWidget() const;
-    virtual QRect geometryRelativeToOwnerWidget() const;
-    virtual QPoint mapToOwnerWindow(const QPoint&) const;
+    QPalette palette() const final;
+    int screenNumber() const final;
+    QObject* ownerWidget() const final;
+    QRect geometryRelativeToOwnerWidget() const final;
+    QPoint mapToOwnerWindow(const QPoint&) const final;
 
-    virtual QObject* pluginParent() const;
+    QObject* pluginParent() const final;
 
-    virtual QStyle* style() const;
+    QStyle* style() const final;
 
-    virtual bool viewResizesToContentsEnabled() const { return viewResizesToContents; }
+    bool viewResizesToContentsEnabled() const final { return viewResizesToContents; }
 
-    virtual void setWidgetVisible(Widget*, bool);
-    virtual bool isViewVisible();
+    void setWidgetVisible(Widget*, bool) final;
+    bool isViewVisible() final;
 
 #if USE(TILED_BACKING_STORE)
     virtual QRectF graphicsItemVisibleRect() const;
 #endif
 
-    virtual bool makeOpenGLContextCurrentIfAvailable();
+    bool makeOpenGLContextCurrentIfAvailable() final;
 
-    virtual QRectF windowRect() const;
+    QRectF windowRect() const final;
 
     QGraphicsView* firstGraphicsView() const;
 
diff --git a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h
index cddcbc5c9..b606ae701 100644
--- a/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h
+++ b/Source/WebKit/qt/WidgetSupport/QGraphicsWidgetPluginImpl.h
@@ -28,17 +28,17 @@ QT_BEGIN_NAMESPACE
 class QGraphicsWidget;
 QT_END_NAMESPACE
 
-class QGraphicsWidgetPluginImpl : public QtPluginWidgetAdapter {
+class QGraphicsWidgetPluginImpl final : public QtPluginWidgetAdapter {
     Q_OBJECT
 public:
     QGraphicsWidgetPluginImpl(QGraphicsWidget *w) : m_graphicsWidget(w) { }
-    virtual ~QGraphicsWidgetPluginImpl();
-    void update(const QRect &) override;
-    void setGeometryAndClip(const QRect&, const QRect&, bool) override;
-    void setVisible(bool) override;
-    void setStyleSheet(const QString&) override { }
-    void setWidgetParent(QObject*) override;
-    QObject* handle() const override;
+    ~QGraphicsWidgetPluginImpl();
+    void update(const QRect &) final;
+    void setGeometryAndClip(const QRect&, const QRect&, bool) final;
+    void setVisible(bool) final;
+    void setStyleSheet(const QString&) final { }
+    void setWidgetParent(QObject*) final;
+    QObject* handle() const final;
 private:
     QGraphicsWidget *m_graphicsWidget;
 };
diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h
index 5ec4ec20a..9e9cf0af7 100644
--- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h
+++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.h
@@ -42,45 +42,45 @@ namespace WebKit {
 class QStyleFacadeImp : public WebCore::QStyleFacade {
 public:
     QStyleFacadeImp(QWebPageAdapter* = 0);
-    virtual ~QStyleFacadeImp();
+    ~QStyleFacadeImp() override;
 
     static WebCore::QStyleFacade* create(QWebPageAdapter* page)
     { return new QStyleFacadeImp(page); }
 
-    virtual QRect buttonSubElementRect(ButtonSubElement, State, const QRect& originalRect) const;
+    QRect buttonSubElementRect(ButtonSubElement, State, const QRect& originalRect) const override;
 
-    virtual int findFrameLineWidth() const;
-    virtual int simplePixelMetric(PixelMetric, State = State_None) const;
-    virtual int buttonMargin(State, const QRect& originalRect) const;
-    virtual int sliderLength(Qt::Orientation) const;
-    virtual int sliderThickness(Qt::Orientation) const;
-    virtual int progressBarChunkWidth(const QSize&) const;
-    virtual void getButtonMetrics(QString* buttonFontFamily, int* buttonFontPixelSize) const;
+    int findFrameLineWidth() const override;
+    int simplePixelMetric(PixelMetric, State = State_None) const override;
+    int buttonMargin(State, const QRect& originalRect) const override;
+    int sliderLength(Qt::Orientation) const override;
+    int sliderThickness(Qt::Orientation) const override;
+    int progressBarChunkWidth(const QSize&) const override;
+    void getButtonMetrics(QString* buttonFontFamily, int* buttonFontPixelSize) const override;
 
-    virtual QSize comboBoxSizeFromContents(State, const QSize& contentsSize) const;
-    virtual QSize pushButtonSizeFromContents(State, const QSize& contentsSize) const;
+    QSize comboBoxSizeFromContents(State, const QSize& contentsSize) const override;
+    QSize pushButtonSizeFromContents(State, const QSize& contentsSize) const override;
 
-    virtual void paintButton(QPainter*, ButtonType, const WebCore::QStyleFacadeOption &proxyOption);
-    virtual void paintTextField(QPainter*, const WebCore::QStyleFacadeOption&);
-    virtual void paintComboBox(QPainter*, const WebCore::QStyleFacadeOption&);
-    virtual void paintComboBoxArrow(QPainter*, const WebCore::QStyleFacadeOption&);
+    void paintButton(QPainter*, ButtonType, const WebCore::QStyleFacadeOption &proxyOption) override;
+    void paintTextField(QPainter*, const WebCore::QStyleFacadeOption&) override;
+    void paintComboBox(QPainter*, const WebCore::QStyleFacadeOption&) override;
+    void paintComboBoxArrow(QPainter*, const WebCore::QStyleFacadeOption&) override;
 
-    virtual void paintSliderTrack(QPainter*, const WebCore::QStyleFacadeOption&);
-    virtual void paintSliderThumb(QPainter*, const WebCore::QStyleFacadeOption&);
-    virtual void paintInnerSpinButton(QPainter*, const WebCore::QStyleFacadeOption&, bool spinBoxUp);
-    virtual void paintProgressBar(QPainter*, const WebCore::QStyleFacadeOption&, double progress, double animationProgress);
+    void paintSliderTrack(QPainter*, const WebCore::QStyleFacadeOption&) override;
+    void paintSliderThumb(QPainter*, const WebCore::QStyleFacadeOption&) override;
+    void paintInnerSpinButton(QPainter*, const WebCore::QStyleFacadeOption&, bool spinBoxUp) override;
+    void paintProgressBar(QPainter*, const WebCore::QStyleFacadeOption&, double progress, double animationProgress) override;
 
-    virtual int scrollBarExtent(bool mini);
-    virtual bool scrollBarMiddleClickAbsolutePositionStyleHint() const;
-    virtual void paintScrollCorner(QPainter*, const QRect&);
+    int scrollBarExtent(bool mini) override;
+    bool scrollBarMiddleClickAbsolutePositionStyleHint() const override;
+    void paintScrollCorner(QPainter*, const QRect&) override;
 
-    virtual SubControl hitTestScrollBar(const WebCore::QStyleFacadeOption&, const QPoint& pos);
-    virtual QRect scrollBarSubControlRect(const WebCore::QStyleFacadeOption&, SubControl);
-    virtual void paintScrollBar(QPainter*, const WebCore::QStyleFacadeOption&);
+    SubControl hitTestScrollBar(const WebCore::QStyleFacadeOption&, const QPoint& pos) override;
+    QRect scrollBarSubControlRect(const WebCore::QStyleFacadeOption&, SubControl) override;
+    void paintScrollBar(QPainter*, const WebCore::QStyleFacadeOption&) override;
 
-    virtual QObject* widgetForPainter(QPainter*);
+    QObject* widgetForPainter(QPainter*) override;
 
-    virtual bool isValid() const { return style(); }
+    bool isValid() const override { return style(); }
 
 private:
     QStyle* style() const;
diff --git a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h
index b9e616925..c96e0c3d3 100644
--- a/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h
+++ b/Source/WebKit/qt/WidgetSupport/QWebUndoCommand.h
@@ -27,12 +27,12 @@ class UndoStepQt;
 
 #ifndef QT_NO_UNDOCOMMAND
 
-class QWebUndoCommand : public QUndoCommand {
+class QWebUndoCommand final : public QUndoCommand {
 public:
     QWebUndoCommand(QSharedPointer<UndoStepQt>, QUndoCommand *parent = 0);
 
-    void undo();
-    void redo();
+    void undo() final;
+    void redo() final;
 
 private:
     QSharedPointer<UndoStepQt> m_step;
diff --git a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h
index c0ecbcd04..71943f0f6 100644
--- a/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h
+++ b/Source/WebKit/qt/WidgetSupport/QWidgetPluginImpl.h
@@ -26,17 +26,17 @@ QT_BEGIN_NAMESPACE
 class QWidget;
 QT_END_NAMESPACE
 
-class QWidgetPluginImpl : public QtPluginWidgetAdapter {
+class QWidgetPluginImpl final : public QtPluginWidgetAdapter {
     Q_OBJECT
 public:
     QWidgetPluginImpl(QWidget *w) : m_widget(w) { }
-    virtual ~QWidgetPluginImpl();
-    void update(const QRect &) override;
-    void setGeometryAndClip(const QRect&, const QRect&, bool isVisible) override;
-    void setVisible(bool) override;
-    void setStyleSheet(const QString&) override;
-    void setWidgetParent(QObject *) override;
-    QObject* handle() const override;
+    ~QWidgetPluginImpl();
+    void update(const QRect &) final;
+    void setGeometryAndClip(const QRect&, const QRect&, bool isVisible) final;
+    void setVisible(bool) final;
+    void setStyleSheet(const QString&) final;
+    void setWidgetParent(QObject *) final;
+    QObject* handle() const final;
 private:
     QWidget *m_widget;
 };
diff --git a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
index cc2c6adb9..8ecaa3f07 100644
--- a/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
+++ b/Source/WebKit/qt/WidgetSupport/QtFallbackWebPopup.h
@@ -37,19 +37,19 @@ namespace WebCore {
 
 class QtWebComboBox;
 
-class QtFallbackWebPopup : public QWebSelectMethod {
+class QtFallbackWebPopup final : public QWebSelectMethod {
     Q_OBJECT
 public:
     QtFallbackWebPopup(const QWebPageAdapter*);
     ~QtFallbackWebPopup();
 
-    virtual void show(const QWebSelectData&);
-    virtual void hide();
+    void show(const QWebSelectData&) final;
+    void hide() final;
 
-    void setGeometry(const QRect& rect) { m_geometry = rect; }
+    void setGeometry(const QRect& rect) final { m_geometry = rect; }
     QRect geometry() const { return m_geometry; }
 
-    void setFont(const QFont& font) { m_font = font; }
+    void setFont(const QFont& font) final { m_font = font; }
     QFont font() const { return m_font; }
 
 private Q_SLOTS:
diff --git a/Source/WebKit/qt/WidgetSupport/QtWebComboBox.h b/Source/WebKit/qt/WidgetSupport/QtWebComboBox.h
index 1bdb7151a..dfed5b70a 100644
--- a/Source/WebKit/qt/WidgetSupport/QtWebComboBox.h
+++ b/Source/WebKit/qt/WidgetSupport/QtWebComboBox.h
@@ -28,15 +28,15 @@
 
 namespace WebCore {
 
-class QtWebComboBox : public QComboBox {
+class QtWebComboBox final : public QComboBox {
     Q_OBJECT
 public:
     QtWebComboBox();
 
     void showPopupAtCursorPosition();
-    virtual bool eventFilter(QObject* watched, QEvent*);
+    bool eventFilter(QObject* watched, QEvent*) final;
 
-    void hidePopup() override;
+    void hidePopup() final;
     void deleteComboBox();
 
 Q_SIGNALS:
diff --git a/Source/WebKit/qt/declarative/experimental/plugin.cpp b/Source/WebKit/qt/declarative/experimental/plugin.cpp
index e6ffeda6e..163c0cb47 100644
--- a/Source/WebKit/qt/declarative/experimental/plugin.cpp
+++ b/Source/WebKit/qt/declarative/experimental/plugin.cpp
@@ -47,7 +47,7 @@ class WebKitQmlExperimentalExtensionPlugin: public QQmlExtensionPlugin {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json")
 public:
-    virtual void registerTypes(const char* uri)
+    void registerTypes(const char* uri) override
     {
         qWarning("\nWARNING: This project is using the experimental QML API extensions for QtWebKit and is therefore tied to a specific QtWebKit release.\n"
                  "WARNING: The experimental API will change from version to version, or even be removed. You have been warned!\n");
diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp
index b1a176ccf..f5d52e4bd 100644
--- a/Source/WebKit/qt/declarative/plugin.cpp
+++ b/Source/WebKit/qt/declarative/plugin.cpp
@@ -42,14 +42,14 @@ class WebKitQmlPlugin : public QQmlExtensionPlugin {
     Q_OBJECT
 public:
 #if defined(HAVE_WEBKIT2)
-    virtual void initializeEngine(QQmlEngine* engine, const char* uri)
+    void initializeEngine(QQmlEngine* engine, const char* uri) override
     {
         Q_UNUSED(uri);
         engine->addImageProvider(QLatin1String("webicon"), new QWebIconImageProvider);
     }
 #endif
 
-    virtual void registerTypes(const char* uri)
+    void registerTypes(const char* uri) override
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit"));