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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c02858a5658fb9aaba827b4c2dbe9582579db059
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 28 09:02:30 2010 +0000

    2010-10-28  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
    
             Reviewed by Kenneth Rohde Christiansen.
    
             [Qt] Web process cannot be debugged if it crashes in initialization
             https://bugs.webkit.org/show_bug.cgi?id=47399
    
             Wait 3 seconds for the debugger on debug mode if
             WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH environment variable is set.
    
             The debugging can be initiated for example in following way:
              export WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH=1
              ./MiniBrowser & while [ -z `pidof QtWebProcess` ]; do sleep 1; done; \
               gdb --pid=`pidof QtWebProcess`
    
             * WebProcess/qt/WebProcessMainQt.cpp:
             (WebKit::WebProcessMainQt):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70760 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1a11c87..6adc728 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2010-10-28  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
+
+         Reviewed by Kenneth Rohde Christiansen.
+
+         [Qt] Web process cannot be debugged if it crashes in initialization
+         https://bugs.webkit.org/show_bug.cgi?id=47399
+
+         Wait 3 seconds for the debugger on debug mode if
+         WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH environment variable is set.
+
+         The debugging can be initiated for example in following way:
+          export WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH=1
+          ./MiniBrowser & while [ -z `pidof QtWebProcess` ]; do sleep 1; done; \
+           gdb --pid=`pidof QtWebProcess`
+
+         * WebProcess/qt/WebProcessMainQt.cpp:
+         (WebKit::WebProcessMainQt):
+
 2010-10-28  Mark Rowe  <mrowe at apple.com>
 
         32-bit build fix.
diff --git a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
index 40dc8d8..3695714 100644
--- a/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
+++ b/WebKit2/WebProcess/qt/WebProcessMainQt.cpp
@@ -45,15 +45,33 @@
 #define QWEBKIT_EXPORT
 #endif
 #endif
+#ifndef NDEBUG
+#include <QDebug>
+#endif
 
 using namespace WebCore;
 
 namespace WebKit {
+#ifndef NDEBUG
+#if OS(WINDOWS)
+static void sleep(unsigned seconds)
+{
+    ::Sleep(seconds * 1000);
+}
+#endif
+#endif
+
 
 QWEBKIT_EXPORT int WebProcessMainQt(int argc, char** argv)
 {
     QApplication::setGraphicsSystem("raster");
     QApplication* app = new QApplication(argc, argv);
+#ifndef NDEBUG
+    if (!qgetenv("WEBKIT2_PAUSE_WEB_PROCESS_ON_LAUNCH").isEmpty()) {
+        qDebug() << "Waiting 3 seconds for debugger";
+        sleep(3);
+    }
+#endif
 
 #if USE(MEEGOTOUCH)
     new MComponentData(argc, argv);

-- 
WebKit Debian packaging