3 files changed, 7 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
index 89f729705..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)
@@ -239,9 +239,9 @@ void QRawWebViewPrivate::doneWithKeyEvent(const WebKit::NativeWebKeyboardEvent&
     m_client->doneWithKeyEvent(event.nativeEvent(), wasEventHandled);
 }
 
-PassOwnPtr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
+std::unique_ptr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
 {
-    return WebKit::DrawingAreaProxyImpl::create(m_webPageProxy.get());
+    return std::make_unique<WebKit::DrawingAreaProxyImpl>(m_webPageProxy.get());
 }
 
 QRawWebViewPrivate::QRawWebViewPrivate(WebKit::WebContext* context, WebKit::WebPageGroup* pageGroup, QRawWebViewClient* client)
@@ -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;
 };
diff --git a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
index 58d6b1390..42ef3d4f6 100644
--- a/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
+++ b/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
@@ -94,7 +94,7 @@ public:
 
     // PageClient
 
-    virtual PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    virtual std::unique_ptr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
 
     virtual void pageDidRequestScroll(const WebCore::IntPoint& pos);
     virtual void processDidCrash();