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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit e3eb6cc58ecc917cb1ee8b68cc64b535a8bad26b
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 22 22:51:39 2010 +0000

    WebContext::ensureWebProcess shouldn't send multiple InitializeWebProcess messages.
    https://bugs.webkit.org/show_bug.cgi?id=48158
    <rdar://problem/8512572>
    
    Reviewed by Sam Weinig.
    
    If the web process was launching when another call to ensureWebProcess is sent, we
    would end up sending another InitializeWebProcess message to it which would result
    in assertions firing. Fix this by only checking for m_process, and not requiring a process
    to be valid (which it won't be until it's finished launching).
    
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::ensureWebProcess):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 5bdee50..a474211 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -2,6 +2,22 @@
 
         Reviewed by Sam Weinig.
 
+        WebContext::ensureWebProcess shouldn't send multiple InitializeWebProcess messages.
+        https://bugs.webkit.org/show_bug.cgi?id=48158
+        <rdar://problem/8512572>
+
+        If the web process was launching when another call to ensureWebProcess is sent, we
+        would end up sending another InitializeWebProcess message to it which would result
+        in assertions firing. Fix this by only checking for m_process, and not requiring a process
+        to be valid (which it won't be until it's finished launching).
+        
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+
+2010-10-22  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
         Rename revive to relaunch everywhere.
 
         * UIProcess/API/mac/PageClientImpl.h:
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 497bdec..0b87c21 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -141,7 +141,7 @@ void WebContext::languageChanged()
 
 void WebContext::ensureWebProcess()
 {
-    if (hasValidProcess())
+    if (m_process)
         return;
 
     m_process = WebProcessManager::shared().getWebProcess(this);

-- 
WebKit Debian packaging