[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 fe5175739d3f509bca1bbc8a1c36c33ab3cddfa6
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 25 11:52:32 2010 +0000

    2010-08-25  Pawel Hajdan  <phajdan.jr at chromium.org>
    
            Reviewed by Darin Fisher.
    
            Add an assertion to prevent re-initializing WebKit.
            https://bugs.webkit.org/show_bug.cgi?id=44545
    
            This will help prevent crashes like:
            - http://code.google.com/p/chromium/issues/detail?id=52731
            - http://code.google.com/p/chromium/issues/detail?id=52643
    
            * src/WebKit.cpp:
            (WebKit::initialize):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 708522a..3347abb 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-25  Pawel Hajdan  <phajdan.jr at chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Add an assertion to prevent re-initializing WebKit.
+        https://bugs.webkit.org/show_bug.cgi?id=44545
+        
+        This will help prevent crashes like:
+        - http://code.google.com/p/chromium/issues/detail?id=52731
+        - http://code.google.com/p/chromium/issues/detail?id=52643
+
+        * src/WebKit.cpp:
+        (WebKit::initialize):
+
 2010-08-25  Jay Civelli  <jcivelli at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebKit/chromium/src/WebKit.cpp b/WebKit/chromium/src/WebKit.cpp
index 786d573..cadcb6c 100644
--- a/WebKit/chromium/src/WebKit.cpp
+++ b/WebKit/chromium/src/WebKit.cpp
@@ -46,11 +46,18 @@
 
 namespace WebKit {
 
+// Make sure we are not re-initialized in the same address space.
+// Doing so may cause hard to reproduce crashes.
+static bool s_webKitInitialized = false;
+
 static WebKitClient* s_webKitClient = 0;
 static bool s_layoutTestMode = false;
 
 void initialize(WebKitClient* webKitClient)
 {
+    ASSERT(!s_webKitInitialized);
+    s_webKitInitialized = true;
+
     ASSERT(webKitClient);
     ASSERT(!s_webKitClient);
     s_webKitClient = webKitClient;

-- 
WebKit Debian packaging