[Qt][WK2] Fix build after r156688.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Oct 2013 11:38:52 +0000 (11:38 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Oct 2013 11:38:52 +0000 (11:38 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122153

Patch by Gabor Abraham <abrhm@inf.u-szeged.hu> on 2013-10-01
Reviewed by Allan Sandfeld Jensen.

* Shared/qt/ShareableBitmapQt.cpp:
(WebKit::ShareableBitmap::createGraphicsContext):
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewPrivate::createDrawingAreaProxy):
* UIProcess/API/qt/qquickwebview_p_p.h:
* UIProcess/API/qt/raw/qrawwebview.cpp:
(QRawWebViewPrivate::createDrawingAreaProxy):
* UIProcess/API/qt/raw/qrawwebview_p_p.h:
* UIProcess/qt/QtPageClient.cpp:
(WebKit::QtPageClient::createDrawingAreaProxy):
* UIProcess/qt/QtPageClient.h:
* WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp:
(WebKit::convertQPixmapToShareableBitmap):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@156706 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/Shared/qt/ShareableBitmapQt.cpp
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
Source/WebKit2/UIProcess/qt/QtPageClient.cpp
Source/WebKit2/UIProcess/qt/QtPageClient.h
Source/WebKit2/WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp

index 860c815..ebe1122 100644 (file)
@@ -1,3 +1,24 @@
+2013-10-01  Gabor Abraham  <abrhm@inf.u-szeged.hu>
+
+        [Qt][WK2] Fix build after r156688.
+        https://bugs.webkit.org/show_bug.cgi?id=122153
+
+        Reviewed by Allan Sandfeld Jensen.
+
+        * Shared/qt/ShareableBitmapQt.cpp:
+        (WebKit::ShareableBitmap::createGraphicsContext):
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::createDrawingAreaProxy):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        * UIProcess/API/qt/raw/qrawwebview.cpp:
+        (QRawWebViewPrivate::createDrawingAreaProxy):
+        * UIProcess/API/qt/raw/qrawwebview_p_p.h:
+        * UIProcess/qt/QtPageClient.cpp:
+        (WebKit::QtPageClient::createDrawingAreaProxy):
+        * UIProcess/qt/QtPageClient.h:
+        * WebProcess/WebCoreSupport/qt/WebDragClientQt.cpp:
+        (WebKit::convertQPixmapToShareableBitmap):
+
 2013-09-30  Ryuan Choi  <ryuan.choi@samsung.com>
 
         Build fix for EFL, Qt, Gtk port after r156688
index 4d02e41..764567c 100644 (file)
@@ -56,15 +56,15 @@ PassRefPtr<Image> ShareableBitmap::createImage()
     return BitmapImage::create(pixmap);
 }
 
-PassOwnPtr<GraphicsContext> ShareableBitmap::createGraphicsContext()
+std::unique_ptr<GraphicsContext> ShareableBitmap::createGraphicsContext()
 {
     // FIXME: Should this be OwnPtr<QImage>?
     QImage* image = new QImage(createQImage());
     QPainter* painter = new QPainter(image);
     painter->setRenderHint(QPainter::SmoothPixmapTransform, true);
-    OwnPtr<GraphicsContext> context = adoptPtr(new GraphicsContext(painter));
+    auto context = std::make_unique<GraphicsContext>(painter);
     context->takeOwnershipOfPlatformContext();
-    return context.release();
+    return context;
 }
 
 void ShareableBitmap::paint(GraphicsContext& context, const IntPoint& dstPoint, const IntRect& srcRect)
index aa254d8..60bbe36 100644 (file)
@@ -635,9 +635,9 @@ void QQuickWebViewPrivate::processDidBecomeResponsive(WKPageRef, const void* cli
     emit q->experimental()->processDidBecomeResponsive();
 }
 
-OwnPtr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
+std::unique_ptr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
 {
-    return createOwned<WebKit::DrawingAreaProxyImpl>(webPageProxy.get());
+    return std::make_unique<WebKit::DrawingAreaProxyImpl>(webPageProxy.get());
 }
 
 void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download)
index 1cd752d..80276ac 100644 (file)
@@ -133,7 +133,7 @@ public:
     virtual void pageDidRequestScroll(const QPoint& pos) { }
     void processDidCrash();
     void didRelaunchProcess();
-    OwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    std::unique_ptr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
     void handleDownloadRequest(WebKit::DownloadProxy*);
 
     void didReceiveMessageFromNavigatorQtObject(WKStringRef message);
index cc01973..31b3d81 100644 (file)
@@ -239,9 +239,9 @@ void QRawWebViewPrivate::doneWithKeyEvent(const WebKit::NativeWebKeyboardEvent&
     m_client->doneWithKeyEvent(event.nativeEvent(), wasEventHandled);
 }
 
-OwnPtr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
+std::unique_ptr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
 {
-    return createOwned<WebKit::DrawingAreaProxyImpl>(m_webPageProxy.get());
+    return std::make_unique<WebKit::DrawingAreaProxyImpl>(m_webPageProxy.get());
 }
 
 QRawWebViewPrivate::QRawWebViewPrivate(WebKit::WebContext* context, WebKit::WebPageGroup* pageGroup, QRawWebViewClient* client)
index 7714e8f..42ef3d4 100644 (file)
@@ -94,7 +94,7 @@ public:
 
     // PageClient
 
-    virtual OwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    virtual std::unique_ptr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
 
     virtual void pageDidRequestScroll(const WebCore::IntPoint& pos);
     virtual void processDidCrash();
index 887c4f9..b01be18 100644 (file)
@@ -63,7 +63,7 @@ void QtPageClient::initialize(QQuickWebView* webView, QtWebPageEventHandler* eve
     m_undoController = undoController;
 }
 
-OwnPtr<DrawingAreaProxy> QtPageClient::createDrawingAreaProxy()
+std::unique_ptr<DrawingAreaProxy> QtPageClient::createDrawingAreaProxy()
 {
     return QQuickWebViewPrivate::get(m_webView)->createDrawingAreaProxy();
 }
index b06acc8..3cb5a8e 100644 (file)
@@ -52,7 +52,7 @@ public:
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
     virtual void processDidCrash();
     virtual void didRelaunchProcess();
-    virtual OwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
+    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);
index 20f7e95..0564128 100644 (file)
@@ -45,7 +45,7 @@ static PassRefPtr<ShareableBitmap> convertQPixmapToShareableBitmap(QPixmap* pixm
         return 0;
 
     RefPtr<ShareableBitmap> bitmap = ShareableBitmap::createShareable(IntSize(pixmap->size()), ShareableBitmap::SupportsAlpha);
-    OwnPtr<GraphicsContext> graphicsContext = bitmap->createGraphicsContext();
+    auto graphicsContext = bitmap->createGraphicsContext();
 
     graphicsContext->platformContext()->drawPixmap(0, 0, *pixmap);
     return bitmap.release();