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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 04da2a5b2cbe26bcd8761b88fa439f3dc17ec44c
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 12 16:25:50 2010 +0000

    [Qt][WK2] Crash in WebPage constructor.
    https://bugs.webkit.org/show_bug.cgi?id=50892
    
    Reviewed by Andreas Kling.
    
    * WebProcess/qt/WebProcessQt.cpp:
    (WebKit::WebProcess::platformInitializeWebProcess):
    Disable runtime enabled features that have no WebKit2 implementation yet.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 1908047..9ed6443 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-12  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt][WK2] Crash in WebPage constructor.
+        https://bugs.webkit.org/show_bug.cgi?id=50892
+
+        * WebProcess/qt/WebProcessQt.cpp:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        Disable runtime enabled features that have no WebKit2 implementation yet.
+
 2010-12-10  Jon Honeycutt  <jhoneycutt at apple.com>
 
         Select menus with short option titles do not paint properly
diff --git a/WebKit2/WebProcess/qt/WebProcessQt.cpp b/WebKit2/WebProcess/qt/WebProcessQt.cpp
index 81fb935..53a51d3 100644
--- a/WebKit2/WebProcess/qt/WebProcessQt.cpp
+++ b/WebKit2/WebProcess/qt/WebProcessQt.cpp
@@ -26,6 +26,7 @@
 #include "WebProcess.h"
 
 #include "WebProcessCreationParameters.h"
+#include <WebCore/RuntimeEnabledFeatures.h>
 #include <QNetworkAccessManager>
 
 namespace WebKit {
@@ -42,6 +43,15 @@ void WebProcess::platformClearResourceCaches()
 void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::ArgumentDecoder* arguments)
 {
     m_networkAccessManager = new QNetworkAccessManager;
+
+    // Disable runtime enabled features that have no WebKit2 implementation yet.
+#if ENABLE(DEVICE_ORIENTATION)
+    WebCore::RuntimeEnabledFeatures::setDeviceMotionEnabled(false);
+    WebCore::RuntimeEnabledFeatures::setDeviceOrientationEnabled(false);
+#endif
+#if ENABLE(SPEECH_INPUT)
+    WebCore::RuntimeEnabledFeatures::setSpeechInputEnabled(false);
+#endif
 }
 
 void WebProcess::platformShutdown()

-- 
WebKit Debian packaging