Merge 'wip/next' into dev

Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9

1 files changed, 133 insertions, 106 deletions

diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
index bc2d5d21c..cf8ac19d9 100644
--- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
@@ -23,10 +23,13 @@
 #include "config.h"
 #include "qquickwebview_p.h"
 
+#include "APIPageConfiguration.h"
+#include "CoordinatedDrawingAreaProxy.h"
+#include "CoordinatedGraphicsScene.h"
 #include "CoordinatedLayerTreeHostProxy.h"
 #include "DownloadProxy.h"
-#include "DrawingAreaProxyImpl.h"
 #include "PageViewportControllerClientQt.h"
+#include "QrcSchemeHandler.h"
 #include "QtDialogRunner.h"
 #include "QtDownloadManager.h"
 #include "QtWebContext.h"
@@ -35,7 +38,6 @@
 #include "QtWebPageEventHandler.h"
 #include "QtWebPagePolicyClient.h"
 #include "WebBackForwardList.h"
-#include "WebContext.h"
 #include "WebFindOptions.h"
 #if ENABLE(INSPECTOR_SERVER)
 #include "WebInspectorProxy.h"
@@ -46,6 +48,7 @@
 #endif
 #include "WebPageGroup.h"
 #include "WebPreferences.h"
+#include "WebProcessPool.h"
 #include "qglobal.h"
 #include "qquicknetworkreply_p.h"
 #include "qquicknetworkrequest_p.h"
@@ -67,15 +70,16 @@
 #include <QtCore/QFile>
 #include <QtQml/QJSValue>
 #include <QtQuick/QQuickView>
+#include <WKData.h>
 #include <WKNumber.h>
 #include <WKOpenPanelResultListener.h>
+#include <WKPageConfigurationRef.h>
 #include <WKPageGroup.h>
-#include <WKPreferences.h>
+#include <WKPreferencesRef.h>
 #include <WKSerializedScriptValue.h>
 #include <WKString.h>
 #include <WKStringQt.h>
 #include <WKURLQt.h>
-#include <WebCore/CoordinatedGraphicsScene.h>
 #include <WebCore/IntPoint.h>
 #include <WebCore/IntRect.h>
 #include <limits>
@@ -84,15 +88,16 @@
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
-#ifdef HAVE_WEBCHANNEL
-#include <QtWebChannel/QQmlWebChannel>
+#if ENABLE(QT_WEBCHANNEL)
 #include "qwebchannelwebkittransport_p.h"
+#include <QtWebChannel/QQmlWebChannel>
 #endif
 
 using namespace WebCore;
 using namespace WebKit;
 
-static bool s_flickableViewportEnabled = true;
+// QTFIXME: flickable viewport has painting artifacts so we cannot enable it by default
+static bool s_flickableViewportEnabled = false; //true;
 static const int kAxisLockSampleCount = 5;
 static const qreal kAxisLockVelocityThreshold = 300;
 static const qreal kAxisLockVelocityDirectionThreshold = 50;
@@ -131,6 +136,11 @@ static QJSValue buildQJSValue(QJSEngine* engine, JSGlobalContextRef context, JSV
         return var;
 
     switch (JSValueGetType(context, value)) {
+    case kJSTypeUndefined:
+        break;
+    case kJSTypeNull:
+        var = QJSValue(QJSValue::NullValue);
+        break;
     case kJSTypeBoolean:
         var = QJSValue(JSValueToBoolean(context, value));
         break;
@@ -324,39 +334,47 @@ QQuickWebViewPrivate::~QQuickWebViewPrivate()
 }
 
 // Note: we delay this initialization to make sure that QQuickWebView has its d-ptr in-place.
-void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
-{
-    pageGroup = pageGroupRef;
-    if (!pageGroup)
-        pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(0));
+void QQuickWebViewPrivate::initialize(WKPageConfigurationRef configurationRef)
+{
+    WKRetainPtr<WKPageConfigurationRef> pageConfiguration;
+    WKContextRef contextRef = nullptr;
+
+    if (configurationRef) {
+        pageConfiguration = adoptWK(configurationRef);
+        contextRef = WKPageConfigurationGetContext(configurationRef);
+        context = QtWebContext::create(contextRef);
+    } else {
+        pageConfiguration = adoptWK(WKPageConfigurationCreate());
+        WKRetainPtr<WKPageGroupRef> pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(0));
+        WKPageConfigurationSetPageGroup(pageConfiguration.get(), pageGroup.get());
+        context = QtWebContext::defaultContext();
+    }
 
-    context = contextRef ? QtWebContext::create(contextRef) : QtWebContext::defaultContext();
-    webPageProxy = toImpl(context->context())->createWebPage(&pageClient, toImpl(pageGroup.get()));
+    webPageProxy = toImpl(context->context())->createWebPage(pageClient, toImpl(pageConfiguration.get())->copy());
     webPage = toAPI(webPageProxy.get());
     pageToView()->insert(webPage.get(), this);
 
-    webPageProxy->setUseFixedLayout(s_flickableViewportEnabled);
-#if ENABLE(FULLSCREEN_API)
-    webPageProxy->fullScreenManager()->setWebView(q_ptr);
-#endif
-
     pageEventHandler.reset(new QtWebPageEventHandler(webPage.get(), pageView.data(), q_ptr));
+    pageClient.initialize(q_ptr, pageEventHandler.data(), &undoController);
+    webPageProxy->initializeWebPage();
+
+    webPageProxy->setUseFixedLayout(s_flickableViewportEnabled);
 
     {
-        WKPageFindClient findClient;
-        memset(&findClient, 0, sizeof(WKPageFindClient));
-        findClient.version = kWKPageFindClientCurrentVersion;
-        findClient.clientInfo = this;
+        WKPageFindClientV0 findClient;
+        memset(&findClient, 0, sizeof(WKPageFindClientV0));
+        findClient.base.version = 0;
+        findClient.base.clientInfo = this;
         findClient.didFindString = didFindString;
         findClient.didFailToFindString = didFailToFindString;
-        WKPageSetPageFindClient(webPage.get(), &findClient);
+        WKPageSetPageFindClient(webPage.get(), &findClient.base);
     }
 
     {
-        WKPageLoaderClient loadClient;
-        memset(&loadClient, 0, sizeof(WKPageLoaderClient));
-        loadClient.version = kWKPageLoaderClientCurrentVersion;
-        loadClient.clientInfo = this;
+        WKPageLoaderClientV0 loadClient;
+        memset(&loadClient, 0, sizeof(WKPageLoaderClientV0));
+        loadClient.base.version = 0;
+        loadClient.base.clientInfo = this;
         loadClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
         loadClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
         loadClient.didFailProvisionalLoadWithErrorForFrame = didFailLoad;
@@ -371,29 +389,28 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa
         loadClient.didChangeBackForwardList = didChangeBackForwardList;
         loadClient.processDidBecomeUnresponsive = processDidBecomeUnresponsive;
         loadClient.processDidBecomeResponsive = processDidBecomeResponsive;
-        WKPageSetPageLoaderClient(webPage.get(), &loadClient);
+        WKPageSetPageLoaderClient(webPage.get(), &loadClient.base);
     }
 
     pagePolicyClient.reset(new QtWebPagePolicyClient(webPage.get(), q_ptr));
     pageUIClient.reset(new QtWebPageUIClient(webPage.get(), q_ptr));
-    navigationHistory = adoptPtr(QWebNavigationHistoryPrivate::createHistory(webPage.get()));
+    navigationHistory.reset(QWebNavigationHistoryPrivate::createHistory(webPage.get()));
 
     QtWebIconDatabaseClient* iconDatabase = context->iconDatabase();
     QObject::connect(iconDatabase, SIGNAL(iconChangedForPageURL(QString)), q_ptr, SLOT(_q_onIconChangedForPageURL(QString)));
 
     // Any page setting should preferrable be set before creating the page.
-    WKPreferencesRef preferencesRef = WKPageGroupGetPreferences(pageGroup.get());
-    WKPreferencesSetAcceleratedCompositingEnabled(preferencesRef, true);
+    auto& preferences = webPageProxy->pageGroup().preferences();
+    preferences.setAcceleratedCompositingEnabled(true);
     bool showDebugVisuals = qgetenv("WEBKIT_SHOW_COMPOSITING_DEBUG_VISUALS") == "1";
-    WKPreferencesSetCompositingBordersVisible(preferencesRef, showDebugVisuals);
-    WKPreferencesSetCompositingRepaintCountersVisible(preferencesRef, showDebugVisuals);
-    WKPreferencesSetFrameFlatteningEnabled(preferencesRef, true);
-    WKPreferencesSetWebGLEnabled(preferencesRef, true);
-    webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true);
+    preferences.setCompositingBordersVisible(showDebugVisuals);
+    preferences.setCompositingRepaintCountersVisible(showDebugVisuals);
+    preferences.setFrameFlatteningEnabled(true);
+    preferences.setMediaSourceEnabled(false);
+    preferences.setWebGLEnabled(true);
+    preferences.setForceCompositingMode(true);
 
-    pageClient.initialize(q_ptr, pageEventHandler.data(), &undoController);
-    webPageProxy->initializeWebPage();
-    webPageProxy->registerApplicationScheme(ASCIILiteral("qrc"));
+    webPageProxy->setURLSchemeHandlerForScheme(QrcSchemeHandler::create(), ASCIILiteral("qrc"));
 
     q_ptr->setAcceptedMouseButtons(Qt::MouseButtonMask);
     q_ptr->setAcceptHoverEvents(true);
@@ -526,13 +543,12 @@ void QQuickWebViewPrivate::didChangeBackForwardList(WKPageRef, WKBackForwardList
 
 void QQuickWebViewPrivate::setTransparentBackground(bool enable)
 {
-    webPageProxy->setDrawsTransparentBackground(enable);
     webPageProxy->setDrawsBackground(!enable);
 }
 
 bool QQuickWebViewPrivate::transparentBackground() const
 {
-    return webPageProxy->drawsTransparentBackground();
+    return !webPageProxy->drawsBackground();
 }
 
 void QQuickWebViewPrivate::loadProgressDidChange(int loadProgress)
@@ -575,7 +591,7 @@ void QQuickWebViewPrivate::setNeedsDisplay()
         // the web process when running tests even if the render loop is not active.
         QImage dummyImage(1, 1, QImage::Format_ARGB32);
         QPainter painter(&dummyImage);
-        q->page()->d->paint(&painter);
+        q->page()->d->paint(&painter, webPageProxy->pageExtendedBackgroundColor(), webPageProxy->drawsBackground());
         return;
     }
     q->page()->update();
@@ -594,14 +610,14 @@ void QQuickWebViewPrivate::processDidCrash()
 {
     Q_Q(QQuickWebView);
 
-    QUrl url(KURL(WebCore::ParsedURLString, webPageProxy->urlAtProcessExit()));
+    QUrl url(URL(WebCore::ParsedURLString, webPageProxy->urlAtProcessExit()));
     qWarning("WARNING: The web process experienced a crash on '%s'.", qPrintable(url.toString(QUrl::RemoveUserInfo)));
 
     pageEventHandler->resetGestureRecognizers();
 
     // Check if loading was ongoing, when process crashed.
     if (m_loadProgress > 0 && m_loadProgress < 100) {
-        QWebLoadRequest loadRequest(url, QQuickWebView::LoadFailedStatus, QLatin1String("The web process crashed."), QQuickWebView::InternalErrorDomain, 0);
+        QWebLoadRequest loadRequest(url, QQuickWebView::LoadFailedStatus, QStringLiteral("The web process crashed."), QQuickWebView::InternalErrorDomain, 0);
 
         loadProgressDidChange(100);
         emit q->loadingChanged(&loadRequest);
@@ -642,9 +658,9 @@ void QQuickWebViewPrivate::processDidBecomeResponsive(WKPageRef, const void* cli
     emit q->experimental()->processDidBecomeResponsive();
 }
 
-PassOwnPtr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
+std::unique_ptr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
 {
-    return DrawingAreaProxyImpl::create(webPageProxy.get());
+    return std::make_unique<WebKit::CoordinatedDrawingAreaProxy>(*webPageProxy.get());
 }
 
 void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download)
@@ -663,7 +679,7 @@ void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download)
 
 void QQuickWebViewPrivate::_q_onVisibleChanged()
 {
-    webPageProxy->viewStateDidChange(WebPageProxy::ViewIsVisible);
+    webPageProxy->viewStateDidChange(ViewState::IsVisible);
 }
 
 void QQuickWebViewPrivate::_q_onUrlChanged()
@@ -806,11 +822,11 @@ void QQuickWebViewPrivate::chooseFiles(WKOpenPanelResultListenerRef listenerRef,
     if (dialogRunner.wasAccepted()) {
         QStringList selectedPaths = dialogRunner.filePaths();
 
-        Vector<RefPtr<APIObject> > wkFiles(selectedPaths.size());
-        for (unsigned i = 0; i < selectedPaths.size(); ++i)
-            wkFiles[i] = WebURL::create(QUrl::fromLocalFile(selectedPaths.at(i)).toString());            
+        Vector<RefPtr<API::Object> > wkFiles(selectedPaths.size());
+        for (int i = 0; i < selectedPaths.size(); ++i)
+            wkFiles[i] = API::URL::create(QUrl::fromLocalFile(selectedPaths.at(i)).toString());
 
-        WKOpenPanelResultListenerChooseFiles(listenerRef, toAPI(ImmutableArray::adopt(wkFiles).leakRef()));
+        WKOpenPanelResultListenerChooseFiles(listenerRef, toAPI(&API::Array::create(WTFMove(wkFiles)).leakRef()));
     } else
         WKOpenPanelResultListenerCancel(listenerRef);
 
@@ -875,11 +891,11 @@ void QQuickWebViewPrivate::setNavigatorQtObjectEnabled(bool enabled)
     WKPagePostMessageToInjectedBundle(webPage.get(), messageName, wkEnabled.get());
 }
 
-static WKRetainPtr<WKStringRef> readUserFile(const QUrl& url, const char* userFileType)
+static WTF::Optional<String> readUserFile(const QUrl& url, const char* userFileType)
 {
     if (!url.isValid()) {
         qWarning("QQuickWebView: Couldn't open '%s' as %s because URL is invalid.", qPrintable(url.toString()), userFileType);
-        return 0;
+        return WTF::Nullopt;
     }
 
     QString path;
@@ -889,33 +905,36 @@ static WKRetainPtr<WKStringRef> readUserFile(const QUrl& url, const char* userFi
         path = QStringLiteral(":") + url.path();
     else {
         qWarning("QQuickWebView: Couldn't open '%s' as %s because only file:/// and qrc:/// URLs are supported.", qPrintable(url.toString()), userFileType);
-        return 0;
+        return WTF::Nullopt;
     }
 
     QFile file(path);
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
         qWarning("QQuickWebView: Couldn't open '%s' as %s due to error '%s'.", qPrintable(url.toString()), userFileType, qPrintable(file.errorString()));
-        return 0;
+        return WTF::Nullopt;
     }
 
     QByteArray contents = file.readAll();
-    if (contents.isEmpty())
+    if (contents.isEmpty()) {
         qWarning("QQuickWebView: Ignoring '%s' as %s because file is empty.", qPrintable(url.toString()), userFileType);
+        return WTF::Nullopt;
+    }
 
-    return adoptWK(WKStringCreateWithUTF8CString(contents.constData()));
+    return String::fromUTF8(contents);
 }
 
 void QQuickWebViewPrivate::updateUserScripts()
 {
     // This feature works per-WebView because we keep an unique page group for
     // each Page/WebView pair we create.
-    WKPageGroupRemoveAllUserScripts(pageGroup.get());
+    webPageProxy->pageGroup().removeAllUserScripts();
 
-    foreach (const QUrl& url, userScripts) {
-        WKRetainPtr<WKStringRef> contents = readUserFile(url, "user script");
-        if (!contents || WKStringIsEmpty(contents.get()))
+    for (const QUrl& url : userScripts) {
+        auto contents = readUserFile(url, "user script");
+        if (!contents)
             continue;
-        WKPageGroupAddUserScript(pageGroup.get(), contents.get(), /*baseURL*/ 0, /*whitelistedURLPatterns*/ 0, /*blacklistedURLPatterns*/ 0, kWKInjectInTopFrameOnly, kWKInjectAtDocumentEnd);
+        webPageProxy->pageGroup().addUserScript(contents.value(), /*baseURL*/ String(),
+            /*whitelistedURLPatterns*/ 0, /*blacklistedURLPatterns*/ 0, WebCore::InjectInTopFrameOnly, WebCore::InjectAtDocumentEnd);
     }
 }
 
@@ -923,24 +942,25 @@ void QQuickWebViewPrivate::updateUserStyleSheets()
 {
     // This feature works per-WebView because we keep an unique page group for
     // each Page/WebView pair we create.
-    WKPageGroupRemoveAllUserStyleSheets(pageGroup.get());
+    webPageProxy->pageGroup().removeAllUserStyleSheets();
 
-    foreach (const QUrl& url, userStyleSheets) {
-        WKRetainPtr<WKStringRef> contents = readUserFile(url, "user style sheet");
-        if (!contents || WKStringIsEmpty(contents.get()))
+    for (const QUrl& url : userStyleSheets) {
+        auto contents = readUserFile(url, "user style sheet");
+        if (!contents)
             continue;
-        WKPageGroupAddUserStyleSheet(pageGroup.get(), contents.get(), /*baseURL*/ 0, /*whitelistedURLPatterns*/ 0, /*blacklistedURLPatterns*/ 0, kWKInjectInTopFrameOnly);
+        webPageProxy->pageGroup().addUserStyleSheet(contents.value(), /*baseURL*/ String(),
+            /*whitelistedURLPatterns*/ 0, /*blacklistedURLPatterns*/ 0, WebCore::InjectInTopFrameOnly, WebCore::UserStyleUserLevel);
     }
 }
 
 void QQuickWebViewPrivate::updateSchemeDelegates()
 {
-    webPageProxy->registerApplicationScheme(ASCIILiteral("qrc"));
+    webPageProxy->setURLSchemeHandlerForScheme(QrcSchemeHandler::create(), ASCIILiteral("qrc"));
 
     QQmlListProperty<QQuickUrlSchemeDelegate> schemes = experimental->schemeDelegates();
     for (int i = 0, numSchemes = experimental->schemeDelegates_Count(&schemes); i < numSchemes; ++i) {
         QQuickUrlSchemeDelegate* scheme = experimental->schemeDelegates_At(&schemes, i);
-        webPageProxy->registerApplicationScheme(scheme->scheme());
+        //webPageProxy->registerApplicationScheme(scheme->scheme());
     }
 }
 
@@ -979,20 +999,25 @@ void QQuickWebViewPrivate::didReceiveMessageFromNavigatorQtObject(WKStringRef me
     emit q_ptr->experimental()->messageReceived(variantMap);
 }
 
-#ifdef HAVE_WEBCHANNEL
-void QQuickWebViewPrivate::didReceiveMessageFromNavigatorQtWebChannelTransportObject(WKStringRef message)
+#if ENABLE(QT_WEBCHANNEL)
+void QQuickWebViewPrivate::didReceiveMessageFromNavigatorQtWebChannelTransportObject(WKDataRef data)
 {
-    // TODO: can I convert a WKStringRef to a UTF8 QByteArray directly?
-    q_ptr->experimental()->m_webChannelTransport->receiveMessage(WKStringCopyQString(message).toUtf8());
+    const char* bytes = reinterpret_cast<const char*>(WKDataGetBytes(data));
+    int size = WKDataGetSize(data);
+    q_ptr->experimental()->m_webChannelTransport->receiveMessage(bytes, size);
 }
 #endif
 
 CoordinatedGraphicsScene* QQuickWebViewPrivate::coordinatedGraphicsScene()
 {
-    if (webPageProxy && webPageProxy->drawingArea() && webPageProxy->drawingArea()->coordinatedLayerTreeHostProxy())
-        return webPageProxy->drawingArea()->coordinatedLayerTreeHostProxy()->coordinatedGraphicsScene();
+    // QTFIXME: redundant null check?
+//    if (!webPageProxy)
+//        return nullptr;
 
-    return 0;
+    if (CoordinatedDrawingAreaProxy* drawingArea = static_cast<CoordinatedDrawingAreaProxy*>(webPageProxy->drawingArea()))
+        return drawingArea->coordinatedLayerTreeHostProxy().coordinatedGraphicsScene();
+
+    return nullptr;
 }
 
 float QQuickWebViewPrivate::deviceScaleFactor()
@@ -1010,9 +1035,9 @@ QQuickWebViewLegacyPrivate::QQuickWebViewLegacyPrivate(QQuickWebView* viewport)
 {
 }
 
-void QQuickWebViewLegacyPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+void QQuickWebViewLegacyPrivate::initialize(WKPageConfigurationRef configurationRef)
 {
-    QQuickWebViewPrivate::initialize(contextRef, pageGroupRef);
+    QQuickWebViewPrivate::initialize(configurationRef);
 
     // Trigger setting of correct visibility flags after everything was allocated and initialized.
     _q_onVisibleChanged();
@@ -1027,7 +1052,7 @@ void QQuickWebViewLegacyPrivate::updateViewportSize()
 
     pageView->setContentsSize(viewportSize);
 
-    if (DrawingAreaProxy *drawingArea = webPageProxy->drawingArea()) {
+    if (CoordinatedDrawingAreaProxy* drawingArea = static_cast<CoordinatedDrawingAreaProxy*>(webPageProxy->drawingArea())) {
         // The fixed layout is handled by the FrameView and the drawing area doesn't behave differently
         // whether its fixed or not. We still need to tell the drawing area which part of it
         // has to be rendered on tiles, and in desktop mode it's all of it.
@@ -1053,9 +1078,9 @@ QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate(QQuickWebView* view
 {
 }
 
-void QQuickWebViewFlickablePrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+void QQuickWebViewFlickablePrivate::initialize(WKPageConfigurationRef configurationRef)
 {
-    QQuickWebViewPrivate::initialize(contextRef, pageGroupRef);
+    QQuickWebViewPrivate::initialize(configurationRef);
 }
 
 void QQuickWebViewFlickablePrivate::onComponentComplete()
@@ -1064,7 +1089,8 @@ void QQuickWebViewFlickablePrivate::onComponentComplete()
 
     Q_Q(QQuickWebView);
     m_pageViewportControllerClient.reset(new PageViewportControllerClientQt(q, pageView.data()));
-    m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), m_pageViewportControllerClient.data()));
+    m_pageViewportController.reset(new PageViewportController(webPageProxy.get(), *m_pageViewportControllerClient.data()));
+    m_pageViewportControllerClient->setController(m_pageViewportController.data());
     pageEventHandler->setViewportController(m_pageViewportControllerClient.data());
 
     // Trigger setting of correct visibility flags after everything was allocated and initialized.
@@ -1102,12 +1128,12 @@ QQuickWebViewExperimental::QQuickWebViewExperimental(QQuickWebView *webView, QQu
     , d_ptr(webViewPrivate)
     , schemeParent(new QObject(this))
     , m_test(new QWebKitTest(webViewPrivate, this))
-#ifdef HAVE_WEBCHANNEL
+#if ENABLE(QT_WEBCHANNEL)
     , m_webChannel(new QQmlWebChannel(this))
     , m_webChannelTransport(new QWebChannelWebKitTransport(this))
 #endif
 {
-#ifdef HAVE_WEBCHANNEL
+#if ENABLE(QT_WEBCHANNEL)
     m_webChannel->connectTo(m_webChannelTransport);
 #endif
 }
@@ -1173,18 +1199,18 @@ void QQuickWebViewExperimental::setUseDefaultContentItemSize(bool enable)
 int QQuickWebViewExperimental::preferredMinimumContentsWidth() const
 {
     Q_D(const QQuickWebView);
-    return d->webPageProxy->pageGroup()->preferences()->layoutFallbackWidth();
+    return d->webPageProxy->pageGroup().preferences().layoutFallbackWidth();
 }
 
 void QQuickWebViewExperimental::setPreferredMinimumContentsWidth(int width)
 {
     Q_D(QQuickWebView);
-    WebPreferences* webPreferences = d->webPageProxy->pageGroup()->preferences();
+    WebPreferences& webPreferences = d->webPageProxy->pageGroup().preferences();
 
-    if (width == webPreferences->layoutFallbackWidth())
+    if (width == webPreferences.layoutFallbackWidth())
         return;
 
-    webPreferences->setLayoutFallbackWidth(width);
+    webPreferences.setLayoutFallbackWidth(width);
     emit preferredMinimumContentsWidthChanged();
 }
 
@@ -1198,7 +1224,7 @@ bool QQuickWebViewExperimental::flickableViewportEnabled()
     return s_flickableViewportEnabled;
 }
 
-#ifdef HAVE_WEBCHANNEL
+#if ENABLE(QT_WEBCHANNEL)
 QQmlWebChannel* QQuickWebViewExperimental::webChannel() const
 {
     return m_webChannel;
@@ -1240,12 +1266,13 @@ void QQuickWebViewExperimental::postMessage(const QString& message)
     WKPagePostMessageToInjectedBundle(d->webPage.get(), messageName, contents.get());
 }
 
-#ifdef HAVE_WEBCHANNEL
+#if ENABLE(QT_WEBCHANNEL)
 void QQuickWebViewExperimental::postQtWebChannelTransportMessage(const QByteArray& message)
 {
     Q_D(QQuickWebView);
     static WKStringRef messageName = WKStringCreateWithUTF8CString("MessageToNavigatorQtWebChannelTransportObject");
-    WKRetainPtr<WKStringRef> contents = adoptWK(WKStringCreateWithUTF8CString(message.constData()));
+    // TODO: API::Data::createWithoutCopying may help to avoid copy
+    WKRetainPtr<WKDataRef> contents = adoptWK(WKDataCreate(reinterpret_cast<const unsigned char*>(message.data()), message.size()));
     WKPagePostMessageToInjectedBundle(d->webPage.get(), messageName, contents.get());
 }
 #endif
@@ -1295,7 +1322,7 @@ QWebPreferences* QQuickWebViewExperimental::preferences() const
 {
     QQuickWebViewPrivate* const d = d_ptr;
     if (!d->preferences)
-        d->preferences = adoptPtr(QWebPreferencesPrivate::createPreferences(d));
+        d->preferences.reset(QWebPreferencesPrivate::createPreferences(d));
     return d->preferences.get();
 }
 
@@ -1446,13 +1473,13 @@ void QQuickWebViewExperimental::setUserAgent(const QString& userAgent)
 int QQuickWebViewExperimental::deviceWidth() const
 {
     Q_D(const QQuickWebView);
-    return d->webPageProxy->pageGroup()->preferences()->deviceWidth();
+    return d->webPageProxy->pageGroup().preferences().deviceWidth();
 }
 
 void QQuickWebViewExperimental::setDeviceWidth(int value)
 {
     Q_D(QQuickWebView);
-    d->webPageProxy->pageGroup()->preferences()->setDeviceWidth(qMax(0, value));
+    d->webPageProxy->pageGroup().preferences().setDeviceWidth(qMax(0, value));
     emit deviceWidthChanged();
 }
 
@@ -1470,13 +1497,13 @@ void QQuickWebViewExperimental::setDeviceWidth(int value)
 int QQuickWebViewExperimental::deviceHeight() const
 {
     Q_D(const QQuickWebView);
-    return d->webPageProxy->pageGroup()->preferences()->deviceHeight();
+    return d->webPageProxy->pageGroup().preferences().deviceHeight();
 }
 
 void QQuickWebViewExperimental::setDeviceHeight(int value)
 {
     Q_D(QQuickWebView);
-    d->webPageProxy->pageGroup()->preferences()->setDeviceHeight(qMax(0, value));
+    d->webPageProxy->pageGroup().preferences().setDeviceHeight(qMax(0, value));
     emit deviceHeightChanged();
 }
 
@@ -1557,7 +1584,7 @@ void QQuickWebViewExperimental::setUserStyleSheets(const QList<QUrl>& userStyleS
 QUrl QQuickWebViewExperimental::remoteInspectorUrl() const
 {
 #if ENABLE(INSPECTOR_SERVER)
-    return QUrl(WebInspectorServer::shared().inspectorUrlForPageID(d_ptr->webPageProxy->inspector()->remoteInspectionPageID()));
+    return QUrl(WebInspectorServer::singleton().inspectorUrlForPageID(d_ptr->webPageProxy->inspector()->remoteInspectionPageID()));
 #else
     return QUrl();
 #endif
@@ -1586,7 +1613,7 @@ void QQuickWebViewExperimental::schemeDelegates_Append(QQmlListProperty<QQuickUr
         return;
     scheme->reply()->setWebViewExperimental(webViewExperimental);
     QQuickWebViewPrivate* d = webViewExperimental->d_func();
-    d->webPageProxy->registerApplicationScheme(scheme->scheme());
+    //d->webPageProxy->registerApplicationScheme(scheme->scheme());
 }
 
 int QQuickWebViewExperimental::schemeDelegates_Count(QQmlListProperty<QQuickUrlSchemeDelegate>* property)
@@ -1641,7 +1668,7 @@ void QQuickWebViewExperimental::invokeApplicationSchemeHandler(PassRefPtr<QtRefC
 
 void QQuickWebViewExperimental::sendApplicationSchemeReply(QQuickNetworkReply* reply)
 {
-    d_ptr->webPageProxy->sendApplicationSchemeReply(reply);
+    //d_ptr->webPageProxy->sendApplicationSchemeReply(reply);
 }
 
 void QQuickWebViewExperimental::goForwardTo(int index)
@@ -1750,12 +1777,12 @@ QQuickWebView::QQuickWebView(QQuickItem* parent)
     d->initialize();
 }
 
-QQuickWebView::QQuickWebView(WKContextRef contextRef, WKPageGroupRef pageGroupRef, QQuickItem* parent)
-    : QQuickFlickable(parent)
+QQuickWebView::QQuickWebView(WKPageConfigurationRef configurationRef)
+    : QQuickFlickable()
     , d_ptr(createPrivateObject(this))
 {
     Q_D(QQuickWebView);
-    d->initialize(contextRef, pageGroupRef);
+    d->initialize(configurationRef);
 }
 
 QQuickWebView::~QQuickWebView()
@@ -1822,7 +1849,7 @@ void QQuickWebView::reload()
         // about the unreachable url yet. If we just do a reload at this point WebCore will try to
         // reload the currently committed url instead of the unrachable url. To work around this
         // we override the reload here by doing a manual load.
-        d->webPageProxy->loadURL(mainFrame->unreachableURL());
+        d->webPageProxy->loadRequest(mainFrame->unreachableURL());
         // FIXME: We should make WebCore aware of the unreachable url regardless of substitute-loads
         return;
     }
@@ -1866,7 +1893,7 @@ void QQuickWebView::emitUrlChangeIfNeeded()
 {
     Q_D(QQuickWebView);
 
-    QString activeUrl = d->webPageProxy->activeURL();
+    QString activeUrl = d->webPageProxy->pageLoadState().activeURL();
     if (activeUrl != d->m_currentUrl) {
         d->m_currentUrl = activeUrl;
         emit urlChanged();
@@ -2002,7 +2029,7 @@ QVariant QQuickWebView::inputMethodQuery(Qt::InputMethodQuery property) const
     Q_D(const QQuickWebView);
     const EditorState& state = d->webPageProxy->editorState();
 
-    switch(property) {
+    switch (property) {
     case Qt::ImCursorRectangle:
         return QRectF(state.cursorRect);
     case Qt::ImFont: