diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/API')
26 files changed, 83 insertions, 96 deletions
diff --git a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h index d9352a271..2035c3c0f 100644 --- a/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h +++ b/Source/WebKit2/UIProcess/API/C/qt/WKIconDatabaseQt.h @@ -27,8 +27,8 @@ #ifndef WKIconDatabaseQt_h #define WKIconDatabaseQt_h -#include <WebKit2/WKBase.h> -#include <WebKit2/WKGeometry.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKGeometry.h> QT_BEGIN_NAMESPACE class QImage; diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h index ff2cfa837..3c2fda240 100644 --- a/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h +++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKStringQt.h @@ -22,7 +22,7 @@ #define WKStringQt_h #include <QString> -#include <WebKit2/WKBase.h> +#include <WebKit/WKBase.h> WK_EXPORT WKStringRef WKStringCreateWithQString(const QString& string); WK_EXPORT QString WKStringCopyQString(WKStringRef string); diff --git a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h index b12f97459..6cef82f7c 100644 --- a/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h +++ b/Source/WebKit2/UIProcess/API/cpp/qt/WKURLQt.h @@ -22,8 +22,8 @@ #define WKURLQt_h #include <QUrl> -#include <WebKit2/WKBase.h> -#include <WebKit2/WKURL.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKURL.h> WK_EXPORT WKURLRef WKURLCreateWithQString(const QString& url); WK_EXPORT QString WKURLCopyQString(WKURLRef url); diff --git a/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply.cpp b/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply.cpp index 38ac7b909..79a67bc76 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply.cpp @@ -82,14 +82,14 @@ void QQuickNetworkReply::send() return; } - WTF::RefPtr<WebKit::SharedMemory> sharedMemory = SharedMemory::create(smLength); + WTF::RefPtr<WebKit::SharedMemory> sharedMemory = SharedMemory::allocate(smLength); if (!sharedMemory) return; // The size of the allocated shared memory can be bigger than requested. // Usually the size will be rounded up to the next multiple of a page size. memcpy(sharedMemory->data(), ptrData, smLength); - if (sharedMemory->createHandle(m_networkReplyData->data().m_dataHandle, SharedMemory::ReadOnly)) { + if (sharedMemory->createHandle(m_networkReplyData->data().m_dataHandle, SharedMemory::Protection::ReadOnly)) { m_networkReplyData->data().m_contentLength = smLength; if (m_webViewExperimental) m_webViewExperimental.data()->sendApplicationSchemeReply(this); diff --git a/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h b/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h index 2f87acf1e..453e766b0 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquicknetworkreply_p.h @@ -23,8 +23,8 @@ #include "QtNetworkReplyData.h" #include "QtNetworkRequestData.h" -#include "qquickwebview_p.h" #include "SharedMemory.h" +#include "qquickwebview_p.h" #include "qwebkitglobal.h" #include <QNetworkAccessManager> #include <QObject> @@ -64,4 +64,3 @@ private: QML_DECLARE_TYPE(QQuickNetworkReply) #endif // qquicknetworkreply_p_h - diff --git a/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest.cpp index 152ef4e5d..1db8100d8 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest.cpp @@ -45,4 +45,3 @@ QUrl QQuickNetworkRequest::url() const } #include "moc_qquicknetworkrequest_p.cpp" - diff --git a/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h b/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h index 69a2d48df..399c45ccd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquicknetworkrequest_p.h @@ -22,11 +22,11 @@ #define qquicknetworkrequest_p_h #include "QtNetworkRequestData.h" -#include "wtf/RefPtr.h" #include "qwebkitglobal.h" #include <QObject> #include <QtQml/qqmllist.h> #include <QtQuick/qquickitem.h> +#include <wtf/RefPtr.h> class QWEBKIT_EXPORT QQuickNetworkRequest : public QObject { Q_OBJECT @@ -46,4 +46,3 @@ private: QML_DECLARE_TYPE(QQuickNetworkRequest) #endif // qquicknetworkrequest_p_h - diff --git a/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h b/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h index 98de616cc..3080a0a2c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickurlschemedelegate_p.h @@ -68,5 +68,3 @@ private: }; #endif // qquickurlschemedelegate_p_h - - diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp index e8e646a7f..a991bcfdd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp @@ -21,6 +21,7 @@ #include "config.h" #include "qquickwebpage_p.h" +#include "CoordinatedGraphicsScene.h" #include "QtWebPageEventHandler.h" #include "QtWebPageSGNode.h" #include "TransformationMatrix.h" @@ -30,7 +31,6 @@ #include "qwebkittest_p.h" #include <QQuickWindow> #include <WKPage.h> -#include <WebCore/CoordinatedGraphicsScene.h> using namespace WebKit; @@ -61,7 +61,7 @@ QQuickWebPagePrivate::QQuickWebPagePrivate(QQuickWebPage* q, QQuickWebView* view void QQuickWebPagePrivate::paint(QPainter* painter) { - if (WebCore::CoordinatedGraphicsScene* scene = QQuickWebViewPrivate::get(viewportItem)->coordinatedGraphicsScene()) + if (CoordinatedGraphicsScene* scene = QQuickWebViewPrivate::get(viewportItem)->coordinatedGraphicsScene()) scene->paintToGraphicsContext(painter); } @@ -70,7 +70,7 @@ QSGNode* QQuickWebPage::updatePaintNode(QSGNode* oldNode, UpdatePaintNodeData*) { QQuickWebViewPrivate* webViewPrivate = QQuickWebViewPrivate::get(d->viewportItem); - WebCore::CoordinatedGraphicsScene* scene = webViewPrivate->coordinatedGraphicsScene(); + CoordinatedGraphicsScene* scene = webViewPrivate->coordinatedGraphicsScene(); if (!scene) return oldNode; diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp index 32ac886f3..4c412e1dd 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp @@ -23,6 +23,7 @@ #include "config.h" #include "qquickwebview_p.h" +#include "CoordinatedGraphicsScene.h" #include "CoordinatedLayerTreeHostProxy.h" #include "DownloadProxy.h" #include "DrawingAreaProxyImpl.h" @@ -35,7 +36,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 +46,7 @@ #endif #include "WebPageGroup.h" #include "WebPreferences.h" +#include "WebProcessPool.h" #include "qglobal.h" #include "qquicknetworkreply_p.h" #include "qquicknetworkrequest_p.h" @@ -70,12 +71,11 @@ #include <WKNumber.h> #include <WKOpenPanelResultListener.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> @@ -85,8 +85,8 @@ #include <wtf/text/WTFString.h> #ifdef HAVE_WEBCHANNEL -#include <QtWebChannel/QQmlWebChannel> #include "qwebchannelwebkittransport_p.h" +#include <QtWebChannel/QQmlWebChannel> #endif using namespace WebCore; @@ -331,7 +331,7 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa pageGroup = adoptWK(WKPageGroupCreateWithIdentifier(0)); context = contextRef ? QtWebContext::create(contextRef) : QtWebContext::defaultContext(); - webPageProxy = toImpl(context->context())->createWebPage(&pageClient, toImpl(pageGroup.get())); + webPageProxy = toImpl(context->context())->createWebPage(pageClient, toImpl(pageGroup.get())); webPage = toAPI(webPageProxy.get()); pageToView()->insert(webPage.get(), this); @@ -376,7 +376,7 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa 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))); @@ -389,7 +389,7 @@ void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pa WKPreferencesSetCompositingRepaintCountersVisible(preferencesRef, showDebugVisuals); WKPreferencesSetFrameFlatteningEnabled(preferencesRef, true); WKPreferencesSetWebGLEnabled(preferencesRef, true); - webPageProxy->pageGroup()->preferences()->setForceCompositingMode(true); + webPageProxy->pageGroup().preferences().setForceCompositingMode(true); pageClient.initialize(q_ptr, pageEventHandler.data(), &undoController); webPageProxy->initializeWebPage(); @@ -526,13 +526,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) @@ -644,7 +643,7 @@ void QQuickWebViewPrivate::processDidBecomeResponsive(WKPageRef, const void* cli std::unique_ptr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy() { - return std::make_unique<WebKit::DrawingAreaProxyImpl>(webPageProxy.get()); + return std::make_unique<WebKit::DrawingAreaProxyImpl>(*webPageProxy.get()); } void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download) @@ -663,7 +662,7 @@ void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download) void QQuickWebViewPrivate::_q_onVisibleChanged() { - webPageProxy->viewStateDidChange(WebPageProxy::ViewIsVisible); + webPageProxy->viewStateDidChange(ViewState::IsVisible); } void QQuickWebViewPrivate::_q_onUrlChanged() @@ -806,11 +805,11 @@ void QQuickWebViewPrivate::chooseFiles(WKOpenPanelResultListenerRef listenerRef, if (dialogRunner.wasAccepted()) { QStringList selectedPaths = dialogRunner.filePaths(); - Vector<RefPtr<APIObject> > wkFiles(selectedPaths.size()); + Vector<RefPtr<API::Object> > wkFiles(selectedPaths.size()); for (unsigned i = 0; i < selectedPaths.size(); ++i) - wkFiles[i] = WebURL::create(QUrl::fromLocalFile(selectedPaths.at(i)).toString()); + 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); @@ -1064,7 +1063,7 @@ 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())); pageEventHandler->setViewportController(m_pageViewportControllerClient.data()); // Trigger setting of correct visibility flags after everything was allocated and initialized. @@ -1173,18 +1172,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(); } @@ -1295,7 +1294,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 +1445,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 +1469,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 +1556,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 @@ -1822,7 +1821,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 +1865,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 +2001,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: diff --git a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h index 2d1e5d911..5dcdb1a27 100644 --- a/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h @@ -27,21 +27,17 @@ #include "QtPageClient.h" #include "QtWebPageUIClient.h" -#include "qquickwebview_p.h" #include "qquickwebpage_p.h" +#include "qquickwebview_p.h" #include <QtCore/QElapsedTimer> #include <QtCore/QObject> #include <QtCore/QScopedPointer> #include <WebCore/ViewportArguments.h> -#include <WebKit2/WKRetainPtr.h> -#include <wtf/OwnPtr.h> +#include <WebKit/WKRetainPtr.h> #include <wtf/RefPtr.h> -namespace WebCore { -class CoordinatedGraphicsScene; -} - namespace WebKit { +class CoordinatedGraphicsScene; class DownloadProxy; class DrawingAreaProxy; class QtDialogRunner; @@ -143,7 +139,7 @@ public: void didReceiveMessageFromNavigatorQtWebChannelTransportObject(WKStringRef message); #endif - WebCore::CoordinatedGraphicsScene* coordinatedGraphicsScene(); + WebKit::CoordinatedGraphicsScene* coordinatedGraphicsScene(); float deviceScaleFactor(); void setIntrinsicDeviceScaleFactor(float); @@ -189,8 +185,8 @@ protected: WebKit::QtPageClient pageClient; WebKit::DefaultUndoController undoController; - OwnPtr<QWebNavigationHistory> navigationHistory; - OwnPtr<QWebPreferences> preferences; + std::unique_ptr<QWebNavigationHistory> navigationHistory; + std::unique_ptr<QWebPreferences> preferences; QScopedPointer<WebKit::QtWebPagePolicyClient> pagePolicyClient; QScopedPointer<WebKit::QtWebPageUIClient> pageUIClient; diff --git a/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin.cpp b/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin.cpp index 4491dc40a..fad9748cf 100644 --- a/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin.cpp @@ -24,9 +24,9 @@ #include <QtCore/QStringList> #include <SchemeRegistry.h> #include <SecurityOrigin.h> -#include <WebKit2/WKBase.h> -#include <WebKit2/WKRetainPtr.h> -#include <WebKit2/WKSecurityOrigin.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKRetainPtr.h> +#include <WebKit/WKSecurityOriginRef.h> using namespace WebCore; diff --git a/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h b/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h index df09fb8ea..e6d59acba 100644 --- a/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qtwebsecurityorigin_p.h @@ -21,7 +21,6 @@ #include "qwebkitglobal.h" -#include <QtCore/QDataStream> #include <QtCore/QObject> #include <QtCore/QString> #include <QtCore/QUrl> diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp index 209596954..b74c45b3c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp @@ -39,13 +39,16 @@ ** ****************************************************************************/ +#include "config.h" #include "qwebchannelwebkittransport_p.h" -#include <QJsonObject> -#include <QJsonDocument> +#ifdef HAVE_WEBCHANNEL #include "qquickwebview_p.h" +#include <QJsonDocument> +#include <QJsonObject> + QWebChannelWebKitTransport::QWebChannelWebKitTransport(QQuickWebViewExperimental* experimental) : QWebChannelAbstractTransport(experimental) , m_experimental(experimental) @@ -72,3 +75,5 @@ void QWebChannelWebKitTransport::receiveMessage(const QByteArray& message) } emit messageReceived(doc.object(), this); } + +#endif // HAVE_WEBCHANNEL diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h index ef6140359..2cbfdafee 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport_p.h @@ -39,15 +39,15 @@ ** ****************************************************************************/ -#ifndef QWEBCHANNELWEBKITTRANSPORT_H -#define QWEBCHANNELWEBKITTRANSPORT_H +#pragma once + +#ifdef HAVE_WEBCHANNEL #include <QtWebChannel/QWebChannelAbstractTransport> class QQuickWebViewExperimental; -class QWebChannelWebKitTransport : public QWebChannelAbstractTransport -{ +class QWebChannelWebKitTransport : public QWebChannelAbstractTransport { Q_OBJECT public: explicit QWebChannelWebKitTransport(QQuickWebViewExperimental* experimental); @@ -60,4 +60,4 @@ private: QQuickWebViewExperimental* m_experimental; }; -#endif // QWEBCHANNELWEBKITTRANSPORT_H +#endif // HAVE_WEBCHANNEL diff --git a/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem.cpp b/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem.cpp index 85476431f..949636a0c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem.cpp @@ -93,4 +93,3 @@ void QWebDownloadItem::start() d->downloadProxy->startTransfer(d->destinationPath); } - diff --git a/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h b/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h index 5cbdddd54..e017d906f 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebkittest_p.h @@ -21,8 +21,8 @@ #ifndef qwebkittest_p_h #define qwebkittest_p_h -#include "qwebkitglobal.h" #include "qquickwebview_p.h" +#include "qwebkitglobal.h" #include <QtCore/QJsonObject> #include <QtCore/QObject> diff --git a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp index 8aaadb73c..6271ebfa6 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp @@ -18,7 +18,6 @@ */ #include "config.h" - #include "qwebloadrequest_p.h" class QWebLoadRequestPrivate { diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp index 95f40498f..fa8982c4f 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory.cpp @@ -26,7 +26,7 @@ #include "config.h" #include "qwebnavigationhistory_p.h" -#include "WKBackForwardList.h" +#include "WKBackForwardListRef.h" #include "WKStringQt.h" #include "WKURL.h" #include "WKURLQt.h" @@ -35,12 +35,11 @@ #include <QString> #include <QUrl> #include <QtQml/QQmlEngine> -#include <WebKit2/WKArray.h> -#include <WebKit2/WKBackForwardListItem.h> -#include <WebKit2/WKBase.h> -#include <WebKit2/WKPage.h> -#include <WebKit2/WKRetainPtr.h> -#include <wtf/PassOwnPtr.h> +#include <WebKit/WKArray.h> +#include <WebKit/WKBackForwardListItemRef.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKPage.h> +#include <WebKit/WKRetainPtr.h> using namespace WebKit; @@ -61,8 +60,8 @@ QWebNavigationListModel* QWebNavigationListModelPrivate::createWebNavigationMode QWebNavigationHistoryPrivate::QWebNavigationHistoryPrivate(WKPageRef page) : m_page(page) , m_backForwardList(WKPageGetBackForwardList(page)) - , m_backNavigationModel(adoptPtr(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get()))) - , m_forwardNavigationModel(adoptPtr(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get()))) + , m_backNavigationModel(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get())) + , m_forwardNavigationModel(QWebNavigationListModelPrivate::createWebNavigationModel(m_backForwardList.get())) { m_backNavigationModel->d->count = &WKBackForwardListGetBackListCount; m_backNavigationModel->d->indexSign = -1; diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h index c8cc5ab32..527aa4658 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationhistory_p_p.h @@ -29,9 +29,8 @@ #include "qwebkitglobal.h" #include <QObject> -#include <WebKit2/WKBase.h> -#include <WebKit2/WKRetainPtr.h> -#include <wtf/OwnPtr.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKRetainPtr.h> #include <wtf/PassRefPtr.h> namespace WebKit { @@ -63,8 +62,8 @@ public: WKRetainPtr<WKPageRef> m_page; WKRetainPtr<WKBackForwardListRef> m_backForwardList; - OwnPtr<QWebNavigationListModel> m_backNavigationModel; - OwnPtr<QWebNavigationListModel> m_forwardNavigationModel; + std::unique_ptr<QWebNavigationListModel> m_backNavigationModel; + std::unique_ptr<QWebNavigationListModel> m_forwardNavigationModel; }; #endif /* qwebnavigationhistory_p_p_h */ diff --git a/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp index 7a75c583a..4d835fa2c 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebnavigationrequest.cpp @@ -18,7 +18,6 @@ */ #include "config.h" - #include "qwebnavigationrequest_p.h" #include "qquickwebview_p.h" diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest.cpp index 45697a22b..e059d9c11 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest.cpp @@ -18,12 +18,11 @@ */ #include "config.h" - #include "qwebpermissionrequest_p.h" #include "WKStringQt.h" -#include <WebKit2/WKBase.h> -#include <WebKit2/WKRetainPtr.h> +#include <WebKit/WKBase.h> +#include <WebKit/WKRetainPtr.h> class QWebPermissionRequestPrivate : public QSharedData { public: @@ -118,4 +117,3 @@ QtWebSecurityOrigin* QWebPermissionRequest::securityOrigin() { return &(d->securityInfo); } - diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h b/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h index 000252bdb..5f2daa811 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h +++ b/Source/WebKit2/UIProcess/API/qt/qwebpermissionrequest_p.h @@ -25,9 +25,9 @@ #include <QtCore/QObject> #include <QtCore/qshareddata.h> -#include <WebKit2/WKGeolocationPermissionRequest.h> -#include <WebKit2/WKNotificationPermissionRequest.h> -#include <WebKit2/WKSecurityOrigin.h> +#include <WebKit/WKGeolocationPermissionRequest.h> +#include <WebKit/WKNotificationPermissionRequest.h> +#include <WebKit/WKSecurityOriginRef.h> class QWebPermissionRequestPrivate; diff --git a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp index edca4c901..b486e9391 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebpreferences.cpp @@ -23,7 +23,7 @@ #include "qquickwebview_p_p.h" #include "qwebpreferences_p_p.h" #include <WKPageGroup.h> -#include <WKPreferences.h> +#include <WKPreferencesRef.h> #include <WKRetainPtr.h> #include <WKStringQt.h> diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp index 31b3d8177..3206481c8 100644 --- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp +++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp @@ -20,6 +20,7 @@ #include "config.h" #include "qrawwebview_p.h" +#include "CoordinatedGraphicsScene.h" #include "CoordinatedLayerTreeHostProxy.h" #include "Cursor.h" #include "DrawingAreaProxyImpl.h" @@ -34,7 +35,6 @@ #include "WebPageGroup.h" #include "WebPreferences.h" #include "qrawwebview_p_p.h" -#include <WebCore/CoordinatedGraphicsScene.h> #include <WebKit2/qrawwebview_p.h> void QRawWebViewPrivate::didChangeViewportProperties(const WebCore::ViewportAttributes& attr) @@ -352,7 +352,7 @@ WKPageRef QRawWebView::pageRef() return toAPI(d->m_webPageProxy.get()); } -WebCore::CoordinatedGraphicsScene* QRawWebView::coordinatedGraphicsScene() const +WebKit::CoordinatedGraphicsScene* QRawWebView::coordinatedGraphicsScene() const { WebKit::DrawingAreaProxy* drawingArea = d->m_webPageProxy->drawingArea(); if (!drawingArea) diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h index 4ae3e5e53..00cf438b4 100644 --- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h +++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p.h @@ -47,7 +47,7 @@ QT_END_NAMESPACE class QRawWebViewPrivate; -namespace WebCore { +namespace WebKit { class CoordinatedGraphicsScene; } @@ -101,7 +101,7 @@ public: void sendTouchEvent(QTouchEvent*); private: - WebCore::CoordinatedGraphicsScene* coordinatedGraphicsScene() const; + WebKit::CoordinatedGraphicsScene* coordinatedGraphicsScene() const; QRawWebViewPrivate* d; }; |