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

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 1d510cab563f5a18cffddf5e6d8ea628e3564b13
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 02:15:16 2010 +0000

    Add user message coding for WebUInt64 type.
    
    Reviewed by Jon Honeycutt.
    
    * Shared/UserMessageCoders.h:
    (WebKit::UserMessageEncoder::baseEncode):
    (WebKit::UserMessageDecoder::baseDecode):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67595 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 9f7523c..e3c1a72 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-15  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        Add user message coding for WebUInt64 type.
+
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+
 2010-09-15  Jessie Berlin  <jberlin at apple.com>
 
         Reviewed by Jon Honeycutt.
diff --git a/WebKit2/Shared/UserMessageCoders.h b/WebKit2/Shared/UserMessageCoders.h
index 94023f5..7d05a47 100644
--- a/WebKit2/Shared/UserMessageCoders.h
+++ b/WebKit2/Shared/UserMessageCoders.h
@@ -40,6 +40,7 @@ namespace WebKit {
 //   - String -> String
 //   - SerializedScriptValue -> SerializedScriptValue
 //   - WebDouble -> WebDouble
+//   - WebUInt64 -> WebUInt64
 
 template<typename Owner>
 class UserMessageEncoder {
@@ -90,6 +91,11 @@ public:
             encoder->encode(doubleObject->value());
             return true;
         }
+        case APIObject::TypeUInt64: {
+            WebUInt64* uint64Object = static_cast<WebUInt64*>(m_root);
+            encoder->encode(uint64Object->value());
+            return true;
+        }
         default:
             break;
         }
@@ -114,6 +120,7 @@ protected:
 //   - String -> String
 //   - SerializedScriptValue -> SerializedScriptValue
 //   - WebDouble -> WebDouble
+//   - WebUInt64 -> WebUInt64
 
 template<typename Owner>
 class UserMessageDecoder {
@@ -183,10 +190,17 @@ public:
             break;
         }
         case APIObject::TypeDouble: {
-            double doubleValue;
-            if (!decoder->decode(doubleValue))
+            double value;
+            if (!decoder->decode(value))
+                return false;
+            coder.m_root = WebDouble::create(value);
+            break;
+        }
+        case APIObject::TypeUInt64: {
+            uint64_t value;
+            if (!decoder->decode(value))
                 return false;
-            coder.m_root = WebDouble::create(doubleValue);
+            coder.m_root = WebUInt64::create(value);
             break;
         }
         default:

-- 
WebKit Debian packaging