Apply leo's fix to marquees.
authorhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Aug 2004 17:44:03 +0000 (17:44 +0000)
committerhyatt <hyatt@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Aug 2004 17:44:03 +0000 (17:44 +0000)
        Reviewed by hyatt

        * khtml/rendering/render_layer.cpp:
        (Marquee::start):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7322 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/rendering/render_layer.cpp

index 419ccf2af8f6fb9ba83b6808dcf9acffdd6870e9..7684b30a9cbb87fe0b22fc599751ecfe379f23c7 100644 (file)
@@ -1,3 +1,12 @@
+2004-08-23  David Hyatt  <hyatt@apple.com>
+
+       Apply leo's fix to marquees.
+       
+        Reviewed by hyatt
+
+        * khtml/rendering/render_layer.cpp:
+        (Marquee::start):
+
 2004-08-20  Darin Adler  <darin@apple.com>
 
         Reviewed by Maciej.
index d377416fb2ad52a02fd01726273e21c576c49a8e..687129039fea3e459ef810d1e5fda5e8c23e60e0 100644 (file)
@@ -1387,9 +1387,7 @@ void Marquee::start()
     if (m_timerId || m_layer->renderer()->style()->marqueeIncrement().value == 0)
         return;
     
-    m_stopped = false;
-
-    if (!m_suspended) {
+    if (!m_suspended && !m_stopped) {
         if (isUnfurlMarquee()) {
             bool forward = direction() == MDOWN || direction() == MRIGHT;
             bool isReversed = (forward && m_currentLoop % 2) || (!forward && !(m_currentLoop % 2));
@@ -1403,8 +1401,10 @@ void Marquee::start()
                 m_layer->scrollToOffset(0, m_start, false, false);
         }
     }
-    else
+    else {
         m_suspended = false;
+       m_stopped = false;
+    }
 
     m_timerId = startTimer(speed());
 }