Title: [126357] trunk/Source/WebCore
- Revision
- 126357
- Author
- [email protected]
- Date
- 2012-08-22 15:01:55 -0700 (Wed, 22 Aug 2012)
Log Message
win64 compile error fix for BinaryPropertyList.cpp
https://bugs.webkit.org/show_bug.cgi?id=94122
Patch by Alex Christensen <[email protected]> on 2012-08-22
Reviewed by Eric Seidel.
Fixed compile errors for MSVC x64 without changing performance
* platform/cf/BinaryPropertyList.cpp:
(WebCore::BinaryPropertyListSerializer::appendStringObject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (126356 => 126357)
--- trunk/Source/WebCore/ChangeLog 2012-08-22 21:55:25 UTC (rev 126356)
+++ trunk/Source/WebCore/ChangeLog 2012-08-22 22:01:55 UTC (rev 126357)
@@ -1,3 +1,14 @@
+2012-08-22 Alex Christensen <[email protected]>
+ win64 compile error fix for BinaryPropertyList.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=94122
+
+ Reviewed by Eric Seidel.
+
+ Fixed compile errors for MSVC x64 without changing performance
+
+ * platform/cf/BinaryPropertyList.cpp:
+ (WebCore::BinaryPropertyListSerializer::appendStringObject):
+
2012-08-22 Kwang Yul Seo <[email protected]>
HTMLTreeBuilder::furthestBlockForFormattingElement should belong to HTMLElementStack
Modified: trunk/Source/WebCore/platform/cf/BinaryPropertyList.cpp (126356 => 126357)
--- trunk/Source/WebCore/platform/cf/BinaryPropertyList.cpp 2012-08-22 21:55:25 UTC (rev 126356)
+++ trunk/Source/WebCore/platform/cf/BinaryPropertyList.cpp 2012-08-22 22:01:55 UTC (rev 126357)
@@ -697,7 +697,7 @@
unsigned length = string.length();
if (charactersAreAllASCII(characters, length)) {
if (length <= maxLengthInMarkerByte)
- appendByte(asciiStringMarkerByte | length);
+ appendByte(static_cast<unsigned char>(asciiStringMarkerByte | length));
else {
appendByte(asciiStringWithSeparateLengthMarkerByte);
appendInteger(length);
@@ -706,7 +706,7 @@
appendByte(characters[i]);
} else {
if (length <= maxLengthInMarkerByte)
- appendByte(unicodeStringMarkerByte | length);
+ appendByte(static_cast<unsigned char>(unicodeStringMarkerByte | length));
else {
appendByte(unicodeStringWithSeparateLengthMarkerByte);
appendInteger(length);
@@ -723,7 +723,7 @@
startObject();
unsigned length = strlen(string);
if (length <= maxLengthInMarkerByte)
- appendByte(asciiStringMarkerByte | length);
+ appendByte(static_cast<unsigned char>(asciiStringMarkerByte | length));
else {
appendByte(asciiStringWithSeparateLengthMarkerByte);
appendInteger(length);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
