[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8599630d3a5b03f9825f0c07d5852aa177efd974
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 27 18:45:26 2009 +0000

    Make sure that initiating a rotation while rotating won't make
    it end up at rotation positions that are not a multiply of
    180 degrees.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-27
    Reviewed by Tor Arne Vestbø.
    
    * QGVLauncher/main.cpp:
    (MainView::animatedFlip):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c5c8352..656363e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,16 @@
 2009-10-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
 
+        Reviewed by Tor Arne Vestbø.
+
+        Make sure that initiating a rotation while rotating won't make
+        it end up at rotation positions that are not a multiply of
+        180 degrees.
+
+        * QGVLauncher/main.cpp:
+        (MainView::animatedFlip):
+
+2009-10-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
         Unreviewed Qt build fix.
 
         Update the tests as well to the new API change.
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index fe33a73..3632a33 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -164,8 +164,12 @@ public slots:
 
         QPropertyAnimation* animation = new QPropertyAnimation(m_mainWidget, "rotation", this);
         animation->setDuration(1000);
-        animation->setStartValue(m_mainWidget->rotation());
-        animation->setEndValue(m_mainWidget->rotation() + 180);
+
+        int rotation = int(m_mainWidget->rotation());
+
+        animation->setStartValue(rotation);
+        animation->setEndValue(rotation + 180 - (rotation % 180));
+
         animation->start(QAbstractAnimation::DeleteWhenStopped);
 #endif
     }

-- 
WebKit Debian packaging