Changeset 141248 in webkit

Timestamp:

Jan 30, 2013 3:58:08 AM (11 years ago)

Author:

Patrick Gansterer

Message:

Port SharedTimerWin.cpp to WinCE
​https://bugs.webkit.org/show_bug.cgi?id=103724

Reviewed by Brent Fulgham.

Add #if !OS(WINCE) around some parts of the code, so it can be used by the WinCE port too.

• PlatformWinCE.cmake:
• platform/win/SharedTimerWin.cpp:

(WebCore):
(WebCore::TimerWindowWndProc):
(WebCore::initializeOffScreenTimerWindow):
(WebCore::setSharedTimerFireInterval):
(WebCore::stopSharedTimer):

• platform/wince/SharedTimerWinCE.cpp: Removed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PlatformWinCE.cmake (modified) (2 diffs)
• platform/win/SharedTimerWin.cpp (modified) (9 diffs)
• platform/wince/SharedTimerWinCE.cpp (deleted)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Patrick Gansterer  <paroga@webkit.org>
+
+        Port SharedTimerWin.cpp to WinCE
+        https://bugs.webkit.org/show_bug.cgi?id=103724
+
+        Reviewed by Brent Fulgham.
+
+        Add #if !OS(WINCE) around some parts of the code, so it can be used by the WinCE port too.
+
+        * PlatformWinCE.cmake:
+        * platform/win/SharedTimerWin.cpp:
+        (WebCore):
+        (WebCore::TimerWindowWndProc):
+        (WebCore::initializeOffScreenTimerWindow):
+        (WebCore::setSharedTimerFireInterval):
+        (WebCore::stopSharedTimer):
+        * platform/wince/SharedTimerWinCE.cpp: Removed.
+
 2013-01-30  Andrey Lushnikov  <lushnikov@chromium.org>
 

trunk/Source/WebCore/PlatformWinCE.cmake

@@ -54 +54 @@
     platform/win/SearchPopupMenuWin.cpp
     platform/win/SharedBufferWin.cpp
+    platform/win/SharedTimerWin.cpp
     platform/win/SoundWin.cpp
     platform/win/SystemInfo.cpp
@@ -65 +66 @@
     platform/wince/FileSystemWince.cpp
     platform/wince/KURLWince.cpp
-    platform/wince/SharedTimerWince.cpp
 
     platform/network/win/CredentialStorageWin.cpp

trunk/Source/WebCore/platform/win/SharedTimerWin.cpp

@@ -41 +41 @@
 #endif
 
-#include <windows.h>
+#include "WindowsExtras.h"
 #include <mmsystem.h>
 
@@ -67 +67 @@
 static void (*sharedTimerFiredFunction)();
 
+static HANDLE timer;
 static HWND timerWindowHandle = 0;
+const LPCWSTR kTimerWindowClassName = L"TimerWindowClass";
+
+#if !OS(WINCE)
 static UINT timerFiredMessage = 0;
 static HANDLE timerQueue;
-static HANDLE timer;
 static bool highResTimerActive;
 static bool processingCustomTimerMessage = false;
 static LONG pendingTimers;
 
-const LPCWSTR kTimerWindowClassName = L"TimerWindowClass";
 const int timerResolution = 1; // To improve timer resolution, we call timeBeginPeriod/timeEndPeriod with this value to increase timer resolution to 1ms.
 const int highResolutionThresholdMsec = 16; // Only activate high-res timer for sub-16ms timers (Windows can fire timers at 16ms intervals without changing the system resolution).
 const int stopHighResTimerInMsec = 300; // Stop high-res timer after 0.3 seconds to lessen power consumption (we don't use a smaller time since oscillating between high and low resolution breaks timer accuracy on XP).
+#endif
 
 enum {
@@ -98 +101 @@
 #endif
 
-    if (message == timerFiredMessage) {
+    if (message == WM_TIMER) {
+        if (wParam == sharedTimerID) {
+            KillTimer(timerWindowHandle, sharedTimerID);
+            sharedTimerFiredFunction();
+        }
+#if !OS(WINCE)
+        else if (wParam == endHighResTimerID) {
+            KillTimer(timerWindowHandle, endHighResTimerID);
+            highResTimerActive = false;
+            timeEndPeriod(timerResolution);
+        }
+    } else if (message == timerFiredMessage) {
         InterlockedExchange(&pendingTimers, 0);
         processingCustomTimerMessage = true;
         sharedTimerFiredFunction();
         processingCustomTimerMessage = false;
-    } else if (message == WM_TIMER) {
-        if (wParam == sharedTimerID) {
-            KillTimer(timerWindowHandle, sharedTimerID);
-            sharedTimerFiredFunction();
-        } else if (wParam == endHighResTimerID) {
-            KillTimer(timerWindowHandle, endHighResTimerID);
-            highResTimerActive = false;
-            timeEndPeriod(timerResolution);
-        }
+#endif
     } else
         return DefWindowProc(hWnd, message, wParam, lParam);
@@ -122 +128 @@
     if (timerWindowHandle)
         return;
-    
+
+#if OS(WINCE)
+    WNDCLASS wcex;
+    memset(&wcex, 0, sizeof(WNDCLASS));
+#else
     WNDCLASSEX wcex;
     memset(&wcex, 0, sizeof(WNDCLASSEX));
     wcex.cbSize = sizeof(WNDCLASSEX);
+#endif
+
     wcex.lpfnWndProc    = TimerWindowWndProc;
     wcex.hInstance      = WebCore::instanceHandle();
     wcex.lpszClassName  = kTimerWindowClassName;
+#if OS(WINCE)
+    RegisterClass(&wcex);
+#else
     RegisterClassEx(&wcex);
+#endif
 
     timerWindowHandle = CreateWindow(kTimerWindowClassName, 0, 0,
        CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, WebCore::instanceHandle(), 0);
+
+#if !OS(WINCE)
     timerFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.TimerFired");
+#endif
 }
 
@@ -141 +160 @@
 }
 
+#if !OS(WINCE)
 static void NTAPI queueTimerProc(PVOID, BOOLEAN)
 {
@@ -146 +166 @@
         PostMessage(timerWindowHandle, timerFiredMessage, 0, 0);
 }
+#endif
 
 void setSharedTimerFireInterval(double interval)
@@ -161 +182 @@
     bool timerSet = false;
 
+#if !OS(WINCE)
     if (Settings::shouldUseHighResolutionTimers()) {
         if (interval < highResolutionThresholdMsec) {
@@ -192 +214 @@
         }
     }
+#endif // !OS(WINCE)
 
     if (timerSet) {
@@ -206 +229 @@
 void stopSharedTimer()
 {
+#if !OS(WINCE)
     if (timerQueue && timer) {
         DeleteTimerQueueTimer(timerQueue, timer, 0);
         timer = 0;
     }
+#endif
 
     if (timerID) {