[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
weinig at apple.com
weinig at apple.com
Wed Dec 22 13:14:58 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a76b163b82a8765731a012448920759c965efe41
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Sep 9 20:55:00 2010 +0000
Allow passing WebDoubles via postMessage.
Reviewed by Anders Carlsson.
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67112 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 859481a..55fabd7 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-09 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ Allow passing WebDoubles via postMessage.
+
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+
2010-09-08 Sam Weinig <sam at webkit.org>
Reviewed by Dan Bernstein.
diff --git a/WebKit2/Shared/UserMessageCoders.h b/WebKit2/Shared/UserMessageCoders.h
index d9442f3..94023f5 100644
--- a/WebKit2/Shared/UserMessageCoders.h
+++ b/WebKit2/Shared/UserMessageCoders.h
@@ -28,6 +28,7 @@
#include "ImmutableArray.h"
#include "ImmutableDictionary.h"
#include "WebCoreArgumentCoders.h"
+#include "WebNumber.h"
#include "WebSerializedScriptValue.h"
#include "WebString.h"
@@ -38,6 +39,7 @@ namespace WebKit {
// - Dictionary -> Dictionary
// - String -> String
// - SerializedScriptValue -> SerializedScriptValue
+// - WebDouble -> WebDouble
template<typename Owner>
class UserMessageEncoder {
@@ -83,6 +85,11 @@ public:
encoder->encodeBytes(scriptValue->data().data(), scriptValue->data().size());
return true;
}
+ case APIObject::TypeDouble: {
+ WebDouble* doubleObject = static_cast<WebDouble*>(m_root);
+ encoder->encode(doubleObject->value());
+ return true;
+ }
default:
break;
}
@@ -105,6 +112,8 @@ protected:
// - Array -> Array
// - Dictionary -> Dictionary
// - String -> String
+// - SerializedScriptValue -> SerializedScriptValue
+// - WebDouble -> WebDouble
template<typename Owner>
class UserMessageDecoder {
@@ -173,6 +182,13 @@ public:
coder.m_root = WebSerializedScriptValue::adopt(buffer);
break;
}
+ case APIObject::TypeDouble: {
+ double doubleValue;
+ if (!decoder->decode(doubleValue))
+ return false;
+ coder.m_root = WebDouble::create(doubleValue);
+ break;
+ }
default:
break;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list