2009-04-16 Greg Bolsinga <bolsinga@apple.com>

        Reviewed by Antti Koivisto.

        Fix <rdar://problem/6766969>
        
        When deferred repaints are enabled and being reset and there is a active
        timer, stop the timer and do the deferred repaints immediately.

        * page/FrameView.cpp:
        (WebCore::FrameView::resetDeferredRepaintDelay):



git-svn-id: svn://svn.chromium.org/blink/trunk@42592 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2009-04-16  Greg Bolsinga  <bolsinga@apple.com>
+
+        Reviewed by Antti Koivisto.
+
+        Fix <rdar://problem/6766969>
+        
+        When deferred repaints are enabled and being reset and there is a active
+        timer, stop the timer and do the deferred repaints immediately.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::resetDeferredRepaintDelay):
+
 2009-04-16  Xan Lopez  <xlopez@igalia.com>
 
         Reviewed by Sam Weinig.

third_party/WebKit/WebCore/page/FrameView.cpp

@@ -840,8 +840,11 @@ void FrameView::updateDeferredRepaintDelay()
 void FrameView::resetDeferredRepaintDelay()
 {
     m_deferredRepaintDelay = 0;
-    if (m_deferredRepaintTimer.isActive())
-        m_deferredRepaintTimer.startOneShot(0);
+    if (m_deferredRepaintTimer.isActive()) {
+        m_deferredRepaintTimer.stop();
+        if (!m_deferringRepaints)
+            doDeferredRepaints();
+    }
 }
 
 double FrameView::adjustedDeferredRepaintDelay() const