Changeset 116505 in webkit


Ignore:
Timestamp:
May 9, 2012 1:42:14 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt][WK2] Remove delayed loadDidSucceed() signaling and m_deferedUrlToLoad from QQuickWebViewPrivate
https://bugs.webkit.org/show_bug.cgi?id=85906

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-05-09
Reviewed by Kenneth Rohde Christiansen.

Deferred loading activies were introduced to work around the delayed Flickable construction
at onComponentComplete(). QQuickWebView inherits from QQuickFlickable now,
so no need for the workaround anymore.

  • UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
(QQuickWebViewFlickablePrivate::onComponentComplete):
(QQuickWebView::setUrl):
(QQuickWebView::componentComplete):

  • UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate::onComponentComplete):
(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r116492 r116505  
     12012-05-09  Zalan Bujtas  <zbujtas@gmail.com>
     2
     3        [Qt][WK2] Remove delayed loadDidSucceed() signaling and m_deferedUrlToLoad from QQuickWebViewPrivate
     4        https://bugs.webkit.org/show_bug.cgi?id=85906
     5
     6        Reviewed by Kenneth Rohde Christiansen.
     7
     8        Deferred loading activies were introduced to work around the delayed Flickable construction
     9        at onComponentComplete(). QQuickWebView inherits from QQuickFlickable now,
     10        so no need for the workaround anymore.
     11
     12        * UIProcess/API/qt/qquickwebview.cpp:
     13        (QQuickWebViewFlickablePrivate::QQuickWebViewFlickablePrivate):
     14        (QQuickWebViewFlickablePrivate::onComponentComplete):
     15        (QQuickWebView::setUrl):
     16        (QQuickWebView::componentComplete):
     17        * UIProcess/API/qt/qquickwebview_p_p.h:
     18        (QQuickWebViewPrivate::onComponentComplete):
     19        (QQuickWebViewPrivate):
     20        (QQuickWebViewFlickablePrivate):
     21
    1222012-05-08  Jon Lee  <jonlee@apple.com>
    223
  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

    r116420 r116505  
    342342}
    343343
    344 void QQuickWebViewPrivate::onComponentComplete()
    345 {
    346     if (m_deferedUrlToLoad.isEmpty())
    347         return;
    348 
    349     q_ptr->setUrl(m_deferedUrlToLoad);
    350 }
    351 
    352344void QQuickWebViewPrivate::setNeedsDisplay()
    353345{
     
    730722    : QQuickWebViewPrivate(viewport)
    731723    , pageIsSuspended(true)
    732     , loadSuccessDispatchIsPending(false)
    733724{
    734725    // Disable mouse events on the flickable web view so we do not
     
    793784    _q_resume();
    794785
    795     if (loadSuccessDispatchIsPending) {
    796         QQuickWebViewPrivate::loadDidSucceed();
    797         loadSuccessDispatchIsPending = false;
    798     }
    799 
    800786    // Trigger setting of correct visibility flags after everything was allocated and initialized.
    801787    _q_onVisibleChanged();
    802 
    803     QQuickWebViewPrivate::onComponentComplete();
    804 }
    805 
    806 void QQuickWebViewFlickablePrivate::loadDidSucceed()
    807 {
    808     if (interactionEngine)
    809         QQuickWebViewPrivate::loadDidSucceed();
    810     else
    811         loadSuccessDispatchIsPending = true;
    812788}
    813789
     
    14571433    if (url.isEmpty())
    14581434        return;
    1459 
    1460     if (!isComponentComplete()) {
    1461         d->m_deferedUrlToLoad = url;
    1462         return;
    1463     }
    14641435
    14651436    d->webPageProxy->loadURL(url.toString());
  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

    r115862 r116505  
    6868    virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
    6969
     70    virtual void onComponentComplete() { }
     71
    7072    virtual void enableMouseEvents() { }
    7173    virtual void disableMouseEvents() { }
     
    7577
    7678    virtual void loadDidSucceed();
    77     virtual void onComponentComplete();
    7879    virtual void loadDidCommit() { }
    7980    virtual void didFinishFirstNonEmptyLayout() { }
     
    193194    bool m_dialogActive;
    194195    QUrl m_iconURL;
    195     QUrl m_deferedUrlToLoad;
    196196};
    197197
     
    217217    virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
    218218
     219    virtual void onComponentComplete();
     220
    219221    virtual QPointF pageItemPos();
    220222    virtual void updateContentsSize(const QSizeF&);
    221223
    222     virtual void loadDidSucceed();
    223     virtual void onComponentComplete();
    224224    virtual void loadDidCommit();
    225225    virtual void didFinishFirstNonEmptyLayout();
     
    238238    QScopedPointer<WebKit::QtViewportInteractionEngine> interactionEngine;
    239239    bool pageIsSuspended;
    240     bool loadSuccessDispatchIsPending;
    241240};
    242241
Note: See TracChangeset for help on using the changeset viewer.