diff -r 4917f9bf7995 -r 8bfb9186a8b8 webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp Tue Apr 27 17:46:17 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebScrollingDeceleratorGH.cpp Tue May 11 17:13:44 2010 +0300 @@ -109,6 +109,7 @@ m_decelelatorSwitch = false; if (m_decelTimer->IsActive()) { m_webView.setScrolling(false); + m_webView.resumeJsTimers(); m_decelTimer->Cancel(); } } @@ -137,11 +138,13 @@ m_numscrollsteps = 0; if (m_decelTimer->IsActive()) { m_webView.setScrolling(false); + m_webView.resumeJsTimers(); m_decelTimer->Cancel(); } WebFrameView* scrollingView = m_webView.pageScrollHandler()->currentScrollingFrameView(); if (scrollingView) { + m_webView.pauseJsTimers(); // pause the JS timers m_webView.setScrolling(true); m_startPos = scrollingView->contentPos(); m_lastPos = m_startPos; @@ -193,6 +196,8 @@ if (m_scrollbarDrawer) { m_scrollbarDrawer->fadeScrollbar(); } + + m_webView.resumeJsTimers(); // resume the js timers m_webView.setScrolling(false); m_decelTimer->Cancel(); handler->clearScrollingElement();