Title: [90899] trunk/Source/WebKit2
- Revision
- 90899
- Author
- [email protected]
- Date
- 2011-07-13 02:50:10 -0700 (Wed, 13 Jul 2011)
Log Message
[Qt] Also stop the scale commit timer when commitScaleChange is called explicitly.
https://bugs.webkit.org/show_bug.cgi?id=64357
Reviewed by Benjamin Poulain.
* UIProcess/API/qt/qtouchwebpage.cpp:
(QTouchWebPage::timerEvent):
(QTouchWebPagePrivate::commitScaleChange):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (90898 => 90899)
--- trunk/Source/WebKit2/ChangeLog 2011-07-13 09:40:51 UTC (rev 90898)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-13 09:50:10 UTC (rev 90899)
@@ -1,3 +1,14 @@
+2011-07-12 Jocelyn Turcotte <[email protected]>
+
+ [Qt] Also stop the scale commit timer when commitScaleChange is called explicitly.
+ https://bugs.webkit.org/show_bug.cgi?id=64357
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/API/qt/qtouchwebpage.cpp:
+ (QTouchWebPage::timerEvent):
+ (QTouchWebPagePrivate::commitScaleChange):
+
2011-07-12 Joseph Pecoraro <[email protected]>
ApplicationCache update should not immediately fail when reaching per-origin quota
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp (90898 => 90899)
--- trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-13 09:40:51 UTC (rev 90898)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qtouchwebpage.cpp 2011-07-13 09:50:10 UTC (rev 90899)
@@ -89,10 +89,8 @@
void QTouchWebPage::timerEvent(QTimerEvent* ev)
{
- if (ev->timerId() == d->m_scaleCommitTimer.timerId()) {
+ if (ev->timerId() == d->m_scaleCommitTimer.timerId())
d->commitScaleChange();
- d->m_scaleCommitTimer.stop();
- }
}
void QTouchWebPage::resizeEvent(QGraphicsSceneResizeEvent* ev)
@@ -124,6 +122,7 @@
{
ASSERT(m_isChangingScale);
m_isChangingScale = false;
+ m_scaleCommitTimer.stop();
page->setContentsScale(q->scale());
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
