[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 6b6c386c3c9bf7fab390218dbf128167483768fd
Author: sfalken at apple.com <sfalken at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 2 17:24:52 2010 +0000

    2010-12-02  Steve Falkenburg  <sfalken at apple.com>
    
            Reviewed by Adam Roben.
    
            Move enableExecutionPrevention to WebKitMain
            https://bugs.webkit.org/show_bug.cgi?id=50392
    
            * WebProcess/WebKitMain.cpp:
            (enableDataExecutionPrevention):
            (WebKitMain):
            * WebProcess/win/WebProcessMainWin.cpp:
            (WebKit::WebProcessMain):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8e52754..c9478d7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Adam Roben.
 
+        Move enableExecutionPrevention to WebKitMain
+        https://bugs.webkit.org/show_bug.cgi?id=50392
+
+        * WebProcess/WebKitMain.cpp:
+        (enableDataExecutionPrevention):
+        (WebKitMain):
+        * WebProcess/win/WebProcessMainWin.cpp:
+        (WebKit::WebProcessMain):
+
+2010-12-02  Steve Falkenburg  <sfalken at apple.com>
+
+        Reviewed by Adam Roben.
+
         Enable DEP at runtime to allow for compatibility with older versions of ATL
         https://bugs.webkit.org/show_bug.cgi?id=50378
 
diff --git a/WebKit2/WebProcess/WebKitMain.cpp b/WebKit2/WebProcess/WebKitMain.cpp
index 6938d4d..c3824ba 100644
--- a/WebKit2/WebProcess/WebKitMain.cpp
+++ b/WebKit2/WebProcess/WebKitMain.cpp
@@ -36,6 +36,27 @@
 
 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;    
@@ -137,6 +158,8 @@ int WebKitMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpstrCmdLine
         ::MessageBoxW(0, L"You can now attach a debugger to " PROCESS_NAME L". You can use\nthe same debugger for WebKit2WebProcessand the UI process, if desired.\nClick OK when you are ready for WebKit2WebProcess to continue.", L"WebKit2WebProcess has launched", MB_OK | MB_ICONINFORMATION);
 #endif
 
+    enableDataExecutionPrevention();
+
     enableTerminationOnHeapCorruption();
 
     disableUserModeCallbackExceptionFilter();
diff --git a/WebKit2/WebProcess/win/WebProcessMainWin.cpp b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
index b8eaf2f..944d8ff 100644
--- a/WebKit2/WebProcess/win/WebProcessMainWin.cpp
+++ b/WebKit2/WebProcess/win/WebProcessMainWin.cpp
@@ -36,27 +36,6 @@
 
 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);
-}
-
 #if USE(SAFARI_THEME)
 #ifdef DEBUG_ALL
 SOFT_LINK_DEBUG_LIBRARY(SafariTheme)
@@ -79,8 +58,6 @@ static void initializeSafariTheme()
 
 int WebProcessMain(const CommandLine& commandLine)
 {
-    enableDataExecutionPrevention();
-
     ::OleInitialize(0);
 
 #if USE(SAFARI_THEME)

-- 
WebKit Debian packaging