Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3

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

20 files changed, 90 insertions, 87 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp b/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
index a5183b135..9f5ff5d0e 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/qt/InjectedBundleQt.cpp
@@ -54,8 +54,4 @@ bool InjectedBundle::load(APIObject* initializationUserData)
     return true;
 }
 
-void InjectedBundle::activateMacFontAscentHack()
-{
-}
-
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
index b396b0b34..8b8eaa0bc 100644
--- a/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/unix/NetscapePluginUnix.cpp
@@ -51,13 +51,14 @@ bool NetscapePlugin::platformPostInitialize()
     }
 #endif
 
-    if (m_impl) {
-        m_npWindow.type = m_impl->windowType();
-        m_npWindow.window = m_impl->window();
-        m_npWindow.ws_info = m_impl->windowSystemInfo();
-        callSetWindow();
-    }
+    // Windowed plugins need a platform implementation.
+    if (!m_impl)
+        return !m_isWindowed;
 
+    m_npWindow.type = m_impl->windowType();
+    m_npWindow.window = m_impl->window();
+    m_npWindow.ws_info = m_impl->windowSystemInfo();
+    callSetWindow();
     return true;
 }
 
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
index 175a20006..61cf8130f 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
@@ -221,7 +221,7 @@ void WebEditorClient::discardedComposition(Frame*)
 void WebEditorClient::updateGlobalSelection(Frame* frame)
 {
     if (supportsGlobalSelection() && frame->selection().isRange())
-        Pasteboard::createForGlobalSelection()->writeSelection(frame->selection().toNormalizedRange().get(), frame->editor().canSmartCopyOrDelete(), frame);
+        Pasteboard::createForGlobalSelection()->writeSelection(*frame->selection().toNormalizedRange(), frame->editor().canSmartCopyOrDelete(), *frame);
 }
 
 #endif
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 00828dde6..5c341bacf 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1155,9 +1155,9 @@ bool WebFrameLoaderClient::shouldFallBack(const ResourceError& error)
         return false;
 
 #if PLATFORM(QT)
-    DEFINE_STATIC_LOCAL(const ResourceError, errorInterruptedForPolicyChange, (this->interruptedForPolicyChangeError(ResourceRequest())));
+    static NeverDestroyed<const ResourceError> errorInterruptedForPolicyChange(this->interruptedForPolicyChangeError(ResourceRequest()));
 
-    if (error.errorCode() == errorInterruptedForPolicyChange.errorCode() && error.domain() == errorInterruptedForPolicyChange.domain())
+    if (error.errorCode() == errorInterruptedForPolicyChange.get().errorCode() && error.domain() == errorInterruptedForPolicyChange.get().domain())
         return false;
 #endif
 
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp
index 056412894..380208a46 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "WebDragClient.h"
 
-#include "Clipboard.h"
+#include "DataTransfer.h"
 #include "DragData.h"
 #include "GraphicsContext.h"
 #include "Pasteboard.h"
@@ -51,11 +51,11 @@ static PassRefPtr<ShareableBitmap> convertQPixmapToShareableBitmap(QPixmap* pixm
     return bitmap.release();
 }
 
-void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& clientPosition, const IntPoint& globalPosition, Clipboard* clipboard, Frame*, bool)
+void WebDragClient::startDrag(DragImageRef dragImage, const IntPoint& clientPosition, const IntPoint& globalPosition, DataTransfer& dataTransfer, Frame&, bool)
 {
-    QMimeData* clipboardData = clipboard->pasteboard().clipboardData();
-    DragOperation dragOperationMask = clipboard->sourceOperation();
-    clipboard->pasteboard().invalidateWritableData();
+    QMimeData* clipboardData = dataTransfer.pasteboard().clipboardData();
+    DragOperation dragOperationMask = dataTransfer.sourceOperation();
+    dataTransfer.pasteboard().invalidateWritableData();
     DragData dragData(clipboardData, clientPosition, globalPosition, dragOperationMask);
 
     RefPtr<ShareableBitmap> bitmap = convertQPixmapToShareableBitmap(dragImage);
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
index 7f2e74ce8..db024165d 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp
@@ -27,22 +27,21 @@
 #include "config.h"
 #include "WebErrors.h"
 
-#include "WKError.h"
-#include "WebError.h"
+#include "APIError.h"
+#include "WKErrorRef.h"
+#include <QCoreApplication>
+#include <QNetworkReply>
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
 
-#include <QCoreApplication>
-#include <QNetworkReply>
-
 using namespace WebCore;
 
 namespace WebKit {
 
 ResourceError cancelledError(const ResourceRequest& request)
 {
-    ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url().string(),
+    ResourceError error = ResourceError("QtNetwork", QNetworkReply::OperationCanceledError, request.url(),
                                         QCoreApplication::translate("QWebFrame", "Request cancelled"));
     error.setIsCancellation(true);
     return error;    
@@ -50,38 +49,50 @@ ResourceError cancelledError(const ResourceRequest& request)
 
 ResourceError blockedError(const ResourceRequest& request)
 {
-    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url().string(),
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotUseRestrictedPort, request.url(),
                          QCoreApplication::translate("QWebFrame", "Request blocked"));
 }
 
+ResourceError blockedByContentBlockerError(const WebCore::ResourceRequest& request)
+{
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadBlockedByContentBlocker, request.url(),
+                         QCoreApplication::translate("QWebFrame", "The URL was blocked by a content blocker"));
+}
+
 ResourceError cannotShowURLError(const ResourceRequest& request)
 {
-    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url().string(),
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowURL, request.url(),
                          QCoreApplication::translate("QWebFrame", "Cannot show URL"));
 }
 
 ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
 {
-    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(),
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url(),
                          QCoreApplication::translate("QWebFrame", "Frame load interrupted by policy change"));
 }
 
 ResourceError cannotShowMIMETypeError(const ResourceResponse& response)
 {
-    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url().string(),
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodeCannotShowMIMEType, response.url(),
                          QCoreApplication::translate("QWebFrame", "Cannot show mimetype"));
 }
 
 ResourceError fileDoesNotExistError(const ResourceResponse& response)
 {
-    return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url().string(),
+    return ResourceError("QtNetwork", QNetworkReply::ContentNotFoundError, response.url(),
                          QCoreApplication::translate("QWebFrame", "File does not exist"));
 }
 
 ResourceError pluginWillHandleLoadError(const ResourceResponse& response)
 {
-    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url().string(),
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorCodePlugInWillHandleLoad, response.url(),
                          QCoreApplication::translate("QWebFrame", "Loading is handled by the media engine"));
 }
 
+ResourceError internalError(const WebCore::URL& url)
+{
+    return ResourceError(API::Error::webKitErrorDomain(), kWKErrorInternal, url,
+                         QCoreApplication::translate("QWebFrame", "WebKit encountered an internal error"));
+}
+
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
index 7d8a7908e..e17ca0376 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
@@ -33,7 +33,7 @@ WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
 {
     // Save the page ID for a valid page as it is needed later for HTTP authentication and SSL errors.
     if (frame->page()) {
-        m_originatingObject = adoptPtr(new QObject);
+        m_originatingObject.reset(new QObject);
         m_originatingObject->setProperty("pageID", qulonglong(frame->page()->pageID()));
     }
 }
diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
index 966e6d2e9..8e72baef6 100644
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
@@ -22,7 +22,6 @@
 
 #include "WebProcess.h"
 #include <WebCore/FrameNetworkingContext.h>
-#include <wtf/OwnPtr.h>
 
 namespace WebKit {
 
@@ -31,17 +30,18 @@ class WebFrame;
 class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
 public:
     static PassRefPtr<WebFrameNetworkingContext> create(WebFrame*);
-    QObject* originatingObject() const { return m_originatingObject.get(); }
+
+    QObject* originatingObject() const override { return m_originatingObject.get(); }
 
 private:
     WebFrameNetworkingContext(WebFrame*);
     ~WebFrameNetworkingContext() { }
 
-    QNetworkAccessManager* networkAccessManager() const { return WebProcess::shared().networkAccessManager(); }
-    bool mimeSniffingEnabled() const { return m_mimeSniffingEnabled; }
-    bool thirdPartyCookiePolicyPermission(const QUrl&) const { /*TODO. Used QWebSettings in WK1.*/ return true; }
+    QNetworkAccessManager* networkAccessManager() const override { return WebProcess::singleton().networkAccessManager(); }
+    bool mimeSniffingEnabled() const override { return m_mimeSniffingEnabled; }
+    bool thirdPartyCookiePolicyPermission(const QUrl&) const override { /*TODO. Used QWebSettings in WK1.*/ return true; }
 
-    OwnPtr<QObject> m_originatingObject;
+    std::unique_ptr<QObject> m_originatingObject;
     bool m_mimeSniffingEnabled;
 };
 
diff --git a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp
index 508595b0f..e086edab4 100644
--- a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.cpp
@@ -75,11 +75,11 @@ void TapHighlightController::hideHighlight()
         m_webPage->mainFrame()->pageOverlayController().uninstallPageOverlay(m_overlay, PageOverlay::FadeMode::Fade);
 }
 
-void TapHighlightController::pageOverlayDestroyed(PageOverlay*)
+void TapHighlightController::pageOverlayDestroyed(PageOverlay&)
 {
 }
 
-void TapHighlightController::willMoveToWebPage(PageOverlay*, WebPage* webPage)
+void TapHighlightController::willMoveToPage(PageOverlay&, WebCore::Page* webPage)
 {
     if (webPage)
         return;
@@ -89,7 +89,7 @@ void TapHighlightController::willMoveToWebPage(PageOverlay*, WebPage* webPage)
     m_overlay = 0;
 }
 
-void TapHighlightController::didMoveToWebPage(PageOverlay*, WebPage*)
+void TapHighlightController::didMoveToPage(PageOverlay&, WebCore::Page*)
 {
 }
 
@@ -98,19 +98,19 @@ static Color highlightColor(Color baseColor, float fractionFadedIn)
     return Color(baseColor.red(), baseColor.green(), baseColor.blue(), int(baseColor.alpha() * fractionFadedIn));
 }
 
-void TapHighlightController::drawRect(PageOverlay* /*pageOverlay*/, GraphicsContext& context, const IntRect& /*dirtyRect*/)
+void TapHighlightController::drawRect(PageOverlay& /*pageOverlay*/, GraphicsContext& context, const IntRect& /*dirtyRect*/)
 {
     if (m_path.isEmpty())
         return;
 
     {
         GraphicsContextStateSaver stateSaver(context);
-        context.setFillColor(highlightColor(m_color, 0.5f), ColorSpaceSRGB);
+        context.setFillColor(highlightColor(m_color, 0.5f));
         context.fillPath(m_path);
     }
 }
 
-bool TapHighlightController::mouseEvent(PageOverlay*, const WebMouseEvent&)
+bool TapHighlightController::mouseEvent(PageOverlay&, const WebCore::PlatformMouseEvent&)
 {
     return false;
 }
diff --git a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.h b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.h
index 5c39f7e64..f78b7f469 100644
--- a/Source/WebKit2/WebProcess/WebPage/TapHighlightController.h
+++ b/Source/WebKit2/WebProcess/WebPage/TapHighlightController.h
@@ -36,6 +36,7 @@ namespace WebCore {
 class Frame;
 class IntRect;
 class Node;
+class Page;
 }
 
 namespace WebKit {
@@ -54,11 +55,11 @@ public:
 
 private:
     // PageOverlay::Client.
-    virtual void pageOverlayDestroyed(WebCore::PageOverlay*);
-    virtual void willMoveToWebPage(WebCore::PageOverlay*, WebPage*);
-    virtual void didMoveToWebPage(WebCore::PageOverlay*, WebPage*);
-    virtual bool mouseEvent(WebCore::PageOverlay*, const WebMouseEvent&);
-    virtual void drawRect(WebCore::PageOverlay*, WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect);
+    void pageOverlayDestroyed(WebCore::PageOverlay&) override;
+    void willMoveToPage(WebCore::PageOverlay&, WebCore::Page*) override;
+    void didMoveToPage(WebCore::PageOverlay&, WebCore::Page*) override;
+    bool mouseEvent(WebCore::PageOverlay&, const WebCore::PlatformMouseEvent&) override;
+    void drawRect(WebCore::PageOverlay&, WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect) override;
 
 private:
     WebPage* m_webPage;
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 71fe0688e..2cd709f22 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -834,8 +834,8 @@ EditorState WebPage::editorState(IncludePostLayoutDataHint shouldIncludePostLayo
     if (!scope)
         return result;
 
-    if (isHTMLInputElement(scope)) {
-        HTMLInputElement* input = toHTMLInputElement(scope);
+    if (is<HTMLInputElement>(scope)) {
+        HTMLInputElement* input = downcast<HTMLInputElement>(scope);
         if (input->isTelephoneField())
             result.inputMethodHints |= Qt::ImhDialableCharactersOnly;
         else if (input->isNumberField())
@@ -881,8 +881,8 @@ EditorState WebPage::editorState(IncludePostLayoutDataHint shouldIncludePostLayo
 
     // FIXME: We should only transfer innerText when it changes and do this on the UI side.
     if (result.isContentEditable) {
-        if (isHTMLTextFormControlElement(scope))
-            result.surroundingText = toHTMLTextFormControlElement(scope)->innerTextValue();
+        if (is<HTMLTextFormControlElement>(scope))
+            result.surroundingText = downcast<HTMLTextFormControlElement>(scope)->innerTextValue();
         else
             result.surroundingText = scope->innerText();
 
@@ -2306,7 +2306,7 @@ void WebPage::highlightPotentialActivation(const IntPoint& point, const IntSize&
                 break;
 
             // We always highlight focusable (form-elements), image links or content-editable elements.
-            if ((node->isElementNode() && toElement(node)->isMouseFocusable()) || node->isLink() || node->isContentEditable())
+            if ((node->isElementNode() && downcast<Element>(node)->isMouseFocusable()) || node->isLink() || node->isContentEditable())
                 activationNode = node;
             else if (node->willRespondToMouseClickEvents()) {
                 // Highlight elements with default mouse-click handlers, but highlight only inline elements with
diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
index 0a7516c12..8be9a42a9 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
@@ -83,6 +83,7 @@
 #include "QtNetworkReply.h"
 #include "QtNetworkReplyData.h"
 #include "QtNetworkRequestData.h"
+#include "TapHighlightController.h"
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #endif
diff --git a/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp b/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorUIQt.cpp
index 1d7d539cc..838627309 100644
--- a/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorQt.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/qt/WebInspectorUIQt.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "WebInspector.h"
+#include "WebInspectorUI.h"
 
 #if ENABLE(INSPECTOR)
 
@@ -33,15 +33,14 @@
 
 namespace WebKit {
 
-bool WebInspector::canSave() const
+bool WebInspectorUI::canSave()
 {
     return false;
 }
 
-String WebInspector::localizedStringsURL() const
+String WebInspectorUI::localizedStringsURL()
 {
-    notImplemented();
-    return String();
+    return ASCIILiteral("qrc:///org/webkitgtk/inspector/Localizations/en.lproj/localizedStrings.js");
 }
 
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
index 6ee8a1d12..654829487 100644
--- a/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp
@@ -300,7 +300,7 @@ PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const URL&)
 
 void WebPage::registerApplicationScheme(const String& scheme)
 {
-    QtNetworkAccessManager* qnam = qobject_cast<QtNetworkAccessManager*>(WebProcess::shared().networkAccessManager());
+    QtNetworkAccessManager* qnam = qobject_cast<QtNetworkAccessManager*>(WebProcess::singleton().networkAccessManager());
     if (!qnam)
         return;
     qnam->registerApplicationScheme(this, QString(scheme));
@@ -334,7 +334,7 @@ void WebPage::hidePopupMenu()
         return;
 
     m_activePopupMenu->client()->popupDidHide();
-    m_activePopupMenu = 0;
+    m_activePopupMenu = nullptr;
 }
 
 } // namespace WebKit
diff --git a/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp b/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp
index 3bb795cad..c0894bff7 100644
--- a/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp
+++ b/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.cpp
@@ -33,13 +33,12 @@
 #include "WKString.h"
 #include "WKStringQt.h"
 #include "WKType.h"
-#include <wtf/PassOwnPtr.h>
 
 namespace WebKit {
 
 QtBuiltinBundle::~QtBuiltinBundle()
 {
-    // For OwnPtr's sake.
+    // For unique_ptr's sake.
 }
 
 QtBuiltinBundle& QtBuiltinBundle::shared()
@@ -79,7 +78,7 @@ void QtBuiltinBundle::didReceiveMessageToPage(WKBundleRef, WKBundlePageRef page,
 
 void QtBuiltinBundle::didCreatePage(WKBundlePageRef page)
 {
-    m_pages.add(page, adoptPtr(new QtBuiltinBundlePage(this, page)));
+    m_pages.add(page, std::make_unique<QtBuiltinBundlePage>(this, page));
 }
 
 void QtBuiltinBundle::willDestroyPage(WKBundlePageRef page)
diff --git a/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.h b/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.h
index 55f042b6c..fea74f8c5 100644
--- a/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.h
+++ b/Source/WebKit2/WebProcess/qt/QtBuiltinBundle.h
@@ -30,7 +30,6 @@
 #include "WKBundle.h"
 #include "WKBundlePage.h"
 #include <wtf/HashMap.h>
-#include <wtf/OwnPtr.h>
 
 namespace WebKit {
 
@@ -61,7 +60,7 @@ private:
     void handleMessageToNavigatorQtWebChannelTransport(WKBundlePageRef, WKTypeRef messageBody);
 #endif
 
-    HashMap<WKBundlePageRef, OwnPtr<QtBuiltinBundlePage> > m_pages;
+    HashMap<WKBundlePageRef, std::unique_ptr<QtBuiltinBundlePage>> m_pages;
     WKBundleRef m_bundle;
 };
 
diff --git a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h
index fe37bda1f..5a3934b0e 100644
--- a/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h
+++ b/Source/WebKit2/WebProcess/qt/QtNetworkAccessManager.h
@@ -44,7 +44,7 @@ public:
     void registerApplicationScheme(const WebPage*, const QString& scheme);
 
 protected:
-    virtual QNetworkReply* createRequest(Operation, const QNetworkRequest&, QIODevice* outgoingData = 0) OVERRIDE;
+    QNetworkReply* createRequest(Operation, const QNetworkRequest&, QIODevice* outgoingData = 0) override;
 
 private Q_SLOTS:
     void onAuthenticationRequired(QNetworkReply *, QAuthenticator *);
diff --git a/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp b/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
index 87689d971..bcda4380b 100644
--- a/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
+++ b/Source/WebKit2/WebProcess/qt/QtNetworkReply.cpp
@@ -51,7 +51,7 @@ void QtNetworkReply::setData(const SharedMemory::Handle& handle, qint64 dataSize
 {
     if (handle.isNull())
         return;
-    m_sharedMemory = SharedMemory::create(handle, SharedMemory::ReadOnly);
+    m_sharedMemory = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     if (!m_sharedMemory)
         return;
 
@@ -98,4 +98,3 @@ void QtNetworkReply::finalize()
 }
 
 } // namespace WebKit
-
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
index 474b6c6fe..1c202cf08 100644
--- a/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+++ b/Source/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
@@ -36,8 +36,8 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <WebCore/RunLoop.h>
 #include <errno.h>
+#include <wtf/RunLoop.h>
 
 #ifndef NDEBUG
 #if !OS(WINDOWS)
@@ -72,14 +72,13 @@ static void sleep(unsigned seconds)
 #endif
 #endif
 
-class EnvHttpProxyFactory : public QNetworkProxyFactory
-{
+class EnvHttpProxyFactory : public QNetworkProxyFactory {
 public:
     EnvHttpProxyFactory() { }
 
     bool initializeFromEnvironment();
 
-    QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery& query = QNetworkProxyQuery());
+    QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery& = QNetworkProxyQuery());
 
 private:
     QList<QNetworkProxy> m_httpProxy;
@@ -132,9 +131,9 @@ static void initializeProxy()
     if (proxylist.count() == 1) {
         QNetworkProxy proxy = proxylist.first();
         if (proxy == QNetworkProxy::NoProxy || proxy == QNetworkProxy::DefaultProxy) {
-            OwnPtr<EnvHttpProxyFactory> proxyFactory = adoptPtr(new EnvHttpProxyFactory());
+            auto proxyFactory = std::make_unique<EnvHttpProxyFactory>();
             if (proxyFactory->initializeFromEnvironment()) {
-                QNetworkProxyFactory::setApplicationProxyFactory(proxyFactory.leakPtr());
+                QNetworkProxyFactory::setApplicationProxyFactory(proxyFactory.release());
                 return;
             }
         }
@@ -232,13 +231,13 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app)
         qDebug() << "Error: connection identifier wrong.";
         return 1;
     }
-    CoreIPC::Connection::Identifier identifier;
+    IPC::Connection::Identifier identifier;
 #if OS(WINDOWS)
     // Convert to HANDLE
-    identifier = reinterpret_cast<CoreIPC::Connection::Identifier>(id);
+    identifier = reinterpret_cast<IPC::Connection::Identifier>(id);
 #else
     // Convert to int
-    identifier = static_cast<CoreIPC::Connection::Identifier>(id);
+    identifier = static_cast<IPC::Connection::Identifier>(id);
 #endif
 #endif
 
@@ -246,7 +245,7 @@ Q_DECL_EXPORT int WebProcessMainQt(QGuiApplication* app)
     WebKit::ChildProcessInitializationParameters parameters;
     parameters.connectionIdentifier = identifier;
 
-    WebKit::WebProcess::shared().initialize(parameters);
+    WebKit::WebProcess::singleton().initialize(parameters);
 
     RunLoop::run();
 
diff --git a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
index 4035f6734..f395198ef 100644
--- a/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
+++ b/Source/WebKit2/WebProcess/qt/WebProcessQt.cpp
@@ -72,7 +72,7 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
     unsigned cacheTotalCapacity = 0;
     unsigned cacheMinDeadCapacity = 0;
     unsigned cacheMaxDeadCapacity = 0;
-    double deadDecodedDataDeletionInterval = 0;
+    auto deadDecodedDataDeletionInterval = std::chrono::seconds { 0 };
     unsigned pageCacheCapacity = 0;
     unsigned long urlCacheMemoryCapacity = 0;
     unsigned long urlCacheDiskCapacity = 0;
@@ -84,10 +84,11 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
     if (diskCache)
         diskCache->setMaximumCacheSize(urlCacheDiskCapacity);
 
-    memoryCache()->setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
-    memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
+    auto& memoryCache = MemoryCache::singleton();
+    memoryCache.setCapacities(cacheMinDeadCapacity, cacheMaxDeadCapacity, cacheTotalCapacity);
+    memoryCache.setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
 
-    pageCache()->setCapacity(pageCacheCapacity);
+    PageCache::singleton().setMaxSize(pageCacheCapacity);
 
     // FIXME: Implement hybrid in-memory- and disk-caching as e.g. the Mac port does.
 }
@@ -103,7 +104,7 @@ static void parentProcessDiedCallback(void*)
 }
 #endif
 
-void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::MessageDecoder&)
+void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, IPC::MessageDecoder&)
 {
 #if ENABLE(SECCOMP_FILTERS)
     {
@@ -138,13 +139,10 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
     }
 #endif
 
-    WebCore::RuntimeEnabledFeatures::sharedFeatures().setSpeechInputEnabled(false);
-
     // We'll only install the Qt builtin bundle if we don't have one given by the UI process.
     // Currently only WTR provides its own bundle.
     if (parameters.injectedBundlePath.isEmpty()) {
-        m_injectedBundle = InjectedBundle::create(String());
-        m_injectedBundle->setSandboxExtension(SandboxExtension::create(parameters.injectedBundlePathExtensionHandle));
+        InjectedBundle::create(parameters, transformHandlesToObjects(parameters.initializationUserData.object()).get());
         QtBuiltinBundle::shared().initialize(toAPI(m_injectedBundle.get()));
     }
 }