[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 1ae744c1383ff9c160e6079325baab50ec7ae109
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 12 01:03:50 2010 +0000

    Add an argument coder for ResourceResponse.
    https://bugs.webkit.org/show_bug.cgi?id=49415
    
    Reviewed by Sam Weinig.
    
    * Shared/WebCoreArgumentCoders.h:
    * Shared/gtk/WebCoreArgumentCodersGtk.cpp:
    (CoreIPC::encodeResourceResponse):
    (CoreIPC::decodeResourceResponse):
    * Shared/mac/WebCoreArgumentCodersMac.mm:
    (CoreIPC::encodeResourceResponse):
    (CoreIPC::decodeResourceResponse):
    * Shared/qt/WebCoreArgumentCodersQt.cpp:
    (CoreIPC::encodeResourceResponse):
    (CoreIPC::decodeResourceResponse):
    * Shared/win/WebCoreArgumentCodersWin.cpp:
    (CoreIPC::encodeResourceResponse):
    (CoreIPC::decodeResourceResponse):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index f2f4b4d..c335288 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-11  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Add an argument coder for ResourceResponse.
+        https://bugs.webkit.org/show_bug.cgi?id=49415
+
+        * Shared/WebCoreArgumentCoders.h:
+        * Shared/gtk/WebCoreArgumentCodersGtk.cpp:
+        (CoreIPC::encodeResourceResponse):
+        (CoreIPC::decodeResourceResponse):
+        * Shared/mac/WebCoreArgumentCodersMac.mm:
+        (CoreIPC::encodeResourceResponse):
+        (CoreIPC::decodeResourceResponse):
+        * Shared/qt/WebCoreArgumentCodersQt.cpp:
+        (CoreIPC::encodeResourceResponse):
+        (CoreIPC::decodeResourceResponse):
+        * Shared/win/WebCoreArgumentCodersWin.cpp:
+        (CoreIPC::encodeResourceResponse):
+        (CoreIPC::decodeResourceResponse):
+
 2010-11-11  Ryosuke Niwa  <rniwa at webkit.org>
 
         Unreviewed build fix for r71587.
diff --git a/WebKit2/Shared/WebCoreArgumentCoders.h b/WebKit2/Shared/WebCoreArgumentCoders.h
index 8c5aa20..088820d 100644
--- a/WebKit2/Shared/WebCoreArgumentCoders.h
+++ b/WebKit2/Shared/WebCoreArgumentCoders.h
@@ -151,6 +151,22 @@ template<> struct ArgumentCoder<WebCore::ResourceRequest> {
     }
 };
 
+// These two functions are implemented in a platform specific manner.
+void encodeResourceResponse(ArgumentEncoder*, const WebCore::ResourceResponse&);
+bool decodeResourceResponse(ArgumentDecoder*, WebCore::ResourceResponse&);
+
+template<> struct ArgumentCoder<WebCore::ResourceResponse> {
+    static void encode(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse)
+    {
+        encodeResourceResponse(encoder, resourceResponse);
+    }
+
+    static bool decode(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse)
+    {
+        return decodeResourceResponse(decoder, resourceResponse);
+    }
+};
+
 template<> struct ArgumentCoder<WebCore::ResourceError> {
     static void encode(ArgumentEncoder* encoder, const WebCore::ResourceError& resourceError)
     {
diff --git a/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp b/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp
index 3de3170..95d6286 100644
--- a/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp
+++ b/WebKit2/Shared/gtk/WebCoreArgumentCodersGtk.cpp
@@ -41,4 +41,15 @@ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& r
     return false;
 }
 
+void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+}
+
+bool decodeResourceResponse(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+    return false;
+}
+
 }
diff --git a/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm b/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
index 05d13d2..1080949 100644
--- a/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
+++ b/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm
@@ -58,4 +58,20 @@ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& r
     return true;
 }
 
+void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse)
+{
+    encodeWithNSKeyedArchiver(encoder, resourceResponse.nsURLResponse());
+}
+
+bool decodeResourceResponse(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse)
+{
+    NSURLResponse *nsURLResponse = decodeWithNSKeyedArchiver(decoder);
+    if (!nsURLResponse)
+        return false;
+
+    resourceResponse = WebCore::ResourceResponse(nsURLResponse);
+    return true;
+}
+
+
 } // namespace CoreIPC
diff --git a/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp b/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp
index a661914..80ab3f9 100644
--- a/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp
+++ b/WebKit2/Shared/qt/WebCoreArgumentCodersQt.cpp
@@ -39,4 +39,15 @@ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& r
     return false;
 }
 
+void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+}
+
+bool decodeResourceResponse(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+    return false;
+}
+
 } // namespace CoreIPC
diff --git a/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp b/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
index cea7913..81d400e 100644
--- a/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
+++ b/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
@@ -40,4 +40,15 @@ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& r
     return false;
 }
 
+void encodeResourceResponse(ArgumentEncoder* encoder, const WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+}
+
+bool decodeResourceResponse(ArgumentDecoder* decoder, WebCore::ResourceResponse& resourceResponse)
+{
+    notImplemented();
+    return false;
+}
+
 } // namespace CoreIPC

-- 
WebKit Debian packaging