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

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit cbf304136c40d7101e9a7ec3cd3063d1c39dd2d2
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 26 22:11:58 2010 +0000

    Fix non-Mac builds.
    
    * Platform/SharedMemory.h:
    * Platform/mac/SharedMemoryMac.cpp:
    (WebKit::SharedMemory::Handle::isNull):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68353 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3247748..c841d78 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-26  Anders Carlsson  <andersca at apple.com>
 
+        Fix non-Mac builds.
+
+        * Platform/SharedMemory.h:
+        * Platform/mac/SharedMemoryMac.cpp:
+        (WebKit::SharedMemory::Handle::isNull):
+
+2010-09-26  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         Make it possible to encode null SharedMemory::Handle objects
diff --git a/WebKit2/Platform/SharedMemory.h b/WebKit2/Platform/SharedMemory.h
index db3ee4a..11ed7e4 100644
--- a/WebKit2/Platform/SharedMemory.h
+++ b/WebKit2/Platform/SharedMemory.h
@@ -49,7 +49,7 @@ public:
         Handle();
         ~Handle();
 
-        bool isNull() const { return !m_port; }
+        bool isNull() const;
 
         void encode(CoreIPC::ArgumentEncoder*) const;
         static bool decode(CoreIPC::ArgumentDecoder*, Handle&);
diff --git a/WebKit2/Platform/mac/SharedMemoryMac.cpp b/WebKit2/Platform/mac/SharedMemoryMac.cpp
index 117c9c0..07f942c 100644
--- a/WebKit2/Platform/mac/SharedMemoryMac.cpp
+++ b/WebKit2/Platform/mac/SharedMemoryMac.cpp
@@ -48,6 +48,11 @@ SharedMemory::Handle::~Handle()
         mach_port_deallocate(mach_task_self(), m_port);
 }
 
+bool SharedMemory::Handle::isNull() const
+{
+    return !m_port;
+}
+
 void SharedMemory::Handle::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
     encoder->encodeUInt64(m_size);

-- 
WebKit Debian packaging