<rdar://problem/5643785> Fix iBench regression caused by mis-placed nested...
authorsfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 22:14:48 +0000 (22:14 +0000)
committersfalken@apple.com <sfalken@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 12 Dec 2007 22:14:48 +0000 (22:14 +0000)
        Reviewed by Anders.

        * platform/win/SharedTimerWin.cpp:
        (WebCore::TimerWindowWndProc): Don't set high-resolution timer flag inside non-high-resolution timer proc.

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

WebCore/ChangeLog
WebCore/platform/win/SharedTimerWin.cpp

index b93eff87fdabc66a82ea423d760454db8d1dd5fb..17908035bfd363ad2844bae905e4ec704d4ba3f6 100644 (file)
@@ -1,3 +1,12 @@
+2007-12-12  Steve Falkenburg  <sfalken@apple.com>
+
+        <rdar://problem/5643785> Fix iBench regression caused by mis-placed nested timer check.
+        
+        Reviewed by Anders.
+
+        * platform/win/SharedTimerWin.cpp:
+        (WebCore::TimerWindowWndProc): Don't set high-resolution timer flag inside non-high-resolution timer proc.
+
 2007-12-12  Beth Dakin  <bdakin@apple.com>
 
         Reviewed by Oliver.
index b472764826cbc74b7472f98ecbcd6b8658fb036b..1ebc2558612612d55cacf4c4ea2b93ea14ecc73b 100644 (file)
@@ -45,11 +45,13 @@ const int sharedTimerID = 1000;
 
 LRESULT CALLBACK TimerWindowWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-    if (message == timerFiredMessage || (message == WM_TIMER && wParam == sharedTimerID)) {
+    if (message == timerFiredMessage) {
         processingCustomTimerMessage = true;
         sharedTimerFiredFunction();
         processingCustomTimerMessage = false;
-    } else
+    } else if (message == WM_TIMER && wParam == sharedTimerID)
+        sharedTimerFiredFunction();
+    else
         return DefWindowProc(hWnd, message, wParam, lParam);
     return 0;
 }