diff options
Diffstat (limited to 'Source/WebKit2/UIProcess/qt')
28 files changed, 128 insertions, 199 deletions
diff --git a/Source/WebKit2/UIProcess/qt/BackingStoreQt.cpp b/Source/WebKit2/UIProcess/qt/BackingStoreQt.cpp index 1af16d842..a44ed681d 100644 --- a/Source/WebKit2/UIProcess/qt/BackingStoreQt.cpp +++ b/Source/WebKit2/UIProcess/qt/BackingStoreQt.cpp @@ -28,8 +28,8 @@ #include "config.h" #include "BackingStore.h" -#include "UpdateInfo.h" #include "ShareableBitmap.h" +#include "UpdateInfo.h" #include <WebCore/GraphicsContext.h> #include <WebCore/IntRect.h> diff --git a/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp b/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp index f72946529..0dbaa651e 100644 --- a/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp +++ b/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp @@ -274,7 +274,7 @@ void PageViewportControllerClientQt::zoomToAreaGestureEnded(const QPointF& touch // Zoom back out if attempting to scale to the same current scale, or // attempting to continue scaling out from the inner most level. // Use fuzzy compare with a fixed error to be able to deal with largish differences due to pixel rounding. - if (!m_scaleStack.isEmpty() && fuzzyCompare(targetScale, currentScale, 0.01)) { + if (!m_scaleStack.isEmpty() && WTF::areEssentiallyEqual(targetScale, currentScale, qreal(0.01))) { // If moving the viewport would expose more of the targetRect and move at least 40 pixels, update position but do not scale out. QRectF currentContentRect(m_viewportItem->mapRectToWebContent(viewportRect)); QRectF targetIntersection = endVisibleContentRect.intersected(targetArea); @@ -284,7 +284,7 @@ void PageViewportControllerClientQt::zoomToAreaGestureEnded(const QPointF& touch zoomAction = NoZoom; else zoomAction = ZoomBack; - } else if (fuzzyCompare(targetScale, m_zoomOutScale, 0.01)) + } else if (WTF::areEssentiallyEqual(targetScale, m_zoomOutScale, qreal(0.01))) zoomAction = ZoomBack; else if (targetScale < currentScale) zoomAction = ZoomOut; diff --git a/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp b/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp index 0dd547102..6d1949830 100644 --- a/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp +++ b/Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp @@ -29,7 +29,6 @@ #include <QtQml/QQmlContext> #include <QtQml/QQmlEngine> #include <QtQuick/QQuickItem> -#include <wtf/PassOwnPtr.h> namespace WebKit { @@ -413,7 +412,7 @@ bool QtDialogRunner::createDialog(QQmlComponent* component, QObject* contextObje QQmlContext* baseContext = component->creationContext(); if (!baseContext) baseContext = QQmlEngine::contextForObject(m_webView); - m_dialogContext = adoptPtr(new QQmlContext(baseContext)); + m_dialogContext = std::make_unique<QQmlContext>(baseContext); // This makes both "message" and "model.message" work for the dialog, // just like QtQuick's ListView delegates. @@ -423,14 +422,13 @@ bool QtDialogRunner::createDialog(QQmlComponent* component, QObject* contextObje QObject* object = component->beginCreate(m_dialogContext.get()); if (!object) { - m_dialogContext.clear(); + m_dialogContext = nullptr; return false; } - m_dialog = adoptPtr(qobject_cast<QQuickItem*>(object)); + m_dialog.reset(qobject_cast<QQuickItem*>(object)); if (!m_dialog) { - m_dialogContext.clear(); - m_dialog.clear(); + m_dialogContext = nullptr; return false; } @@ -480,4 +478,3 @@ void QtDialogRunner::onDatabaseQuotaAccepted(quint64 quota) #include "QtDialogRunner.moc" #include "moc_QtDialogRunner.cpp" - diff --git a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h index b70044076..fcb276080 100644 --- a/Source/WebKit2/UIProcess/qt/QtDialogRunner.h +++ b/Source/WebKit2/UIProcess/qt/QtDialogRunner.h @@ -21,11 +21,10 @@ #ifndef QtDialogRunner_h #define QtDialogRunner_h -#include "WKSecurityOrigin.h" +#include "WKSecurityOriginRef.h" #include "qquickwebview_p.h" #include <QtCore/QEventLoop> #include <QtCore/QStringList> -#include <wtf/OwnPtr.h> QT_BEGIN_NAMESPACE class QQmlComponent; @@ -75,8 +74,8 @@ private: bool createDialog(QQmlComponent*, QObject* contextObject); QQuickWebView* m_webView; - OwnPtr<QQmlContext> m_dialogContext; - OwnPtr<QQuickItem> m_dialog; + std::unique_ptr<QQmlContext> m_dialogContext; + std::unique_ptr<QQuickItem> m_dialog; QString m_result; bool m_wasAccepted; diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp index 8c0e0c31a..1b62c94ba 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.cpp @@ -209,14 +209,14 @@ IntRect QtPageClient::windowToScreen(const IntRect& rect) return rect; } -PassRefPtr<WebPopupMenuProxy> QtPageClient::createPopupMenuProxy(WebPageProxy* webPageProxy) +RefPtr<WebPopupMenuProxy> QtPageClient::createPopupMenuProxy(WebPageProxy& webPageProxy) { return WebPopupMenuProxyQt::create(webPageProxy, m_webView); } -PassRefPtr<WebContextMenuProxy> QtPageClient::createContextMenuProxy(WebPageProxy* webPageProxy) +std::unique_ptr<WebContextMenuProxy> QtPageClient::createContextMenuProxy(WebPageProxy&, const ContextMenuContextData& context, const UserData& userData) { - return WebContextMenuProxyQt::create(webPageProxy); + return std::make_unique<WebContextMenuProxyQt>(context, userData); } #if ENABLE(INPUT_TYPE_COLOR) @@ -226,11 +226,6 @@ PassRefPtr<WebColorPicker> QtPageClient::createColorPicker(WebPageProxy* webPage } #endif -void QtPageClient::flashBackingStoreUpdates(const Vector<IntRect>&) -{ - notImplemented(); -} - void QtPageClient::pageTransitionViewportReady() { PageViewportController* pvc = QQuickWebViewPrivate::get(m_webView)->viewportController(); diff --git a/Source/WebKit2/UIProcess/qt/QtPageClient.h b/Source/WebKit2/UIProcess/qt/QtPageClient.h index 3cb5a8e07..2f63db4b6 100644 --- a/Source/WebKit2/UIProcess/qt/QtPageClient.h +++ b/Source/WebKit2/UIProcess/qt/QtPageClient.h @@ -21,7 +21,6 @@ #ifndef QtPageClient_h #define QtPageClient_h -#include "FindIndicator.h" #include "PageClient.h" class QQuickWebView; @@ -42,65 +41,63 @@ public: void initialize(QQuickWebView*, QtWebPageEventHandler*, WebKit::DefaultUndoController*); // QQuickWebView. - virtual void setViewNeedsDisplay(const WebCore::IntRect&); - virtual void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect); - virtual WebCore::IntSize viewSize(); - virtual bool isViewFocused(); - virtual bool isViewVisible(); - virtual void pageDidRequestScroll(const WebCore::IntPoint&); - virtual void didChangeContentsSize(const WebCore::IntSize&); - virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&); - virtual void processDidCrash(); - virtual void didRelaunchProcess(); - virtual std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy(); - virtual void handleDownloadRequest(DownloadProxy*); - virtual void handleApplicationSchemeRequest(PassRefPtr<QtRefCountedNetworkRequestData>); - virtual void handleAuthenticationRequiredRequest(const String& hostname, const String& realm, const String& prefilledUsername, String& username, String& password); - virtual void handleCertificateVerificationRequest(const String& hostname, bool& ignoreErrors); - virtual void handleProxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password); + void setViewNeedsDisplay(const WebCore::IntRect&) override; + void didRenderFrame(const WebCore::IntSize& contentsSize, const WebCore::IntRect& coveredRect) override; + WebCore::IntSize viewSize() override; + bool isViewFocused() override; + bool isViewVisible() override; + void pageDidRequestScroll(const WebCore::IntPoint&) override; + void didChangeContentsSize(const WebCore::IntSize&) override; + void didChangeViewportProperties(const WebCore::ViewportAttributes&) override; + void processDidCrash() override; + void didRelaunchProcess() override; + std::unique_ptr<DrawingAreaProxy> createDrawingAreaProxy() override; + void handleDownloadRequest(DownloadProxy*) override; + void handleApplicationSchemeRequest(PassRefPtr<QtRefCountedNetworkRequestData>) override; + void handleAuthenticationRequiredRequest(const String& hostname, const String& realm, const String& prefilledUsername, String& username, String& password) override; + void handleCertificateVerificationRequest(const String& hostname, bool& ignoreErrors) override; + void handleProxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password) override; - virtual void displayView(); - virtual bool canScrollView() { return false; } - virtual void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset); - virtual bool isViewWindowActive(); - virtual bool isViewInWindow(); -#if USE(ACCELERATED_COMPOSITING) - virtual void enterAcceleratedCompositingMode(const LayerTreeContext&); - virtual void exitAcceleratedCompositingMode(); - virtual void updateAcceleratedCompositingMode(const LayerTreeContext&); -#endif // USE(ACCELERATED_COMPOSITING) - virtual void pageClosed() { } - virtual void preferencesDidChange() { } - virtual void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage); - virtual void setCursor(const WebCore::Cursor&); - virtual void setCursorHiddenUntilMouseMoves(bool); - virtual void toolTipChanged(const String&, const String&); + void displayView() override; + bool canScrollView() override { return false; } + void scrollView(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset) override; + bool isViewWindowActive() override; + bool isViewInWindow() override; + void enterAcceleratedCompositingMode(const LayerTreeContext&) override; + void exitAcceleratedCompositingMode() override; + void updateAcceleratedCompositingMode(const LayerTreeContext&) override; + void pageClosed() override { } + void preferencesDidChange() override { } + void startDrag(const WebCore::DragData&, PassRefPtr<ShareableBitmap> dragImage) override; + void setCursor(const WebCore::Cursor&) override; + void setCursorHiddenUntilMouseMoves(bool) override; + void toolTipChanged(const String&, const String&) override; // DefaultUndoController - virtual void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo); - virtual void clearAllEditCommands(); - virtual bool canUndoRedo(WebPageProxy::UndoOrRedo); - virtual void executeUndoRedo(WebPageProxy::UndoOrRedo); + void registerEditCommand(PassRefPtr<WebEditCommandProxy>, WebPageProxy::UndoOrRedo) override; + void clearAllEditCommands() override; + bool canUndoRedo(WebPageProxy::UndoOrRedo) override; + void executeUndoRedo(WebPageProxy::UndoOrRedo) override; - virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&); - virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&); - virtual WebCore::IntPoint screenToWindow(const WebCore::IntPoint&); - virtual WebCore::IntRect windowToScreen(const WebCore::IntRect&); - virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) { } - virtual PassRefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*); - virtual PassRefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*); + WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&) override; + WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&) override; + WebCore::IntPoint screenToWindow(const WebCore::IntPoint&) override; + WebCore::IntRect windowToScreen(const WebCore::IntRect&) override; + void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override { } + RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override; + std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override; #if ENABLE(INPUT_TYPE_COLOR) virtual PassRefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&); #endif - virtual void setFindIndicator(PassRefPtr<FindIndicator>, bool fadeOut, bool animate) { } - virtual void flashBackingStoreUpdates(const Vector<WebCore::IntRect>& updateRects); - virtual void pageTransitionViewportReady(); - virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&); - virtual void updateTextInputState(); - virtual void handleWillSetInputMethodState(); - virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled); + void pageTransitionViewportReady() override; + void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&) override; + void updateTextInputState() override; + void handleWillSetInputMethodState() override; +#if ENABLE(GESTURE_EVENTS) + void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled) override; +#endif #if ENABLE(TOUCH_EVENTS) - virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled); + void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override; #endif private: diff --git a/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp b/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp index 7fa58014f..a26c01062 100644 --- a/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp +++ b/Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp @@ -103,4 +103,3 @@ void QtPinchGestureRecognizer::cancel() } } // namespace WebKit - diff --git a/Source/WebKit2/UIProcess/qt/QtWebContext.cpp b/Source/WebKit2/UIProcess/qt/QtWebContext.cpp index 6d80596dd..7d3ecc920 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebContext.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebContext.cpp @@ -67,7 +67,7 @@ static void initInspectorServer() return; } - bool success = WebInspectorServer::shared().listen(bindAddress, port); + bool success = WebInspectorServer::singleton().listen(bindAddress, port); if (success) { QString inspectorServerUrl = QString::fromLatin1("http://%1:%2").arg(bindAddress).arg(port); qWarning("Inspector server started successfully. Try pointing a WebKit browser to %s", qPrintable(inspectorServerUrl)); @@ -206,4 +206,3 @@ QString QtWebContext::preparedStoragePath(StorageType type) } } // namespace WebKit - diff --git a/Source/WebKit2/UIProcess/qt/QtWebError.cpp b/Source/WebKit2/UIProcess/qt/QtWebError.cpp index c2f506c8f..940e2a510 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebError.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebError.cpp @@ -21,6 +21,8 @@ #include "config.h" #include "QtWebError.h" +#include "WKErrorRef.h" + #include <QtCore/QUrl> #include <WKSharedAPICast.h> #include <WKString.h> diff --git a/Source/WebKit2/UIProcess/qt/QtWebError.h b/Source/WebKit2/UIProcess/qt/QtWebError.h index c2b922603..660aee855 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebError.h +++ b/Source/WebKit2/UIProcess/qt/QtWebError.h @@ -22,8 +22,8 @@ #define QtWebError_h #include "qwebdownloaditem_p.h" +#include <APIError.h> #include <QtNetwork/QNetworkReply> -#include <WKError.h> #include <WKRetainPtr.h> QT_BEGIN_NAMESPACE diff --git a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp index 86ac710bf..f28fb4163 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp @@ -92,4 +92,3 @@ void QtWebIconDatabaseClient::releaseIconForPageURL(const QString& pageURL) } // namespace WebKit #include "moc_QtWebIconDatabaseClient.cpp" - diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp index 8e7c5c221..9b620fb9d 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp @@ -188,7 +188,7 @@ void QtWebPageEventHandler::handleDragEnterEvent(QDragEnterEvent* ev) QTransform fromItemTransform = m_webPage->transformFromItem(); // FIXME: Should not use QCursor::pos() DragData dragData(ev->mimeData(), fromItemTransform.map(ev->pos()), QCursor::pos(), dropActionToDragOperation(ev->possibleActions())); - m_webPageProxy->dragEntered(&dragData); + m_webPageProxy->dragEntered(dragData); ev->acceptProposedAction(); } @@ -198,7 +198,7 @@ void QtWebPageEventHandler::handleDragLeaveEvent(QDragLeaveEvent* ev) // FIXME: Should not use QCursor::pos() DragData dragData(0, IntPoint(), QCursor::pos(), DragOperationNone); - m_webPageProxy->dragExited(&dragData); + m_webPageProxy->dragExited(dragData); m_webPageProxy->resetDragOperation(); ev->setAccepted(accepted); @@ -211,7 +211,7 @@ void QtWebPageEventHandler::handleDragMoveEvent(QDragMoveEvent* ev) QTransform fromItemTransform = m_webPage->transformFromItem(); // FIXME: Should not use QCursor::pos() DragData dragData(ev->mimeData(), fromItemTransform.map(ev->pos()), QCursor::pos(), dropActionToDragOperation(ev->possibleActions())); - m_webPageProxy->dragUpdated(&dragData); + m_webPageProxy->dragUpdated(dragData); ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragSession().operation)); if (m_webPageProxy->dragSession().operation != DragOperationNone) ev->accept(); @@ -227,7 +227,7 @@ void QtWebPageEventHandler::handleDropEvent(QDropEvent* ev) DragData dragData(ev->mimeData(), fromItemTransform.map(ev->pos()), QCursor::pos(), dropActionToDragOperation(ev->possibleActions())); SandboxExtension::Handle handle; SandboxExtension::HandleArray sandboxExtensionForUpload; - m_webPageProxy->performDrag(&dragData, String(), handle, sandboxExtensionForUpload); + m_webPageProxy->performDragOperation(dragData, String(), handle, sandboxExtensionForUpload); ev->setDropAction(dragOperationToDropAction(m_webPageProxy->dragSession().operation)); ev->accept(); @@ -261,12 +261,14 @@ void QtWebPageEventHandler::deactivateTapHighlight() void QtWebPageEventHandler::handleSingleTapEvent(const QTouchEvent::TouchPoint& point) { +#if ENABLE(GESTURE_EVENTS) deactivateTapHighlight(); m_postponeTextInputStateChanged = true; QTransform fromItemTransform = m_webPage->transformFromItem(); WebGestureEvent gesture(WebEvent::GestureSingleTap, fromItemTransform.map(point.pos()).toPoint(), point.screenPos().toPoint(), WebEvent::Modifiers(0), 0, IntSize(point.rect().size().toSize()), FloatPoint(0, 0)); m_webPageProxy->handleGestureEvent(gesture); +#endif } void QtWebPageEventHandler::handleDoubleTapEvent(const QTouchEvent::TouchPoint& point) @@ -300,12 +302,12 @@ void QtWebPageEventHandler::handleKeyReleaseEvent(QKeyEvent* ev) void QtWebPageEventHandler::handleFocusInEvent(QFocusEvent*) { - m_webPageProxy->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive); + m_webPageProxy->viewStateDidChange(ViewState::IsFocused | ViewState::WindowIsActive); } void QtWebPageEventHandler::handleFocusLost() { - m_webPageProxy->viewStateDidChange(WebPageProxy::ViewIsFocused | WebPageProxy::ViewWindowIsActive); + m_webPageProxy->viewStateDidChange(ViewState::IsFocused | ViewState::WindowIsActive); } void QtWebPageEventHandler::setViewportController(PageViewportControllerClientQt* controller) @@ -446,6 +448,7 @@ void QtWebPageEventHandler::handleWillSetInputMethodState() void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled) { +#if ENABLE(GESTURE_EVENTS) if (event.type() != WebEvent::GestureSingleTap) return; @@ -455,6 +458,7 @@ void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, b return; updateTextInputState(); +#endif } void QtWebPageEventHandler::handleInputEvent(const QInputEvent* event) diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h index 005cb4ca0..cd44ddc85 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h @@ -84,7 +84,7 @@ public: void didFindZoomableArea(const WebCore::IntPoint& target, const WebCore::IntRect& area); void updateTextInputState(); - void doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled); + void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled); #if ENABLE(TOUCH_EVENTS) void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled); #endif diff --git a/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp index 0c800ed64..88a9436af 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp @@ -158,4 +158,3 @@ void QtWebPagePolicyClient::decidePolicyForResponse(WKPageRef page, WKFrameRef f } } // namespace WebKit - diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp index 9a7b34951..1382312db 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp @@ -21,11 +21,12 @@ #include "config.h" #include "QtWebPageSGNode.h" +#include "CoordinatedGraphicsScene.h" + #include <QtGui/QPolygonF> #include <QtQuick/QQuickItem> #include <QtQuick/QQuickWindow> #include <QtQuick/QSGSimpleRectNode> -#include <WebCore/CoordinatedGraphicsScene.h> #include <WebCore/TransformationMatrix.h> #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) @@ -110,7 +111,7 @@ public: return parent; } - WebCore::CoordinatedGraphicsScene* coordinatedGraphicsScene() const { return m_scene.get(); } + CoordinatedGraphicsScene* coordinatedGraphicsScene() const { return m_scene.get(); } private: QRectF clipRect() const @@ -159,7 +160,7 @@ private: return resultRect; } - RefPtr<WebCore::CoordinatedGraphicsScene> m_scene; + RefPtr<CoordinatedGraphicsScene> m_scene; }; QtWebPageSGNode::QtWebPageSGNode() @@ -183,7 +184,7 @@ void QtWebPageSGNode::setScale(float scale) setMatrix(matrix); } -void QtWebPageSGNode::setCoordinatedGraphicsScene(PassRefPtr<WebCore::CoordinatedGraphicsScene> scene) +void QtWebPageSGNode::setCoordinatedGraphicsScene(PassRefPtr<CoordinatedGraphicsScene> scene) { if (m_contentsNode && m_contentsNode->coordinatedGraphicsScene() == scene) return; diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h index 77ad81b6f..22d3767bf 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h @@ -29,20 +29,17 @@ class QQuickItem; class QSGSimpleRectNode; QT_END_NAMESPACE -namespace WebCore { -class CoordinatedGraphicsScene; -} - namespace WebKit { class ContentsSGNode; +class CoordinatedGraphicsScene; class QtWebPageSGNode : public QSGTransformNode { public: QtWebPageSGNode(); void setBackground(const QRectF&, const QColor&); void setScale(float); - void setCoordinatedGraphicsScene(PassRefPtr<WebCore::CoordinatedGraphicsScene>); + void setCoordinatedGraphicsScene(PassRefPtr<CoordinatedGraphicsScene>); qreal devicePixelRatio() const { return m_devicePixelRatio; } void setDevicePixelRatio(qreal devicePixelRatio) { m_devicePixelRatio = devicePixelRatio; } diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp index af88423c6..482076370 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp +++ b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp @@ -119,8 +119,8 @@ bool QtWebPageUIClient::runJavaScriptConfirm(WKPageRef, WKStringRef message, WKF static inline WKStringRef createNullWKString() { - RefPtr<WebString> webString = WebString::createNull(); - return toAPI(webString.release().leakRef()); + RefPtr<API::String> apiString = API::String::createNull(); + return toAPI(apiString.release().leakRef()); } WKStringRef QtWebPageUIClient::runJavaScriptPrompt(WKPageRef, WKStringRef message, WKStringRef defaultValue, WKFrameRef, const void* clientInfo) @@ -174,4 +174,3 @@ void QtWebPageUIClient::policyForNotificationPermissionRequest(WKPageRef page, W } } // namespace WebKit - diff --git a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.h b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.h index e8aaa826b..b608d5880 100644 --- a/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.h +++ b/Source/WebKit2/UIProcess/qt/QtWebPageUIClient.h @@ -26,7 +26,7 @@ #include <WKFrame.h> #include <WKGeolocationPermissionRequest.h> #include <WKPage.h> -#include <WKSecurityOrigin.h> +#include <WKSecurityOriginRef.h> class QQuickWebView; class QWebPermissionRequest; diff --git a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp index 1bfa37624..d23cff04a 100644 --- a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.cpp @@ -82,13 +82,13 @@ void WebColorPickerQt::createItem(QObject* contextObject) createContext(component, contextObject); QObject* object = component->beginCreate(m_context.get()); if (!object) { - m_context.clear(); + m_context = nullptr; return; } - m_colorChooser = adoptPtr(qobject_cast<QQuickItem*>(object)); + m_colorChooser.reset(qobject_cast<QQuickItem*>(object)); if (!m_colorChooser) { - m_context.clear(); + m_context = nullptr; return; } @@ -107,7 +107,7 @@ void WebColorPickerQt::createContext(QQmlComponent* component, QObject* contextO QQmlContext* baseContext = component->creationContext(); if (!baseContext) baseContext = QQmlEngine::contextForObject(m_webView); - m_context = adoptPtr(new QQmlContext(baseContext)); + m_context.reset(new QQmlContext(baseContext)); contextObject->setParent(m_context.get()); m_context->setContextProperty(QLatin1String("model"), contextObject); @@ -137,8 +137,8 @@ void WebColorPickerQt::notifyColorSelected(const QColor& color) void WebColorPickerQt::endPicker() { - m_colorChooser.clear(); - m_context.clear(); + m_colorChooser = nullptr; + m_context = nullptr; if (!m_client) return; diff --git a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.h b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.h index 00c72d7ab..08c4e7dcd 100644 --- a/Source/WebKit2/UIProcess/qt/WebColorPickerQt.h +++ b/Source/WebKit2/UIProcess/qt/WebColorPickerQt.h @@ -24,7 +24,6 @@ #include "IntRect.h" #include "WebColorPicker.h" #include <QtCore/QObject> -#include <wtf/OwnPtr.h> QT_BEGIN_NAMESPACE class QQmlComponent; @@ -64,8 +63,8 @@ private: void createItem(QObject*); void createContext(QQmlComponent*, QObject*); - OwnPtr<QQmlContext> m_context; - OwnPtr<QQuickItem> m_colorChooser; + std::unique_ptr<QQmlContext> m_context; + std::unique_ptr<QQuickItem> m_colorChooser; QQuickWebView* m_webView; }; diff --git a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp index d510c53ff..1ff57e9c9 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp @@ -31,16 +31,12 @@ using namespace WebCore; namespace WebKit { -WebContextMenuProxyQt::WebContextMenuProxyQt(WebPageProxy*) +WebContextMenuProxyQt::WebContextMenuProxyQt(const ContextMenuContextData& context, const UserData& userData) + : WebContextMenuProxy(context, userData) { } -PassRefPtr<WebContextMenuProxyQt> WebContextMenuProxyQt::create(WebPageProxy* webPageProxy) -{ - return adoptRef(new WebContextMenuProxyQt(webPageProxy)); -} - -void WebContextMenuProxyQt::showContextMenu(const IntPoint& position, const Vector<WebContextMenuItemData>& items) +void WebContextMenuProxyQt::showContextMenu(const IntPoint&, const Vector<WebContextMenuItemData>&) { } @@ -51,4 +47,3 @@ void WebContextMenuProxyQt::hideContextMenu() #include "moc_WebContextMenuProxyQt.cpp" } // namespace WebKit - diff --git a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h index bd7aebd6f..a0cc82d0a 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h +++ b/Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.h @@ -37,11 +37,9 @@ class WebPageProxy; class WebContextMenuProxyQt : public QObject, public WebContextMenuProxy { Q_OBJECT public: - static PassRefPtr<WebContextMenuProxyQt> create(WebPageProxy*); + WebContextMenuProxyQt(const ContextMenuContextData&, const UserData&); private: - WebContextMenuProxyQt(WebPageProxy*); - virtual void showContextMenu(const WebCore::IntPoint&, const Vector<WebContextMenuItemData>&); virtual void hideContextMenu(); }; diff --git a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h index e476b128d..177266b4e 100644 --- a/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h +++ b/Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h @@ -22,9 +22,9 @@ #define WebGeolocationProviderQt_h #include <QObject> -#include <WebKit2/WKGeolocationManager.h> -#include <WebKit2/WKGeolocationPosition.h> -#include <WebKit2/WKRetainPtr.h> +#include <WebKit/WKGeolocationManager.h> +#include <WebKit/WKGeolocationPosition.h> +#include <WebKit/WKRetainPtr.h> QT_BEGIN_NAMESPACE class QGeoPositionInfoSource; diff --git a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp index a89782506..541cca01f 100644 --- a/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp @@ -62,7 +62,7 @@ void WebPageProxy::loadRecentSearches(const String&, Vector<String>&) void WebPageProxy::registerApplicationScheme(const String& scheme) { - process()->send(Messages::WebPage::RegisterApplicationScheme(scheme), m_pageID); + process().send(Messages::WebPage::RegisterApplicationScheme(scheme), m_pageID); } void WebPageProxy::resolveApplicationSchemeRequest(QtNetworkRequestData request) @@ -80,7 +80,7 @@ void WebPageProxy::sendApplicationSchemeReply(const QQuickNetworkReply* reply) RefPtr<QtRefCountedNetworkRequestData> requestData = reply->networkRequestData(); if (m_applicationSchemeRequests.contains(requestData)) { RefPtr<QtRefCountedNetworkReplyData> replyData = reply->networkReplyData(); - process()->send(Messages::WebPage::ApplicationSchemeReply(replyData->data()), pageID()); + process().send(Messages::WebPage::ApplicationSchemeReply(replyData->data()), pageID()); m_applicationSchemeRequests.remove(requestData); } #endif @@ -88,17 +88,17 @@ void WebPageProxy::sendApplicationSchemeReply(const QQuickNetworkReply* reply) void WebPageProxy::authenticationRequiredRequest(const String& hostname, const String& realm, const String& prefilledUsername, String& username, String& password) { - m_pageClient->handleAuthenticationRequiredRequest(hostname, realm, prefilledUsername, username, password); + m_pageClient.handleAuthenticationRequiredRequest(hostname, realm, prefilledUsername, username, password); } void WebPageProxy::proxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password) { - m_pageClient->handleProxyAuthenticationRequiredRequest(hostname, port, prefilledUsername, username, password); + m_pageClient.handleProxyAuthenticationRequiredRequest(hostname, port, prefilledUsername, username, password); } void WebPageProxy::certificateVerificationRequest(const String& hostname, bool& ignoreErrors) { - m_pageClient->handleCertificateVerificationRequest(hostname, ignoreErrors); + m_pageClient.handleCertificateVerificationRequest(hostname, ignoreErrors); } #if PLUGIN_ARCHITECTURE(X11) @@ -115,17 +115,17 @@ void WebPageProxy::windowedPluginGeometryDidChange(const WebCore::IntRect& frame void WebPageProxy::changeSelectedIndex(int32_t selectedIndex) { - process()->send(Messages::WebPage::SelectedIndex(selectedIndex), m_pageID); + process().send(Messages::WebPage::SelectedIndex(selectedIndex), m_pageID); } void WebPageProxy::closePopupMenu() { - process()->send(Messages::WebPage::HidePopupMenu(), m_pageID); + process().send(Messages::WebPage::HidePopupMenu(), m_pageID); } void WebPageProxy::willSetInputMethodState() { - m_pageClient->handleWillSetInputMethodState(); + m_pageClient.handleWillSetInputMethodState(); } } // namespace WebKit diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp index 128379f26..d82aa23ad 100644 --- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.cpp @@ -262,7 +262,7 @@ void PopupMenuItemModel::buildItems(const Vector<WebPopupItem>& webPopupItems) } } -WebPopupMenuProxyQt::WebPopupMenuProxyQt(WebPopupMenuProxy::Client* client, QQuickWebView* webView) +WebPopupMenuProxyQt::WebPopupMenuProxyQt(WebPopupMenuProxy::Client& client, QQuickWebView* webView) : WebPopupMenuProxy(client) , m_webView(webView) { @@ -287,8 +287,8 @@ void WebPopupMenuProxyQt::showPopupMenu(const IntRect& rect, WebCore::TextDirect void WebPopupMenuProxyQt::hidePopupMenu() { - m_itemSelector.clear(); - m_context.clear(); + m_itemSelector = nullptr; + m_context = nullptr; if (m_client) { m_client->closePopupMenu(); @@ -314,7 +314,7 @@ void WebPopupMenuProxyQt::createItem(QObject* contextObject) if (!object) return; - m_itemSelector = adoptPtr(qobject_cast<QQuickItem*>(object)); + m_itemSelector.reset(qobject_cast<QQuickItem*>(object)); if (!m_itemSelector) return; @@ -339,7 +339,7 @@ void WebPopupMenuProxyQt::createContext(QQmlComponent* component, QObject* conte QQmlContext* baseContext = component->creationContext(); if (!baseContext) baseContext = QQmlEngine::contextForObject(m_webView); - m_context = adoptPtr(new QQmlContext(baseContext)); + m_context.reset(new QQmlContext(baseContext)); contextObject->setParent(m_context.get()); m_context->setContextProperty(QLatin1String("model"), contextObject); diff --git a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h index e622f9006..fa03dbf07 100644 --- a/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h +++ b/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h @@ -29,7 +29,6 @@ #include "WebPopupMenuProxy.h" #include <QtCore/QObject> -#include <wtf/OwnPtr.h> QT_BEGIN_NAMESPACE class QQmlComponent; @@ -50,9 +49,9 @@ public: MultipleSelection }; - static PassRefPtr<WebPopupMenuProxyQt> create(WebPopupMenuProxy::Client* client, QQuickWebView* webView) + static Ref<WebPopupMenuProxyQt> create(WebPopupMenuProxy::Client& client, QQuickWebView* webView) { - return adoptRef(new WebPopupMenuProxyQt(client, webView)); + return adoptRef(*new WebPopupMenuProxyQt(client, webView)); } ~WebPopupMenuProxyQt(); @@ -65,12 +64,12 @@ private Q_SLOTS: void selectIndex(int); private: - WebPopupMenuProxyQt(WebPopupMenuProxy::Client*, QQuickWebView*); + WebPopupMenuProxyQt(WebPopupMenuProxy::Client&, QQuickWebView*); void createItem(QObject*); void createContext(QQmlComponent*, QObject*); - OwnPtr<QQmlContext> m_context; - OwnPtr<QQuickItem> m_itemSelector; + std::unique_ptr<QQmlContext> m_context; + std::unique_ptr<QQuickItem> m_itemSelector; QQuickWebView* m_webView; SelectionType m_selectionType; diff --git a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp index 7661559fe..11ef5e380 100644 --- a/Source/WebKit2/UIProcess/qt/WebContextQt.cpp +++ b/Source/WebKit2/UIProcess/qt/WebProcessPoolQt.cpp @@ -25,12 +25,12 @@ */ #include "config.h" -#include "WebContext.h" +#include "WebProcessPool.h" -#include "ApplicationCacheStorage.h" #include "WKSharedAPICast.h" #include "WebProcessCreationParameters.h" #include <QProcess> +#include <WebCore/ApplicationCacheStorage.h> #if ENABLE(GEOLOCATION) #include "WebGeolocationManagerProxy.h" @@ -39,7 +39,7 @@ namespace WebKit { -String WebContext::platformDefaultApplicationCacheDirectory() const +String WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory() { const String cacheDirectory = WebCore::cacheStorage().cacheDirectory(); @@ -49,40 +49,26 @@ String WebContext::platformDefaultApplicationCacheDirectory() const return cacheDirectory; } -void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& parameters) +void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters) { qRegisterMetaType<QProcess::ExitStatus>("QProcess::ExitStatus"); -#if ENABLE(GEOLOCATION) && HAVE(QTLOCATION) +#if ENABLE(GEOLOCATION) && HAVE(QTPOSITIONING) static WebGeolocationProviderQt* location = WebGeolocationProviderQt::create(toAPI(supplement<WebGeolocationManagerProxy>())); WKGeolocationManagerSetProvider(toAPI(supplement<WebGeolocationManagerProxy>()), WebGeolocationProviderQt::provider(location)); #endif } -void WebContext::platformInvalidateContext() +void WebProcessPool::platformInvalidateContext() { } -String WebContext::platformDefaultDatabaseDirectory() const -{ - return String(); -} - -String WebContext::platformDefaultIconDatabasePath() const -{ - return String(); -} - -String WebContext::platformDefaultLocalStorageDirectory() const -{ - return String(); -} -String WebContext::platformDefaultDiskCacheDirectory() const +String WebProcessPool::platformDefaultIconDatabasePath() const { return String(); } -String WebContext::platformDefaultCookieStorageDirectory() const +String WebProcessPool::platformDefaultLocalStorageDirectory() const { return String(); } diff --git a/Source/WebKit2/UIProcess/qt/WebProcessProxyQt.cpp b/Source/WebKit2/UIProcess/qt/WebProcessProxyQt.cpp deleted file mode 100644 index e8b173d07..000000000 --- a/Source/WebKit2/UIProcess/qt/WebProcessProxyQt.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2012 Apple Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "config.h" -#include "WebProcessProxy.h" - -namespace WebKit { - -void WebProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOptions&) -{ -} - -} // namespace WebKit |