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

[kbalazs at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e32acef40cca1e56b713f057f8660ea79f1126e8
Author: kbalazs at webkit.org <kbalazs at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 15:22:24 2010 +0000

    [Qt] Assert due to multiple initialization of WebPlatformStrategies
    https://bugs.webkit.org/show_bug.cgi?id=48327
    
    Reviewed by Andreas Kling.
    
    We are using the LocalizationStrategy in the UI process
    so the previous attempt to fix this (http://trac.webkit.org/changeset/70620)
    was wrong.
    * UIProcess/API/qt/qwkpage.cpp:
    (initializePlatformStrategiesIfNeeded):
    Call WebPlatformStrategies::initialize exactly once.
    (QWKPagePrivate::QWKPagePrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70645 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f94c443..4e4c732 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-10-27  Balazs Kelemen  <kbalazs at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Assert due to multiple initialization of WebPlatformStrategies
+        https://bugs.webkit.org/show_bug.cgi?id=48327
+
+        We are using the LocalizationStrategy in the UI process
+        so the previous attempt to fix this (http://trac.webkit.org/changeset/70620)
+        was wrong.
+        * UIProcess/API/qt/qwkpage.cpp:
+        (initializePlatformStrategiesIfNeeded):
+        Call WebPlatformStrategies::initialize exactly once.
+        (QWKPagePrivate::QWKPagePrivate):
+
 2010-10-27  Kimmo Kinnunen  <kimmo.t.kinnunen at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index c03b87b..9a48658 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -49,11 +49,22 @@
 using namespace WebKit;
 using namespace WebCore;
 
+static inline void initializePlatformStrategiesIfNeeded()
+{
+    static bool initialized = false;
+    if (initialized)
+        return;
+
+    WebPlatformStrategies::initialize();
+    initialized = true;
+}
+
 QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
     : q(qq)
     , preferences(0)
     , createNewPageFn(0)
 {
+    initializePlatformStrategiesIfNeeded();
     memset(actions, 0, sizeof(actions));
     page = toImpl(namespaceRef)->createWebPage();
     page->setPageClient(this);

-- 
WebKit Debian packaging