[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit abd53245eaa9b8e8fca5b1434e714de7cce4a2e7
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 22:14:36 2010 +0000

    Make it possible to restart a RunLoop::Timer on Windows
    
    Fixes <http://webkit.org/b/47505> RunLoop::Timer only ever fires once
    on Windows
    
    Reviewed by Anders Carlsson.
    
    * Platform/win/RunLoopWin.cpp:
    (RunLoop::TimerBase::timerFired): Remove non-repeating timers from the
    set of active timers when they fire, just like we do when stopping
    them manually.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69531 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4dbe808..a7258cd 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-11  Adam Roben  <aroben at apple.com>
+
+        Make it possible to restart a RunLoop::Timer on Windows
+
+        Fixes <http://webkit.org/b/47505> RunLoop::Timer only ever fires once
+        on Windows
+
+        Reviewed by Anders Carlsson.
+
+        * Platform/win/RunLoopWin.cpp:
+        (RunLoop::TimerBase::timerFired): Remove non-repeating timers from the
+        set of active timers when they fire, just like we do when stopping
+        them manually.
+
 2010-10-11  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/Platform/win/RunLoopWin.cpp b/WebKit2/Platform/win/RunLoopWin.cpp
index be1cae8..dba9535 100644
--- a/WebKit2/Platform/win/RunLoopWin.cpp
+++ b/WebKit2/Platform/win/RunLoopWin.cpp
@@ -123,7 +123,9 @@ void RunLoop::TimerBase::timerFired(RunLoop* runLoop, uint64_t ID)
 
     // FIMXE: Support repeating timers.
 
+    runLoop->m_activeTimers.remove(it);
     ::KillTimer(runLoop->m_runLoopMessageWindow, ID);
+
     timer->fired();
 }
 

-- 
WebKit Debian packaging