Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix Qt WK2 build after r155888
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:

Canonical link: https://commits.webkit.org/139461@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155935 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Gabor Abraham authored and ossy-szeged committed Sep 17, 2013
1 parent d66b641 commit 7c3c37b
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 8 deletions.
17 changes: 17 additions & 0 deletions Source/WebKit2/ChangeLog
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
Expand Up @@ -133,7 +133,7 @@ class QQuickWebViewPrivate {
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);
Expand Down
4 changes: 2 additions & 2 deletions Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h
Expand Up @@ -94,7 +94,7 @@ class QRawWebViewPrivate : public WebKit::PageClient {

// PageClient

virtual PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
virtual OwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();

virtual void pageDidRequestScroll(const WebCore::IntPoint& pos);
virtual void processDidCrash();
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/UIProcess/qt/QtPageClient.cpp
Expand Up @@ -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();
}
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit2/UIProcess/qt/QtPageClient.h
Expand Up @@ -52,7 +52,7 @@ class QtPageClient : public PageClient {
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);
Expand Down

0 comments on commit 7c3c37b

Please sign in to comment.