[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 ff795f553de2c8dde7f4e3899b9cb1e905ecb2e4
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 23:15:55 2010 +0000

    Build fixes.
    
    * Platform/win/SharedMemoryWin.cpp:
    (WebKit::SharedMemory::Handle::encode):
    (WebKit::SharedMemory::Handle::decode):
    * Shared/qt/UpdateChunk.cpp:
    (WebKit::UpdateChunk::encode):
    (WebKit::UpdateChunk::decode):
    * Shared/qt/UpdateChunk.h:
    * Shared/win/UpdateChunk.cpp:
    (WebKit::UpdateChunk::encode):
    (WebKit::UpdateChunk::decode):
    * Shared/win/UpdateChunk.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64879 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index fd19520..cd7ffda 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,5 +1,21 @@
 2010-08-06  Anders Carlsson  <andersca at apple.com>
 
+        Build fixes.
+
+        * Platform/win/SharedMemoryWin.cpp:
+        (WebKit::SharedMemory::Handle::encode):
+        (WebKit::SharedMemory::Handle::decode):
+        * Shared/qt/UpdateChunk.cpp:
+        (WebKit::UpdateChunk::encode):
+        (WebKit::UpdateChunk::decode):
+        * Shared/qt/UpdateChunk.h:
+        * Shared/win/UpdateChunk.cpp:
+        (WebKit::UpdateChunk::encode):
+        (WebKit::UpdateChunk::decode):
+        * Shared/win/UpdateChunk.h:
+
+2010-08-06  Anders Carlsson  <andersca at apple.com>
+
         Reviewed by Sam Weinig.
 
         Change all ArgumentEncoder and ArgumentDecoder references to pointers
diff --git a/WebKit2/Platform/win/SharedMemoryWin.cpp b/WebKit2/Platform/win/SharedMemoryWin.cpp
index ab59b95..7b5cb6a 100644
--- a/WebKit2/Platform/win/SharedMemoryWin.cpp
+++ b/WebKit2/Platform/win/SharedMemoryWin.cpp
@@ -39,12 +39,12 @@ SharedMemory::Handle::~Handle()
     notImplemented();
 }
 
-void SharedMemory::Handle::encode(CoreIPC::ArgumentEncoder& encoder) const
+void SharedMemory::Handle::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
     notImplemented();
 }
 
-bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder& decoder, Handle& handle)
+bool SharedMemory::Handle::decode(CoreIPC::ArgumentDecoder* decoder, Handle& handle)
 {
     notImplemented();
     return false;
diff --git a/WebKit2/Shared/qt/UpdateChunk.cpp b/WebKit2/Shared/qt/UpdateChunk.cpp
index 44d11b2..32d7c29 100644
--- a/WebKit2/Shared/qt/UpdateChunk.cpp
+++ b/WebKit2/Shared/qt/UpdateChunk.cpp
@@ -125,23 +125,23 @@ uint8_t* UpdateChunk::data()
     return reinterpret_cast<uint8_t*>(m_mappedMemory->data);
 }
 
-void UpdateChunk::encode(CoreIPC::ArgumentEncoder& encoder) const
+void UpdateChunk::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
-    encoder.encode(m_rect);
-    encoder.encode(String(m_mappedMemory->file->fileName()));
+    encoder->encode(m_rect);
+    encoder->encode(String(m_mappedMemory->file->fileName()));
 
     m_mappedMemory = 0;
 }
 
-bool UpdateChunk::decode(CoreIPC::ArgumentDecoder& decoder, UpdateChunk& chunk)
+bool UpdateChunk::decode(CoreIPC::ArgumentDecoder* decoder, UpdateChunk& chunk)
 {
     IntRect rect;
-    if (!decoder.decode(rect))
+    if (!decoder->decode(rect))
         return false;
     chunk.m_rect = rect;
     
     String fileName;
-    if (!decoder.decode(fileName))
+    if (!decoder->decode(fileName))
         return false;
 
     chunk.m_mappedMemory = mapFile(fileName, chunk.size());
diff --git a/WebKit2/Shared/qt/UpdateChunk.h b/WebKit2/Shared/qt/UpdateChunk.h
index d962ded..ffe1ba4 100644
--- a/WebKit2/Shared/qt/UpdateChunk.h
+++ b/WebKit2/Shared/qt/UpdateChunk.h
@@ -49,8 +49,8 @@ public:
     const WebCore::IntRect& rect() const { return m_rect; }
     bool isEmpty() const { return m_rect.isEmpty(); }
 
-    void encode(CoreIPC::ArgumentEncoder&) const;
-    static bool decode(CoreIPC::ArgumentDecoder&, UpdateChunk&);
+    void encode(CoreIPC::ArgumentEncoder*) const;
+    static bool decode(CoreIPC::ArgumentDecoder*, UpdateChunk&);
     
     QImage createImage();
     
diff --git a/WebKit2/Shared/win/UpdateChunk.cpp b/WebKit2/Shared/win/UpdateChunk.cpp
index 3b7693b..2aabead 100644
--- a/WebKit2/Shared/win/UpdateChunk.cpp
+++ b/WebKit2/Shared/win/UpdateChunk.cpp
@@ -52,21 +52,21 @@ UpdateChunk::UpdateChunk(const IntRect& rect, HANDLE bitmapSharedMemory)
 {
 }
 
-void UpdateChunk::encode(CoreIPC::ArgumentEncoder& encoder) const
+void UpdateChunk::encode(CoreIPC::ArgumentEncoder* encoder) const
 {
-    encoder.encode(m_rect);
-    encoder.encode(reinterpret_cast<uintptr_t>(m_bitmapSharedMemory));
+    encoder->encode(m_rect);
+    encoder->encode(reinterpret_cast<uintptr_t>(m_bitmapSharedMemory));
 }
 
-bool UpdateChunk::decode(CoreIPC::ArgumentDecoder& decoder, UpdateChunk& updateChunk)
+bool UpdateChunk::decode(CoreIPC::ArgumentDecoder* decoder, UpdateChunk& updateChunk)
 {
     IntRect rect;
-    if (!decoder.decode(rect))
+    if (!decoder->decode(rect))
         return false;
     updateChunk.m_rect = rect;
 
     uintptr_t bitmapSharedMmemory;
-    if (!decoder.decode(bitmapSharedMmemory))
+    if (!decoder->decode(bitmapSharedMmemory))
         return false;
 
     updateChunk.m_bitmapSharedMemory = reinterpret_cast<HANDLE>(bitmapSharedMmemory);
diff --git a/WebKit2/Shared/win/UpdateChunk.h b/WebKit2/Shared/win/UpdateChunk.h
index 0fb699f..2ddeb8b 100644
--- a/WebKit2/Shared/win/UpdateChunk.h
+++ b/WebKit2/Shared/win/UpdateChunk.h
@@ -45,8 +45,8 @@ public:
     HANDLE memory() const { return m_bitmapSharedMemory; }
     bool isEmpty() const { return m_rect.isEmpty(); }
 
-    void encode(CoreIPC::ArgumentEncoder&) const;
-    static bool decode(CoreIPC::ArgumentDecoder&, UpdateChunk&);
+    void encode(CoreIPC::ArgumentEncoder*) const;
+    static bool decode(CoreIPC::ArgumentDecoder*, UpdateChunk&);
 
 private:
     WebCore::IntRect m_rect;

-- 
WebKit Debian packaging