Fix Qt WK2 build after r155888
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 08:39:05 +0000 (08:39 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 17 Sep 2013 08:39:05 +0000 (08:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=121471

Patch by Gabor Abraham <abrhm@inf.u-szeged.hu> on 2013-09-17
Reviewed by Csaba Osztrogonác.

* 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:

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

Source/WebKit2/ChangeLog
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

index 3349088..6ef9a1b 100644 (file)
@@ -1,3 +1,20 @@
+2013-09-17  Gabor Abraham  <abrhm@inf.u-szeged.hu>
+
+        Fix Qt WK2 build after r155888
+        https://bugs.webkit.org/show_bug.cgi?id=121471
+
+        Reviewed by Csaba Osztrogonác.
+
+        * 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:
+
 2013-09-17  Csaba Osztrogonác  <ossy@webkit.org>
 
         [GTK][EFL] Add NetworkProcess support for ProcessLauncher
index ab30458..b8ca002 100644 (file)
@@ -635,9 +635,9 @@ void QQuickWebViewPrivate::processDidBecomeResponsive(WKPageRef, const void* cli
     emit q->experimental()->processDidBecomeResponsive();
 }
 
-PassOwnPtr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
+OwnPtr<DrawingAreaProxy> QQuickWebViewPrivate::createDrawingAreaProxy()
 {
-    return DrawingAreaProxyImpl::create(webPageProxy.get());
+    return createOwned<WebKit::DrawingAreaProxyImpl>(webPageProxy.get());
 }
 
 void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download)
index f1ce171..1cd752d 100644 (file)
@@ -133,7 +133,7 @@ public:
     virtual void pageDidRequestScroll(const QPoint& pos) { }
     void processDidCrash();
     void didRelaunchProcess();
-    PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    OwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
     void handleDownloadRequest(WebKit::DownloadProxy*);
 
     void didReceiveMessageFromNavigatorQtObject(WKStringRef message);
index 89f7297..cc01973 100644 (file)
@@ -239,9 +239,9 @@ void QRawWebViewPrivate::doneWithKeyEvent(const WebKit::NativeWebKeyboardEvent&
     m_client->doneWithKeyEvent(event.nativeEvent(), wasEventHandled);
 }
 
-PassOwnPtr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
+OwnPtr<WebKit::DrawingAreaProxy> QRawWebViewPrivate::createDrawingAreaProxy()
 {
-    return WebKit::DrawingAreaProxyImpl::create(m_webPageProxy.get());
+    return createOwned<WebKit::DrawingAreaProxyImpl>(m_webPageProxy.get());
 }
 
 QRawWebViewPrivate::QRawWebViewPrivate(WebKit::WebContext* context, WebKit::WebPageGroup* pageGroup, QRawWebViewClient* client)
index 58d6b13..7714e8f 100644 (file)
@@ -94,7 +94,7 @@ public:
 
     // PageClient
 
-    virtual PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    virtual OwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
 
     virtual void pageDidRequestScroll(const WebCore::IntPoint& pos);
     virtual void processDidCrash();
index 2f242c6..887c4f9 100644 (file)
@@ -63,7 +63,7 @@ void QtPageClient::initialize(QQuickWebView* webView, QtWebPageEventHandler* eve
     m_undoController = undoController;
 }
 
-PassOwnPtr<DrawingAreaProxy> QtPageClient::createDrawingAreaProxy()
+OwnPtr<DrawingAreaProxy> QtPageClient::createDrawingAreaProxy()
 {
     return QQuickWebViewPrivate::get(m_webView)->createDrawingAreaProxy();
 }
index e6d9db3..b06acc8 100644 (file)
@@ -52,7 +52,7 @@ public:
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
     virtual void processDidCrash();
     virtual void didRelaunchProcess();
-    virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
+    virtual OwnPtr<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);