Changeset 102779 in webkit

Timestamp:

Dec 14, 2011 8:04:21 AM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

[Qt] [WK2] Move download handling out of QtWebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=74506

Reviewed by Kenneth Rohde Christiansen.

Also moves the creation of QtWebContext out of QtWebPageProxy.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::initialize):
(QQuickWebViewPrivate::handleDownloadRequest):
(QQuickWebViewPrivate::_q_onReceivedResponseFromDownload):

• UIProcess/API/qt/qquickwebview_p.h:
• UIProcess/API/qt/qquickwebview_p_p.h:
• UIProcess/API/qt/qwebdownloaditem_p.h:
• UIProcess/qt/QtPageClient.cpp:

(QtPageClient::handleDownloadRequest):

• UIProcess/qt/QtPageClient.h:
• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::QtWebPageProxy):

• UIProcess/qt/QtWebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (6 diffs)
• UIProcess/API/qt/qquickwebview_p.h (modified) (1 diff)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (4 diffs)
• UIProcess/API/qt/qwebdownloaditem_p.h (modified) (1 diff)
• UIProcess/qt/QtPageClient.cpp (modified) (1 diff)
• UIProcess/qt/QtPageClient.h (modified) (2 diffs)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebPageProxy.h (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-14  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] [WK2] Move download handling out of QtWebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=74506
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Also moves the creation of QtWebContext out of QtWebPageProxy.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::initialize):
+        (QQuickWebViewPrivate::handleDownloadRequest):
+        (QQuickWebViewPrivate::_q_onReceivedResponseFromDownload):
+        * UIProcess/API/qt/qquickwebview_p.h:
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        * UIProcess/API/qt/qwebdownloaditem_p.h:
+        * UIProcess/qt/QtPageClient.cpp:
+        (QtPageClient::handleDownloadRequest):
+        * UIProcess/qt/QtPageClient.h:
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::QtWebPageProxy):
+        * UIProcess/qt/QtWebPageProxy.h:
+
 2011-12-14  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -22 +22 @@
 #include "qquickwebview_p.h"
 
+#include "DownloadProxy.h"
 #include "DrawingAreaProxyImpl.h"
 #include "QtDialogRunner.h"
+#include "QtDownloadManager.h"
+#include "QtWebContext.h"
 #include "QtWebPageEventHandler.h"
 #include "QtWebPageProxy.h"
@@ -33 +36 @@
 #include "qquickwebpage_p_p.h"
 #include "qquickwebview_p_p.h"
+#include "qwebdownloaditem_p_p.h"
 #include "qwebnavigationhistory_p.h"
 #include "qwebnavigationhistory_p_p.h"
@@ -38 +42 @@
 
 #include <JavaScriptCore/InitializeThreading.h>
+#include <QDeclarativeEngine>
 #include <QFileDialog>
 #include <QtQuick/QQuickCanvas>
@@ -66 +71 @@
 void QQuickWebViewPrivate::initialize(WKContextRef contextRef, WKPageGroupRef pageGroupRef)
 {
+    context = contextRef ? QtWebContext::create(toImpl(contextRef)) : QtWebContext::defaultContext();
     QQuickWebPagePrivate* const pageViewPrivate = pageView.data()->d;
-    setPageProxy(new QtWebPageProxy(q_ptr, &pageClient, contextRef, pageGroupRef));
+    setPageProxy(new QtWebPageProxy(q_ptr, &pageClient, context, pageGroupRef));
     pageViewPrivate->initialize(webPageProxy());
 
@@ -234 +240 @@
 }
 
+void QQuickWebViewPrivate::handleDownloadRequest(DownloadProxy* download)
+{
+    Q_Q(QQuickWebView);
+    // This function is responsible for hooking up a DownloadProxy to our API layer
+    // by creating a QWebDownloadItem. It will then wait for the QWebDownloadItem to be
+    // ready (filled with the ResourceResponse information) so we can pass it through to
+    // our WebViews.
+    QWebDownloadItem* downloadItem = new QWebDownloadItem();
+    downloadItem->d->downloadProxy = download;
+
+    q->connect(downloadItem->d, SIGNAL(receivedResponse(QWebDownloadItem*)), q, SLOT(_q_onReceivedResponseFromDownload(QWebDownloadItem*)));
+    context->downloadManager()->addDownload(download, downloadItem);
+}
+
 void QQuickWebViewPrivate::updateVisibleContentRectAndScale()
 {
@@ -262 +282 @@
 {
     webPageProxy()->viewStateDidChange(WebPageProxy::ViewIsVisible);
+}
+
+void QQuickWebViewPrivate::_q_onReceivedResponseFromDownload(QWebDownloadItem* downloadItem)
+{
+    // Now that our downloadItem has everything we need we can emit downloadRequested.
+    if (!downloadItem)
+        return;
+
+    Q_Q(QQuickWebView);
+    QDeclarativeEngine::setObjectOwnership(downloadItem, QDeclarativeEngine::JavaScriptOwnership);
+    emit q->experimental()->downloadRequested(downloadItem);
 }
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

@@ -134 +134 @@
     Q_PRIVATE_SLOT(d_func(), void _q_onOpenPanelFinished(int result));
     Q_PRIVATE_SLOT(d_func(), void _q_onVisibleChanged());
+    Q_PRIVATE_SLOT(d_func(), void _q_onReceivedResponseFromDownload(QWebDownloadItem*));
     // Hides QObject::d_ptr allowing us to use the convenience macros.
     QScopedPointer<QQuickWebViewPrivate> d_ptr;

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -37 +37 @@
 #include <QtCore/QScopedPointer>
 #include <wtf/OwnPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
+class DownloadProxy;
+class QtWebContext;
 class WebPageProxy;
 }
@@ -85 +88 @@
     void _q_onOpenPanelFinished(int result);
     void _q_onVisibleChanged();
+    void _q_onReceivedResponseFromDownload(QWebDownloadItem*);
 
     void chooseFiles(WKOpenPanelResultListenerRef, const QStringList& selectedFileNames, QtWebPageUIClient::FileChooserType);
@@ -104 +108 @@
     void didRelaunchProcess();
     PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
+    void handleDownloadRequest(DownloadProxy*);
 
 private:
@@ -135 +140 @@
     };
 
+    RefPtr<QtWebContext> context;
+
     QtPageClient pageClient;
     QtWebUndoController undoController;

trunk/Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h

@@ -81 +81 @@
 
     friend class WebKit::QtDownloadManager;
-    friend class QtWebPageProxy;
+    friend class QQuickWebViewPrivate;
 };
 

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp

@@ -93 +93 @@
 void QtPageClient::handleDownloadRequest(DownloadProxy* download)
 {
-    m_qtWebPageProxy->handleDownloadRequest(download);
+    QQuickWebViewPrivate::get(m_webView)->handleDownloadRequest(download);
 }
 

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h

@@ -51 +51 @@
     virtual void didRelaunchProcess();
     virtual PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
+    virtual void handleDownloadRequest(DownloadProxy*);
 
     virtual void displayView();
@@ -90 +91 @@
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
     virtual void focusEditableArea(const WebCore::IntRect&, const WebCore::IntRect&);
-    virtual void handleDownloadRequest(DownloadProxy*);
 
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.cpp

@@ -22 +22 @@
 #include "QtWebPageProxy.h"
 
-#include <qdeclarativeengine.h>
 #include <QtQuick/qquickcanvas.h>
 #include "qquickwebview_p.h"
 #include "qquickwebview_p_p.h"
-#include "qwebdownloaditem_p.h"
-#include "qwebdownloaditem_p_p.h"
 #include "qwebpreferences_p.h"
 #include "qwebpreferences_p_p.h"
 
-#include "DownloadProxy.h"
-#include "QtDownloadManager.h"
 #include "QtPageClient.h"
+#include "QtWebContext.h"
 #include "WebBackForwardList.h"
 #include "WKStringQt.h"
@@ -43 +39 @@
 using namespace WebCore;
 
-QtWebPageProxy::QtWebPageProxy(QQuickWebView* qmlWebView, QtPageClient *pageClient, WKContextRef contextRef, WKPageGroupRef pageGroupRef)
+QtWebPageProxy::QtWebPageProxy(QQuickWebView* qmlWebView, QtPageClient *pageClient, PassRefPtr<QtWebContext> context, WKPageGroupRef pageGroupRef)
     : m_qmlWebView(qmlWebView)
-    , m_context(contextRef ? QtWebContext::create(toImpl(contextRef)) : QtWebContext::defaultContext())
+    , m_context(context)
     , m_navigatorQtObjectEnabled(false)
 {
@@ -154 +150 @@
 }
 
-void QtWebPageProxy::handleDownloadRequest(DownloadProxy* download)
-{
-    // This function is responsible for hooking up a DownloadProxy to our API layer
-    // by creating a QWebDownloadItem. It will then wait for the QWebDownloadItem to be
-    // ready (filled with the ResourceResponse information) so we can pass it through to
-    // our WebViews.
-    QWebDownloadItem* downloadItem = new QWebDownloadItem();
-    downloadItem->d->downloadProxy = download;
-
-    connect(downloadItem->d, SIGNAL(receivedResponse(QWebDownloadItem*)), this, SLOT(didReceiveDownloadResponse(QWebDownloadItem*)));
-    m_context->downloadManager()->addDownload(download, downloadItem);
-}
-
-void QtWebPageProxy::didReceiveDownloadResponse(QWebDownloadItem* downloadItem)
-{
-    // Now that our downloadItem has everything we need we can emit downloadRequested.
-    if (!downloadItem)
-        return;
-
-    QDeclarativeEngine::setObjectOwnership(downloadItem, QDeclarativeEngine::JavaScriptOwnership);
-    emit m_qmlWebView->experimental()->downloadRequested(downloadItem);
-}
-
 #include "moc_QtWebPageProxy.cpp"

trunk/Source/WebKit2/UIProcess/qt/QtWebPageProxy.h

@@ -22 +22 @@
 #define QtWebPageProxy_h
 
-#include "QtWebContext.h"
 #include "WebPageProxy.h"
+#include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <QMenu>
@@ -29 +29 @@
 
 class QtPageClient;
-class QQuickWebPage;
 class QQuickWebView;
-class QWebDownloadItem;
 class QWebPreferences;
 
@@ -45 +43 @@
 
 public:
-    QtWebPageProxy(QQuickWebView*, QtPageClient*, WKContextRef = 0, WKPageGroupRef = 0);
+    QtWebPageProxy(QQuickWebView*, QtPageClient*, PassRefPtr<QtWebContext>, WKPageGroupRef = 0);
     ~QtWebPageProxy();
 
@@ -71 +69 @@
     }
 
-    void handleDownloadRequest(DownloadProxy*);
     void init();
 
     void showContextMenu(QSharedPointer<QMenu>);
     void hideContextMenu();
-
-public Q_SLOTS:
-    void didReceiveDownloadResponse(QWebDownloadItem* downloadItem);
 
 public: