[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 12:51:13 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 51dab1fce25200b0b1dbbb1dd86fb9447c8b2ddd
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 17:54:55 2010 +0000

    Don't send messages to the injected bundle if the web process has exited
    
    Fixes <http://webkit.org/b/43046> <rdar://problem/8239455> Crash in
    WKContextPostMessageToInjectedBundle if the web process has exited
    
    Reviewed by Sam Weinig.
    
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::postMessageToInjectedBundle): Only send messages
    when we have a valid web process.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66508 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index e6c483c..0aa0e2c 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,19 @@
 2010-08-27  Adam Roben  <aroben at apple.com>
 
+        Don't send messages to the injected bundle if the web process has
+        exited
+
+        Fixes <http://webkit.org/b/43046> <rdar://problem/8239455> Crash in
+        WKContextPostMessageToInjectedBundle if the web process has exited
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::postMessageToInjectedBundle): Only send messages
+        when we have a valid web process.
+
+2010-08-27  Adam Roben  <aroben at apple.com>
+
         Use the Windows thread pool instead of a dedicated thread for
         WorkQueue on Windows
 
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index 3ab3c43..e14bcc4 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -313,7 +313,7 @@ void WebContext::preferencesDidChange()
 
 void WebContext::postMessageToInjectedBundle(const String& messageName, APIObject* messageBody)
 {
-    if (!m_process)
+    if (!hasValidProcess())
         return;
 
     // FIXME: We should consider returning false from this function if the messageBody cannot

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list