Changeset 91181 in webkit


Ignore:
Timestamp:
Jul 18, 2011 6:43:30 AM (13 years ago)
Author:
jocelyn.turcotte@nokia.com
Message:

[Qt] Remove the scale commit timer from QTouchWebPage.
​https://bugs.webkit.org/show_bug.cgi?id=64600

Reviewed by Benjamin Poulain.

Since we don't currently need unprepared page view scale changes,
this timer isn't useful.

  • UIProcess/API/qt/qtouchwebpage.cpp:

(QTouchWebPage::QTouchWebPage):
(QTouchWebPagePrivate::QTouchWebPagePrivate):
(QTouchWebPagePrivate::commitScaleChange):

  • UIProcess/API/qt/qtouchwebpage.h:
  • UIProcess/API/qt/qtouchwebpage_p.h:
  • UIProcess/qt/TouchViewInterface.cpp:

(WebKit::TouchViewInterface::pinchGestureStarted):

Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r91180 r91181  
     12011-07-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        [Qt] Remove the scale commit timer from QTouchWebPage.
     4        https://bugs.webkit.org/show_bug.cgi?id=64600
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        Since we don't currently need unprepared page view scale changes,
     9        this timer isn't useful.
     10
     11        * UIProcess/API/qt/qtouchwebpage.cpp:
     12        (QTouchWebPage::QTouchWebPage):
     13        (QTouchWebPagePrivate::QTouchWebPagePrivate):
     14        (QTouchWebPagePrivate::commitScaleChange):
     15        * UIProcess/API/qt/qtouchwebpage.h:
     16        * UIProcess/API/qt/qtouchwebpage_p.h:
     17        * UIProcess/qt/TouchViewInterface.cpp:
     18        (WebKit::TouchViewInterface::pinchGestureStarted):
     19
    1202011-07-15  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    221

  • trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp

    r91180 r91181  
    3939    setFocusPolicy(Qt::TabFocus);
    4040    setAcceptTouchEvents(true);
    41 
    42     connect(this, SIGNAL(scaleChanged()), this, SLOT(onScaleChanged()));
    4341}
    4442
    … …  
    8886}
    8987
    90 void QTouchWebPage::timerEvent(QTimerEvent* ev)
    91 {
    92     if (ev->timerId() == d->m_scaleCommitTimer.timerId())
    93         d->commitScaleChange();
    94 }
    95 
    9688void QTouchWebPage::resizeEvent(QGraphicsSceneResizeEvent* ev)
    9789{
    … …  
    108100    : q(view)
    109101    , page(0)
    110     , m_isChangingScale(false)
    111102{
    112 }
    113 
    114 void QTouchWebPagePrivate::prepareScaleChange()
    115 {
    116     ASSERT(!m_isChangingScale);
    117     m_isChangingScale = true;
    118     m_scaleCommitTimer.stop();
    119103}
    120104
    121105void QTouchWebPagePrivate::commitScaleChange()
    122106{
    123     ASSERT(m_isChangingScale);
    124     m_isChangingScale = false;
    125     m_scaleCommitTimer.stop();
    126107    page->setContentsScale(q->scale());
    127 }
    128 
    129 void QTouchWebPagePrivate::onScaleChanged()
    130 {
    131     if (!m_isChangingScale)
    132         m_scaleCommitTimer.start(0.1, q);
    133108}
    134109

  • trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h

    r90820 r91181  
    6565
    6666protected:
    67     virtual void timerEvent(QTimerEvent*);
    6867    virtual void resizeEvent(QGraphicsSceneResizeEvent*);
    6968
    7069private:
    71     Q_PRIVATE_SLOT(d, void onScaleChanged())
    72 
    7370    QTouchWebPagePrivate* d;
    7471    friend class QTouchWebPagePrivate;

  • trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h

    r90750 r91181  
    2323
    2424#include <QMenu>
    25 #include <QBasicTimer>
    2625#include "qtouchwebpage.h"
    2726
    … …  
    4039
    4140    void setViewportRect(const QRectF&);
    42 
    43     void prepareScaleChange();
    4441    void commitScaleChange();
    45     void onScaleChanged();
    4642
    4743    QTouchWebPage* const q;
    4844    QTouchWebPageProxy* page;
    49     QBasicTimer m_scaleCommitTimer;
    50     bool m_isChangingScale;
    5145};
    5246

  • trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp

    r90838 r91181  
    6363{
    6464    // FIXME: suspend the engine.
    65     m_pageView->d->prepareScaleChange();
    6665    m_pinchStartScale = m_pageView->scale();
    6766}
Note: See TracChangeset for help on using the changeset viewer.