[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
oliver at apple.com
oliver at apple.com
Wed Dec 22 13:05:32 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit a9b4754aadb33c350e845c53158d04208001efa1
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Sep 6 22:53:32 2010 +0000
Windows build fix
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66852 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 55caadb..12cb66f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-06 Oliver Hunt <oliver at apple.com>
+
+ Windows build fix
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::CloneSerializer::write):
+
2010-09-05 Oliver Hunt <oliver at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index 2d83880..6bdb67f 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -465,9 +465,10 @@ private:
{
writeLittleEndian(m_buffer, i);
}
- void write(UChar ch)
+
+ void write(uint16_t ch)
{
- writeLittleEndian(m_buffer, static_cast<uint16_t>(ch));
+ writeLittleEndian(m_buffer, ch);
}
void writeStringIndex(unsigned i)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list