[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit f37f9fddd5dec40e3b46444822598193200ba6f5
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 27 08:32:01 2009 +0000

    2009-12-27  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Adam Barth.
    
            WinCE buildfix (HWND_MESSAGE isn't supported there)
    
            * wtf/win/MainThreadWin.cpp:
            (WTF::initializeMainThreadPlatform):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52571 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index af365cd..b91e20e 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Adam Barth.
 
+        WinCE buildfix (HWND_MESSAGE isn't supported there)
+
+        * wtf/win/MainThreadWin.cpp:
+        (WTF::initializeMainThreadPlatform):
+
+2009-12-27  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Adam Barth.
+
         Added a file with WinMain function to link agains in WinCE.
 
         * os-win32/WinMain.cpp: Added.
diff --git a/JavaScriptCore/wtf/win/MainThreadWin.cpp b/JavaScriptCore/wtf/win/MainThreadWin.cpp
index c6dcb7d..d583c12 100644
--- a/JavaScriptCore/wtf/win/MainThreadWin.cpp
+++ b/JavaScriptCore/wtf/win/MainThreadWin.cpp
@@ -56,6 +56,7 @@ void initializeMainThreadPlatform()
     if (threadingWindowHandle)
         return;
 
+    HWND hWndParent = 0;
 #if PLATFORM(WINCE)
     WNDCLASS wcex;
     memset(&wcex, 0, sizeof(WNDCLASS));
@@ -70,10 +71,11 @@ void initializeMainThreadPlatform()
     RegisterClass(&wcex);
 #else
     RegisterClassEx(&wcex);
+    hWndParent = HWND_MESSAGE;
 #endif
 
     threadingWindowHandle = CreateWindow(kThreadingWindowClassName, 0, 0,
-       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, HWND_MESSAGE, 0, 0, 0);
+       CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, hWndParent, 0, 0, 0);
     threadingFiredMessage = RegisterWindowMessage(L"com.apple.WebKit.MainThreadFired");
 }
 

-- 
WebKit Debian packaging