[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 f1340ce6852ff7202e314b3b9cd74afe560e17af
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 08:19:14 2010 +0000

    2010-10-27  Zalan Bujtas  <zbujtas at gmail.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            Multiple WebPlatformStrategy initialization triggers assert in WebCore/PlatformStrategies.
            Remove the code for now, as it is not used at all.
            https://bugs.webkit.org/show_bug.cgi?id=48327
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::QWKPagePrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70620 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e83b65c..b257b58 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-27  Zalan Bujtas  <zbujtas at gmail.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Multiple WebPlatformStrategy initialization triggers assert in WebCore/PlatformStrategies. 
+        Remove the code for now, as it is not used at all.
+        https://bugs.webkit.org/show_bug.cgi?id=48327
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::QWKPagePrivate):
+
 2010-10-26  Brent Fulgham  <bfulgham at webkit.org>
 
         Unreviewed build fix.
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.cpp b/WebKit2/UIProcess/API/qt/qwkpage.cpp
index 520890d..c03b87b 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -54,10 +54,6 @@ QWKPagePrivate::QWKPagePrivate(QWKPage* qq, WKPageNamespaceRef namespaceRef)
     , preferences(0)
     , createNewPageFn(0)
 {
-    // We want to use the LocalizationStrategy at the UI side as well.
-    // FIXME: this should be avoided.
-    WebPlatformStrategies::initialize();
-
     memset(actions, 0, sizeof(actions));
     page = toImpl(namespaceRef)->createWebPage();
     page->setPageClient(this);

-- 
WebKit Debian packaging