Changeset 150068 in webkit

Timestamp:

May 14, 2013, 5:54:06 AM (12 years ago)

Author:

jocelyn.turcotte@digia.com

Message:

[WK2][Win] Fix ASSERT(DeleteTimerQueueTimer...)
​https://bugs.webkit.org/show_bug.cgi?id=116039

Reviewed by Benjamin Poulain.

According to the documentation, DeleteTimerQueueTimer can be expected to return
false with an ERROR_IO_PENDING error when called from the timer's callback.

• Platform/win/WorkQueueWin.cpp:

(WorkQueue::timerCallback):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Platform/win/WorkQueueWin.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-05-14  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [WK2][Win] Fix ASSERT(DeleteTimerQueueTimer...)
+        https://bugs.webkit.org/show_bug.cgi?id=116039
+
+        Reviewed by Benjamin Poulain.
+
+        According to the documentation, DeleteTimerQueueTimer can be expected to return
+        false with an ERROR_IO_PENDING error when called from the timer's callback.
+
+        * Platform/win/WorkQueueWin.cpp:
+        (WorkQueue::timerCallback):
+
 2013-05-14  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebKit2/Platform/win/WorkQueueWin.cpp

@@ -228 +228 @@
     ASSERT(timerContext->timer);
     ASSERT(timerContext->queue->m_timerQueue);
-    if (!::DeleteTimerQueueTimer(timerContext->queue->m_timerQueue, timerContext->timer, 0))
-        ASSERT_WITH_MESSAGE(false, "::DeleteTimerQueueTimer failed with error %lu", ::GetLastError());
+    if (!::DeleteTimerQueueTimer(timerContext->queue->m_timerQueue, timerContext->timer, 0)) {
+        // Getting ERROR_IO_PENDING here means that the timer will be destroyed once the callback is done executing.
+        ASSERT_WITH_MESSAGE(::GetLastError() == ERROR_IO_PENDING, "::DeleteTimerQueueTimer failed with error %lu", ::GetLastError());
+    }
 }