[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 34b6519f8a5eafe0ac64446caf71d0db535e3f33
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 29 15:34:08 2010 +0000

    Look for WebKit.dll (not WebKit_debug.dll) when launching the web process in Debug builds
    
    Fixes <http://webkit.org/b/46809> <rdar://problem/8491809> REGRESSION
    (r67979): All tests crashing on Windows WebKit2 test bot
    
    Reviewed by Sam Weinig.
    
    * UIProcess/Launcher/win/ProcessLauncherWin.cpp: WebKit_debug.dll is
    only used in Debug_All builds (but WebKit2WebProcess_debug.exe is used
    in all non-Debug_Internal debug-style builds).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 76904a7..443d67a 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-29  Adam Roben  <aroben at apple.com>
+
+        Look for WebKit.dll (not WebKit_debug.dll) when launching the web
+        process in Debug builds
+
+        Fixes <http://webkit.org/b/46809> <rdar://problem/8491809> REGRESSION
+        (r67979): All tests crashing on Windows WebKit2 test bot
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/Launcher/win/ProcessLauncherWin.cpp: WebKit_debug.dll is
+        only used in Debug_All builds (but WebKit2WebProcess_debug.exe is used
+        in all non-Debug_Internal debug-style builds).
+
 2010-09-28  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
index 784aefc..a1c9aaf 100644
--- a/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
+++ b/WebKit2/UIProcess/Launcher/win/ProcessLauncherWin.cpp
@@ -32,9 +32,13 @@
 
 #if !defined(NDEBUG) && (!defined(DEBUG_INTERNAL) || defined(DEBUG_ALL))
 const LPCWSTR webProcessName = L"WebKit2WebProcess_debug.exe";
-const LPCWSTR webKitDLLName = L"WebKit_debug.dll";
 #else
 const LPCWSTR webProcessName = L"WebKit2WebProcess.exe";
+#endif
+
+#ifdef DEBUG_ALL
+const LPCWSTR webKitDLLName = L"WebKit_debug.dll";
+#else
 const LPCWSTR webKitDLLName = L"WebKit.dll";
 #endif
 

-- 
WebKit Debian packaging