Changeset 102670 in webkit

Timestamp:

Dec 13, 2011 4:35:20 AM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

[Qt][WK2] Move load & navigation related functions out of QtWebPageProxy
​https://bugs.webkit.org/show_bug.cgi?id=74395

Reviewed by Simon Hausmann.

• Target.pri:
• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::_q_onVisibleChanged):
(QQuickWebViewPrivate::updateViewportSize):
(QQuickWebViewPrivate::computeViewportConstraints):
(QQuickWebViewPrivate::setUseTraditionalDesktopBehaviour):
(QQuickWebViewPrivate::webPageProxy):
(QQuickWebView::load):
(QQuickWebView::goBack):
(QQuickWebView::goForward):
(QQuickWebView::stop):
(QQuickWebView::reload):
(QQuickWebView::url):
(QQuickWebView::canGoBack):
(QQuickWebView::canGoForward):
(QQuickWebView::loading):
(QQuickWebView::canReload):
(QQuickWebView::title):
(QQuickWebView::loadHtml):

• UIProcess/API/qt/qquickwebview_p_p.h:
• UIProcess/qt/QtWebPageProxy.cpp:

(QtWebPageProxy::didReceiveMessageFromNavigatorQtObject):

• UIProcess/qt/QtWebPageProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Target.pri (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (18 diffs)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (3 diffs)
• UIProcess/qt/QtWebPageProxy.cpp (modified) (3 diffs)
• UIProcess/qt/QtWebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-13  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt][WK2] Move load & navigation related functions out of QtWebPageProxy
+        https://bugs.webkit.org/show_bug.cgi?id=74395
+
+        Reviewed by Simon Hausmann.
+
+        * Target.pri:
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::_q_onVisibleChanged):
+        (QQuickWebViewPrivate::updateViewportSize):
+        (QQuickWebViewPrivate::computeViewportConstraints):
+        (QQuickWebViewPrivate::setUseTraditionalDesktopBehaviour):
+        (QQuickWebViewPrivate::webPageProxy):
+        (QQuickWebView::load):
+        (QQuickWebView::goBack):
+        (QQuickWebView::goForward):
+        (QQuickWebView::stop):
+        (QQuickWebView::reload):
+        (QQuickWebView::url):
+        (QQuickWebView::canGoBack):
+        (QQuickWebView::canGoForward):
+        (QQuickWebView::loading):
+        (QQuickWebView::canReload):
+        (QQuickWebView::title):
+        (QQuickWebView::loadHtml):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        * UIProcess/qt/QtWebPageProxy.cpp:
+        (QtWebPageProxy::didReceiveMessageFromNavigatorQtObject):
+        * UIProcess/qt/QtWebPageProxy.h:
+
 2011-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Target.pri

@@ -214 +214 @@
     UIProcess/VisitedLinkProvider.h \
     UIProcess/WebApplicationCacheManagerProxy.h \
+    UIProcess/WebBackForwardList.h \
     UIProcess/WebConnectionToWebProcess.h \
     UIProcess/WebContext.h \

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

@@ -25 +25 @@
 #include "QtWebPageProxy.h"
 #include "UtilsQt.h"
+#include "WebBackForwardList.h"
 #include "WebPageGroup.h"
 #include "WebPreferences.h"
@@ -226 +227 @@
 void QQuickWebViewPrivate::_q_onVisibleChanged()
 {
-    WebPageProxy* wkPage = toImpl(pageProxy->pageRef());
-
-    wkPage->viewStateDidChange(WebPageProxy::ViewIsVisible);
+    webPageProxy()->viewStateDidChange(WebPageProxy::ViewIsVisible);
 }
 
@@ -239 +238 @@
         return;
 
-    WebPageProxy* wkPage = toImpl(pageProxy->pageRef());
     // Let the WebProcess know about the new viewport size, so that
     // it can resize the content accordingly.
-    wkPage->setViewportSize(viewportSize);
+    webPageProxy()->setViewportSize(viewportSize);
 
     interactionEngine->applyConstraints(computeViewportConstraints());
@@ -259 +257 @@
         return newConstraints;
 
-    WebPageProxy* wkPage = toImpl(pageProxy->pageRef());
-    WebPreferences* wkPrefs = wkPage->pageGroup()->preferences();
+    WebPreferences* wkPrefs = webPageProxy()->pageGroup()->preferences();
 
     // FIXME: Remove later; Hardcode some values for now to make sure the DPI adjustment is being tested.
@@ -393 +390 @@
     // Do not guard, testing for the same value, as we call this from the constructor.
 
-    toImpl(pageProxy->pageRef())->setUseFixedLayout(!enable);
+    webPageProxy()->setUseFixedLayout(!enable);
 
     useTraditionalDesktopBehaviour = enable;
@@ -409 +406 @@
 }
 
+// FIXME: Remove this once QtWebPageProxy is removed.
+WebKit::WebPageProxy* QQuickWebViewPrivate::webPageProxy() const
+{
+    return toImpl(pageProxy->pageRef());
+}
+
 /*!
     \qmlsignal WebView::onNavigationRequested(request)
@@ -580 +583 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->load(url);
+    d->webPageProxy()->loadURL(url.toString());
 }
 
@@ -586 +589 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->goBack();
+    d->webPageProxy()->goBack();
 }
 
@@ -592 +595 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->goForward();
+    d->webPageProxy()->goForward();
 }
 
@@ -598 +601 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->stop();
+    d->webPageProxy()->stopLoading();
 }
 
@@ -604 +607 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->reload();
+    const bool reloadFromOrigin = true;
+    d->webPageProxy()->reload(reloadFromOrigin);
 }
 
@@ -610 +614 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->url();
+    RefPtr<WebFrameProxy> mainFrame = d->webPageProxy()->mainFrame();
+    if (!mainFrame)
+        return QUrl();
+    return QUrl(QString(mainFrame->url()));
 }
 
@@ -622 +629 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->canGoBack();
+    return d->webPageProxy()->canGoBack();
 }
 
@@ -628 +635 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->canGoForward();
+    return d->webPageProxy()->canGoForward();
 }
 
@@ -634 +641 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->loading();
+    RefPtr<WebKit::WebFrameProxy> mainFrame = d->webPageProxy()->mainFrame();
+    return mainFrame && !(WebFrameProxy::LoadStateFinished == mainFrame->loadState());
 }
 
@@ -640 +648 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->canReload();
+    RefPtr<WebKit::WebFrameProxy> mainFrame = d->webPageProxy()->mainFrame();
+    if (mainFrame)
+        return (WebFrameProxy::LoadStateFinished == mainFrame->loadState());
+    return d->webPageProxy()->backForwardList()->currentItem();
 }
 
@@ -646 +657 @@
 {
     Q_D(const QQuickWebView);
-    return d->pageProxy->title();
+    return d->webPageProxy()->pageTitle();
 }
 
@@ -719 +730 @@
 {
     Q_D(QQuickWebView);
-    d->pageProxy->loadHTMLString(html, baseUrl);
+    d->webPageProxy()->loadHTMLString(html, baseUrl.toString());
 }
 

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

@@ -38 +38 @@
 #include <wtf/OwnPtr.h>
 
+namespace WebKit {
+class WebPageProxy;
+}
 class QtWebPageProxy;
 
@@ -88 +91 @@
     void setViewInAttachedProperties(QObject*);
 
+    WebKit::WebPageProxy* webPageProxy() const;
+
 private:
     // This class is responsible for collecting and applying all properties
@@ -133 +138 @@
     QScopedPointer<QtWebPageProxy> pageProxy;
 
+    OwnPtr<QWebNavigationHistory> navigationHistory;
+
     QDeclarativeComponent* alertDialog;
     QDeclarativeComponent* confirmDialog;

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

@@ -156 +156 @@
     QVariantMap variantMap;
     variantMap.insert(QLatin1String("data"), QString(message));
-    variantMap.insert(QLatin1String("origin"), url());
+    variantMap.insert(QLatin1String("origin"), m_qmlWebView->url());
     emit receivedMessageFromNavigatorQtObject(variantMap);
 }
 
-bool QtWebPageProxy::canGoBack() const
-{
-    return m_webPageProxy->canGoBack();
-}
-
-void QtWebPageProxy::goBack()
-{
-    m_webPageProxy->goBack();
-}
-
 void QtWebPageProxy::goBackTo(int index)
 {
@@ -175 +165 @@
 }
 
-bool QtWebPageProxy::canGoForward() const
-{
-    return m_webPageProxy->canGoForward();
-}
-
-void QtWebPageProxy::goForward()
-{
-    m_webPageProxy->goForward();
-}
-
 void QtWebPageProxy::goForwardTo(int index)
 {
     m_navigationHistory->d->goForwardTo(index);
-}
-
-bool QtWebPageProxy::loading() const
-{
-    RefPtr<WebKit::WebFrameProxy> mainFrame = m_webPageProxy->mainFrame();
-    return mainFrame && !(WebFrameProxy::LoadStateFinished == mainFrame->loadState());
-}
-
-void QtWebPageProxy::stop()
-{
-    m_webPageProxy->stopLoading();
-}
-
-bool QtWebPageProxy::canReload() const
-{
-    RefPtr<WebKit::WebFrameProxy> mainFrame = m_webPageProxy->mainFrame();
-    if (mainFrame)
-        return (WebFrameProxy::LoadStateFinished == mainFrame->loadState());
-    return m_webPageProxy->backForwardList()->currentItem();
-}
-
-void QtWebPageProxy::reload()
-{
-    m_webPageProxy->reload(/* reloadFromOrigin */ true);
 }
 
@@ -266 +222 @@
 {
     m_context->postMessageToNavigatorQtObject(m_webPageProxy.get(), message);
-}
-
-void QtWebPageProxy::loadHTMLString(const QString& html, const QUrl& baseUrl)
-{
-    WKRetainPtr<WKURLRef> wkUrl(WKURLCreateWithQUrl(baseUrl));
-    WKRetainPtr<WKStringRef> wkHtmlString(WKStringCreateWithQString(html));
-
-    WKPageLoadHTMLString(pageRef(), wkHtmlString.get(), wkUrl.get());
-}
-
-void QtWebPageProxy::load(const QUrl& url)
-{
-    WKRetainPtr<WKURLRef> wkurl = adoptWK(WKURLCreateWithQUrl(url));
-    WKPageLoadURL(pageRef(), wkurl.get());
-}
-
-QUrl QtWebPageProxy::url() const
-{
-    WKRetainPtr<WKFrameRef> frame = WKPageGetMainFrame(pageRef());
-    if (!frame)
-        return QUrl();
-    return WKURLCopyQUrl(adoptWK(WKFrameCopyURL(frame.get())).get());
-}
-
-QString QtWebPageProxy::title() const
-{
-    return WKStringCopyQString(adoptWK(WKPageCopyTitle(toAPI(m_webPageProxy.get()))).get());
 }
 

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

@@ -74 +74 @@
     void didReceiveMessageFromNavigatorQtObject(const String&);
 
-    bool canGoBack() const;
-    void goBack();
     void goBackTo(int index);
-    bool canGoForward() const;
-    void goForward();
     void goForwardTo(int index);
-    bool loading() const;
-    void stop();
-    bool canReload() const;
-    void reload();
 
     void updateNavigationState();
@@ -89 +81 @@
     WKPageRef pageRef() const;
 
-    void load(const QUrl& url);
-    void loadHTMLString(const QString& html, const QUrl& baseUrl);
-    QUrl url() const;
-
     void setDrawingAreaSize(const QSize&);
 
     QWebPreferences* preferences() const;
-
-    QString title() const;
 
     void setCustomUserAgent(const QString&);