[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 64a9eefc798a6e3eaeb97fe772da328d6fa4e31e
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 05:21:17 2010 +0000

    2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
    
            Reviewed by Andreas Kling.
    
            Application cache directory should be checked before sending to the web process
            https://bugs.webkit.org/show_bug.cgi?id=45462
    
            * UIProcess/WebProcessProxy.cpp:
            (WebKit::WebProcessProxy::WebProcessProxy): Check the return value of
            m_context->applicationCacheDirectoy() to avoid sending a null string
            to the web process what makes it asserting.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index a0dd633..b7f068f 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
+
+        Reviewed by Andreas Kling.
+
+        Application cache directory should be checked before sending to the web process
+        https://bugs.webkit.org/show_bug.cgi?id=45462
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::WebProcessProxy): Check the return value of
+        m_context->applicationCacheDirectoy() to avoid sending a null string
+        to the web process what makes it asserting.
+
 2010-09-10  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index bf3647a..26d3ad9 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -66,7 +66,9 @@ WebProcessProxy::WebProcessProxy(WebContext* context)
 
     // FIXME: Instead of sending three separate initialization related messages here, we should just send a
     // single "Initialize" messages with a struct that has all the needed information.
-    send(WebProcessMessage::SetApplicationCacheDirectory, 0, CoreIPC::In(m_context->applicationCacheDirectory()));
+    String applicationCacheDirectory = m_context->applicationCacheDirectory();
+    if (!applicationCacheDirectory.isEmpty())
+        send(WebProcessMessage::SetApplicationCacheDirectory, 0, CoreIPC::In(applicationCacheDirectory));
 
     // FIXME: We could instead send the bundle path as part of the arguments to process creation?
     // Would that be better than sending a connection?

-- 
WebKit Debian packaging