Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 0 insertions, 238 deletions

diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp
deleted file mode 100644
index 9f9021221..000000000
--- a/Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
- *
- * 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 program 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 program; 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 "QtWebPageLoadClient.h"
-
-#include "QtWebError.h"
-#include "qquickwebview_p_p.h"
-
-using namespace WebCore;
-
-namespace WebKit {
-
-QtWebPageLoadClient::QtWebPageLoadClient(WKPageRef pageRef, QQuickWebView* webView)
-    : m_webView(webView)
-{
-    WKPageLoaderClient loadClient;
-    memset(&loadClient, 0, sizeof(WKPageLoaderClient));
-    loadClient.version = kWKPageLoaderClientCurrentVersion;
-    loadClient.clientInfo = this;
-    loadClient.didStartProvisionalLoadForFrame = didStartProvisionalLoadForFrame;
-    loadClient.didReceiveServerRedirectForProvisionalLoadForFrame = didReceiveServerRedirectForProvisionalLoadForFrame;
-    loadClient.didFailProvisionalLoadWithErrorForFrame = didFailProvisionalLoadWithErrorForFrame;
-    loadClient.didCommitLoadForFrame = didCommitLoadForFrame;
-    loadClient.didFinishLoadForFrame = didFinishLoadForFrame;
-    loadClient.didFailLoadWithErrorForFrame = didFailLoadWithErrorForFrame;
-    loadClient.didSameDocumentNavigationForFrame = didSameDocumentNavigationForFrame;
-    loadClient.didReceiveTitleForFrame = didReceiveTitleForFrame;
-    loadClient.didStartProgress = didStartProgress;
-    loadClient.didChangeProgress = didChangeProgress;
-    loadClient.didFinishProgress = didFinishProgress;
-    loadClient.didChangeBackForwardList = didChangeBackForwardList;
-    loadClient.processDidBecomeUnresponsive = processDidBecomeUnresponsive;
-    loadClient.processDidBecomeResponsive = processDidBecomeResponsive;
-    WKPageSetPageLoaderClient(pageRef, &loadClient);
-}
-
-void QtWebPageLoadClient::didStartProvisionalLoad(const WTF::String& url)
-{
-    m_webView->d_func()->provisionalLoadDidStart(url);
-}
-
-void QtWebPageLoadClient::didReceiveServerRedirectForProvisionalLoad(const WTF::String& url)
-{
-    m_webView->d_func()->didReceiveServerRedirectForProvisionalLoad(url);
-}
-
-void QtWebPageLoadClient::didCommitLoad()
-{
-    PageViewportController* pvc = m_webView->d_func()->viewportController();
-    if (pvc)
-        pvc->didCommitLoad();
-    m_webView->d_func()->loadDidCommit();
-}
-
-void QtWebPageLoadClient::didSameDocumentNavigation()
-{
-    m_webView->d_func()->didSameDocumentNavigation();
-}
-
-void QtWebPageLoadClient::didReceiveTitle()
-{
-    m_webView->d_func()->titleDidChange();
-}
-
-void QtWebPageLoadClient::didChangeProgress(int loadProgress)
-{
-    m_webView->d_func()->loadProgressDidChange(loadProgress);
-}
-
-void QtWebPageLoadClient::didChangeBackForwardList()
-{
-    m_webView->d_func()->backForwardListDidChange();
-}
-
-void QtWebPageLoadClient::processDidBecomeUnresponsive()
-{
-    m_webView->d_func()->processDidBecomeUnresponsive();
-}
-
-void QtWebPageLoadClient::processDidBecomeResponsive()
-{
-    m_webView->d_func()->processDidBecomeResponsive();
-}
-
-void QtWebPageLoadClient::dispatchLoadSucceeded()
-{
-    m_webView->d_func()->loadDidSucceed();
-}
-
-void QtWebPageLoadClient::dispatchLoadStopped()
-{
-    m_webView->d_func()->loadDidStop();
-}
-
-void QtWebPageLoadClient::dispatchLoadFailed(WebFrameProxy* frame, const QtWebError& error)
-{
-    if (error.isCancellation()) {
-        dispatchLoadStopped();
-        return;
-    }
-
-    int errorCode = error.errorCode();
-
-    if (errorCode == kWKErrorCodeFrameLoadInterruptedByPolicyChange || errorCode == kWKErrorCodePlugInWillHandleLoad) {
-        // The active url might have changed
-        m_webView->emitUrlChangeIfNeeded();
-
-        // Make sure that LoadStartedStatus has a counterpart when e.g. requesting a download.
-        dispatchLoadSucceeded();
-
-        return;
-    }
-
-    // We set the unreachable url unconditionally so that the current
-    // active url of the webview when the loadingChanged signal is
-    // emitted reflects the failed url, not the previously committed
-    // url. This also ensures that if the user does not do a loadHtml
-    // with an error page and and unreachable url as a reponse to the
-    // failed load, we can still detect the failed url for reloads.
-    frame->setUnreachableURL(error.url());
-    m_webView->emitUrlChangeIfNeeded();
-
-    m_webView->d_func()->loadDidFail(error);
-}
-
-static QtWebPageLoadClient* toQtWebPageLoadClient(const void* clientInfo)
-{
-    ASSERT(clientInfo);
-    return reinterpret_cast<QtWebPageLoadClient*>(const_cast<void*>(clientInfo));
-}
-
-void QtWebPageLoadClient::didStartProvisionalLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->didStartProvisionalLoad(toImpl(frame)->provisionalURL());
-}
-
-void QtWebPageLoadClient::didReceiveServerRedirectForProvisionalLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-
-    WebFrameProxy* wkframe = toImpl(frame);
-    toQtWebPageLoadClient(clientInfo)->didReceiveServerRedirectForProvisionalLoad(wkframe->provisionalURL());
-}
-
-void QtWebPageLoadClient::didFailProvisionalLoadWithErrorForFrame(WKPageRef, WKFrameRef frame, WKErrorRef error, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->dispatchLoadFailed(toImpl(frame), error);
-}
-
-void QtWebPageLoadClient::didCommitLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->didCommitLoad();
-}
-
-void QtWebPageLoadClient::didFinishLoadForFrame(WKPageRef, WKFrameRef frame, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->dispatchLoadSucceeded();
-}
-
-void QtWebPageLoadClient::didFailLoadWithErrorForFrame(WKPageRef, WKFrameRef frame, WKErrorRef error, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->dispatchLoadFailed(toImpl(frame), error);
-}
-
-void QtWebPageLoadClient::didSameDocumentNavigationForFrame(WKPageRef, WKFrameRef frame, WKSameDocumentNavigationType type, WKTypeRef userData, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->didSameDocumentNavigation();
-}
-
-void QtWebPageLoadClient::didReceiveTitleForFrame(WKPageRef, WKStringRef title, WKFrameRef frame, WKTypeRef, const void* clientInfo)
-{
-    if (!WKFrameIsMainFrame(frame))
-        return;
-    toQtWebPageLoadClient(clientInfo)->didReceiveTitle();
-}
-
-void QtWebPageLoadClient::didStartProgress(WKPageRef, const void* clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->didChangeProgress(0);
-}
-
-void QtWebPageLoadClient::didChangeProgress(WKPageRef page, const void* clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->didChangeProgress(WKPageGetEstimatedProgress(page) * 100);
-}
-
-void QtWebPageLoadClient::didFinishProgress(WKPageRef, const void* clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->didChangeProgress(100);
-}
-
-void QtWebPageLoadClient::didChangeBackForwardList(WKPageRef, WKBackForwardListItemRef, WKArrayRef, const void *clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->didChangeBackForwardList();
-}
-
-void QtWebPageLoadClient::processDidBecomeUnresponsive(WKPageRef, const void* clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->processDidBecomeUnresponsive();
-}
-
-void QtWebPageLoadClient::processDidBecomeResponsive(WKPageRef, const void* clientInfo)
-{
-    toQtWebPageLoadClient(clientInfo)->processDidBecomeResponsive();
-}
-
-} // namespace Webkit