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

andersca at apple.com andersca at apple.com
Wed Dec 22 15:23:16 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 92aee0d2379cddb4719e96820936314a24ad9593
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 17:51:16 2010 +0000

    Assertion hit in WebProcessProxy::~WebProcessProxy()
    https://bugs.webkit.org/show_bug.cgi?id=48849
    <rdar://problem/8617676>
    
    Reviewed by John Sullivan.
    
    It is perfectly valid for the page map to contain pages if the web process proxy
    goes away, this can happen if the process crashes for example.
    
    * UIProcess/WebProcessProxy.cpp:
    (WebKit::WebProcessProxy::~WebProcessProxy):
    Remove the assertion.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71129 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 4df2505..2dd3fa8 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-02  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Assertion hit in WebProcessProxy::~WebProcessProxy()
+        https://bugs.webkit.org/show_bug.cgi?id=48849
+        <rdar://problem/8617676>
+
+        It is perfectly valid for the page map to contain pages if the web process proxy
+        goes away, this can happen if the process crashes for example.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::~WebProcessProxy):
+        Remove the assertion.
+
 2010-11-02  Christian Sejersen  <christian.webkit at gmail.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index bba1948..172a70c 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -63,8 +63,6 @@ WebProcessProxy::WebProcessProxy(WebContext* context)
 
 WebProcessProxy::~WebProcessProxy()
 {
-    ASSERT(m_pageMap.isEmpty());
-
     if (m_connection)
         m_connection->invalidate();
     

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list