[webkit-changes] [91181] trunk/Source/WebKit2

Mon, 18 Jul 2011 06:43:34 -0700

Title: [91181] trunk/Source/WebKit2
Revision
91181
Author
[email protected]
Date
2011-07-18 06:43:30 -0700 (Mon, 18 Jul 2011)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (91180 => 91181)


--- trunk/Source/WebKit2/ChangeLog	2011-07-18 13:43:12 UTC (rev 91180)
+++ trunk/Source/WebKit2/ChangeLog	2011-07-18 13:43:30 UTC (rev 91181)
@@ -1,5 +1,24 @@
 2011-07-15  Jocelyn Turcotte  <[email protected]>
 
+        [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):
+
+2011-07-15  Jocelyn Turcotte  <[email protected]>
+
         TiledDrawingArea: map the visibleArea rect from page to tiles coordinates.
         https://bugs.webkit.org/show_bug.cgi?id=64538

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp (91180 => 91181)


--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp	2011-07-18 13:43:12 UTC (rev 91180)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp	2011-07-18 13:43:30 UTC (rev 91181)
@@ -38,8 +38,6 @@
 {
     setFocusPolicy(Qt::TabFocus);
     setAcceptTouchEvents(true);
-
-    connect(this, SIGNAL(scaleChanged()), this, SLOT(onScaleChanged()));
 }
 
 QTouchWebPage::~QTouchWebPage()
@@ -87,12 +85,6 @@
     return QGraphicsWidget::event(ev);
 }
 
-void QTouchWebPage::timerEvent(QTimerEvent* ev)
-{
-    if (ev->timerId() == d->m_scaleCommitTimer.timerId())
-        d->commitScaleChange();
-}
-
 void QTouchWebPage::resizeEvent(QGraphicsSceneResizeEvent* ev)
 {
     d->page->setDrawingAreaSize(ev->newSize().toSize());
@@ -107,31 +99,14 @@
 QTouchWebPagePrivate::QTouchWebPagePrivate(QTouchWebPage* view)
     : q(view)
     , page(0)
-    , m_isChangingScale(false)
 {
 }
 
-void QTouchWebPagePrivate::prepareScaleChange()
-{
-    ASSERT(!m_isChangingScale);
-    m_isChangingScale = true;
-    m_scaleCommitTimer.stop();
-}
-
 void QTouchWebPagePrivate::commitScaleChange()
 {
-    ASSERT(m_isChangingScale);
-    m_isChangingScale = false;
-    m_scaleCommitTimer.stop();
     page->setContentsScale(q->scale());
 }
 
-void QTouchWebPagePrivate::onScaleChanged()
-{
-    if (!m_isChangingScale)
-        m_scaleCommitTimer.start(0.1, q);
-}
-
 void QTouchWebPagePrivate::setPage(QTouchWebPageProxy* page)
 {
     ASSERT(!this->page);

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h (91180 => 91181)


--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h	2011-07-18 13:43:12 UTC (rev 91180)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.h	2011-07-18 13:43:30 UTC (rev 91181)
@@ -64,12 +64,9 @@
     void loadProgress(int progress);
 
 protected:
-    virtual void timerEvent(QTimerEvent*);
     virtual void resizeEvent(QGraphicsSceneResizeEvent*);
 
 private:
-    Q_PRIVATE_SLOT(d, void onScaleChanged())
-
     QTouchWebPagePrivate* d;
     friend class QTouchWebPagePrivate;
     friend class WebKit::TouchViewInterface;

Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h (91180 => 91181)


--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h	2011-07-18 13:43:12 UTC (rev 91180)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage_p.h	2011-07-18 13:43:30 UTC (rev 91181)
@@ -22,7 +22,6 @@
 #define qtouchwebpage_p_h
 
 #include <QMenu>
-#include <QBasicTimer>
 #include "qtouchwebpage.h"
 
 class QRectF;
@@ -39,15 +38,10 @@
     void setPage(QTouchWebPageProxy*);
 
     void setViewportRect(const QRectF&);
-
-    void prepareScaleChange();
     void commitScaleChange();
-    void onScaleChanged();
 
     QTouchWebPage* const q;
     QTouchWebPageProxy* page;
-    QBasicTimer m_scaleCommitTimer;
-    bool m_isChangingScale;
 };
 
 #endif /* qtouchwebpage_p_h */

Modified: trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp (91180 => 91181)


--- trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp	2011-07-18 13:43:12 UTC (rev 91180)
+++ trunk/Source/WebKit2/UIProcess/qt/TouchViewInterface.cpp	2011-07-18 13:43:30 UTC (rev 91181)
@@ -62,7 +62,6 @@
 void TouchViewInterface::pinchGestureStarted()
 {
     // FIXME: suspend the engine.
-    m_pageView->d->prepareScaleChange();
     m_pinchStartScale = m_pageView->scale();
 }
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to