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

aroben at apple.com aroben at apple.com
Wed Dec 22 11:30:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ac5d8f2bc36872b153e94522beb0bc390c7de796
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 17:17:09 2010 +0000

    Make preferences APIs robust against web process crashes
    
    Fixes <http://webkit.org/b/43049> Crash in
    WebPageNamespace::preferencesDidChange if preferences are changed
    after the web process crashes
    
    Reviewed by Anders Carlsson.
    
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::preferencesDidChange): Bail out if we don't have
    a web process. The new preference values will get propogated to the
    web process if and when it launches.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64140 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d91a7ce..c901c27 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,20 @@
 2010-07-27  Adam Roben  <aroben at apple.com>
 
+        Make preferences APIs robust against web process crashes
+
+        Fixes <http://webkit.org/b/43049> Crash in
+        WebPageNamespace::preferencesDidChange if preferences are changed
+        after the web process crashes
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::preferencesDidChange): Bail out if we don't have
+        a web process. The new preference values will get propogated to the
+        web process if and when it launches.
+
+2010-07-27  Adam Roben  <aroben at apple.com>
+
         Add a ProcessDidExit callback to the WKPageLoaderClient
 
         Fixes <http://webkit.org/b/43048> UI process needs a way to find out
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 58b3d8c..6ea31f6 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -141,6 +141,9 @@ WebPreferences* WebContext::preferences() const
 
 void WebContext::preferencesDidChange()
 {
+    if (!m_process)
+        return;
+
     for (HashSet<WebPageNamespace*>::iterator it = m_pageNamespaces.begin(), end = m_pageNamespaces.end(); it != end; ++it) {
         WebPageNamespace* pageNamespace = *it;
         pageNamespace->preferencesDidChange();

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list