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

[mrowe at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 9d96d1ae6816da840ace35c72852b27bca05e75d
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 01:04:32 2010 +0000

    Fix the build when sandboxing is enabled.
    
    Reviewed by Sam Weinig.
    
    * UIProcess/WebContext.cpp:
    (WebKit::WebContext::ensureWebProcess):
    * UIProcess/WebProcessProxy.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 49c3f77..f9485b7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-10-04  Mark Rowe  <mrowe at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Fix the build when sandboxing is enabled.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::ensureWebProcess):
+        * UIProcess/WebProcessProxy.cpp:
+
 2010-10-04  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed Csaba Osztrogonác.
diff --git a/WebKit2/UIProcess/WebContext.cpp b/WebKit2/UIProcess/WebContext.cpp
index a9d7f97..49863e2 100644
--- a/WebKit2/UIProcess/WebContext.cpp
+++ b/WebKit2/UIProcess/WebContext.cpp
@@ -42,6 +42,10 @@
 #include <wtf/OwnArrayPtr.h>
 #include <wtf/PassOwnArrayPtr.h>
 
+#if ENABLE(WEB_PROCESS_SANDBOX)
+#include <sandbox.h>
+#endif
+
 #ifndef NDEBUG
 #include <wtf/RefCountedLeakCounter.h>
 #endif
@@ -134,11 +138,11 @@ void WebContext::ensureWebProcess()
 
 #if ENABLE(WEB_PROCESS_SANDBOX)
         char* sandboxBundleTokenUTF8 = 0;
-        CString injectedBundlePath = context->injectedBundlePath().utf8();
-        sandbox_issue_extension(injectedBundlePath.data(), &sandboxBundleToken);
-        String sandboxBundleToken = String::fromUTF8(sandboxBundleTokenUTF8)
-        if (sandboxBundleToken)
-            free(sandboxBundleToken);
+        CString injectedBundlePathUTF8 = injectedBundlePath().utf8();
+        sandbox_issue_extension(injectedBundlePathUTF8.data(), &sandboxBundleTokenUTF8);
+        String sandboxBundleToken = String::fromUTF8(sandboxBundleTokenUTF8);
+        if (sandboxBundleTokenUTF8)
+            free(sandboxBundleTokenUTF8);
 
         parameters.injectedBundlePathToken = sandboxBundleToken;
 #endif
diff --git a/WebKit2/UIProcess/WebProcessProxy.cpp b/WebKit2/UIProcess/WebProcessProxy.cpp
index 1755fb7..3b3a165 100644
--- a/WebKit2/UIProcess/WebProcessProxy.cpp
+++ b/WebKit2/UIProcess/WebProcessProxy.cpp
@@ -39,10 +39,6 @@
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(WEB_PROCESS_SANDBOX)
-#include <sandbox.h>
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {

-- 
WebKit Debian packaging