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

andersca at apple.com andersca at apple.com
Wed Dec 22 13:37:32 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 0a8568bfdd8f17f7980fcbd5b31f5108545c6620
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 20:51:05 2010 +0000

    Handle booleans in injected bundle messages
    https://bugs.webkit.org/show_bug.cgi?id=46213
    
    Reviewed by John Sullivan.
    
    * Shared/UserMessageCoders.h:
    (WebKit::UserMessageEncoder::baseEncode):
    (WebKit::UserMessageDecoder::baseDecode):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67984 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b756263..5a1332b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-21  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Handle booleans in injected bundle messages
+        https://bugs.webkit.org/show_bug.cgi?id=46213
+
+        * Shared/UserMessageCoders.h:
+        (WebKit::UserMessageEncoder::baseEncode):
+        (WebKit::UserMessageDecoder::baseDecode):
+
 2010-09-21  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/Shared/UserMessageCoders.h b/WebKit2/Shared/UserMessageCoders.h
index 5b8ec55..84a8b92 100644
--- a/WebKit2/Shared/UserMessageCoders.h
+++ b/WebKit2/Shared/UserMessageCoders.h
@@ -98,6 +98,11 @@ public:
             encoder->encode(uint64Object->value());
             return true;
         }
+        case APIObject::TypeBoolean: {
+            WebBoolean* booleanObject = static_cast<WebBoolean*>(m_root);
+            encoder->encode(booleanObject->value());
+            return true;
+        }
         case APIObject::TypeURL: {
             WebURL* urlObject = static_cast<WebURL*>(m_root);
             encoder->encode(urlObject->string());
@@ -211,6 +216,13 @@ public:
             coder.m_root = WebUInt64::create(value);
             break;
         }
+        case APIObject::TypeBoolean: {
+            bool value;
+            if (!decoder->decode(value))
+                return false;
+            coder.m_root = WebBoolean::create(value);
+            break;
+        }
         case APIObject::TypeURL: {
             String string;
             if (!decoder->decode(string))

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list