[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[sfalken at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 27613d0b7f858542fa1a84f849d5a00ec818a2e7
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 17:55:40 2010 +0000

    Mac build fix.
    
    * WebProcess/WebKitMain.cpp:
    (enableDataExecutionPrevention):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73148 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ca3880a..ab344d7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-02  Steve Falkenburg  <sfalken at apple.com>
+
+        Mac build fix.
+
+        * WebProcess/WebKitMain.cpp:
+        (enableDataExecutionPrevention):
+
 2010-11-30 Amruth Raj  <amruthraj at motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla at motorola.com>
 
         Reviewed by Martin Robinson.
diff --git a/WebKit2/WebProcess/WebKitMain.cpp b/WebKit2/WebProcess/WebKitMain.cpp
index c3824ba..53084a6 100644
--- a/WebKit2/WebProcess/WebKitMain.cpp
+++ b/WebKit2/WebProcess/WebKitMain.cpp
@@ -36,27 +36,6 @@
 
 using namespace WebKit;
 
-static void enableDataExecutionPrevention()
-{
-    // Enable Data Execution prevention at runtime rather than via /NXCOMPAT
-    // http://blogs.msdn.com/michael_howard/archive/2008/01/29/new-nx-apis-added-to-windows-vista-sp1-windows-xp-sp3-and-windows-server-2008.aspx
-
-    const DWORD enableDEP = 0x00000001;
-
-    HMODULE hMod = ::GetModuleHandleW(L"Kernel32.dll");
-    if (!hMod)
-        return;
-
-    typedef BOOL (WINAPI *PSETDEP)(DWORD);
-
-    PSETDEP procSet = reinterpret_cast<PSETDEP>(::GetProcAddress(hMod, "SetProcessDEPPolicy"));
-    if (!procSet)
-        return;
-
-    // Enable Data Execution Prevention, but allow ATL thunks (for compatibility with the version of ATL that ships with the Platform SDK).
-    procSet(enableDEP);
-}
-
 static int WebKitMain(const CommandLine& commandLine)
 {
     ProcessLauncher::ProcessType processType;    
@@ -100,6 +79,27 @@ int WebKitMain(int argc, char** argv)
 #define PROCESS_NAME L"WebKit2WebProcess_debug.exe"
 #endif
 
+static void enableDataExecutionPrevention()
+{
+    // Enable Data Execution prevention at runtime rather than via /NXCOMPAT
+    // http://blogs.msdn.com/michael_howard/archive/2008/01/29/new-nx-apis-added-to-windows-vista-sp1-windows-xp-sp3-and-windows-server-2008.aspx
+
+    const DWORD enableDEP = 0x00000001;
+
+    HMODULE hMod = ::GetModuleHandleW(L"Kernel32.dll");
+    if (!hMod)
+        return;
+
+    typedef BOOL (WINAPI *PSETDEP)(DWORD);
+
+    PSETDEP procSet = reinterpret_cast<PSETDEP>(::GetProcAddress(hMod, "SetProcessDEPPolicy"));
+    if (!procSet)
+        return;
+
+    // Enable Data Execution Prevention, but allow ATL thunks (for compatibility with the version of ATL that ships with the Platform SDK).
+    procSet(enableDEP);
+}
+
 static void enableTerminationOnHeapCorruption()
 {
     // Enable termination on heap corruption on OSes that support it (Vista and XPSP3).

-- 
WebKit Debian packaging