Title: [121032] trunk/Source/WebCore
- Revision
- 121032
- Author
- [email protected]
- Date
- 2012-06-22 09:49:31 -0700 (Fri, 22 Jun 2012)
Log Message
BUILD FIX: FormController.cpp fails to build on 32-bit architectures
This fixes the following build failure introduced in r121004 for
Bug 89628:
FormController.cpp:62:36: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned long') [-Werror,-Wshorten-64-to-32]
state.m_values.reserveCapacity(valueSize);
~~~~~ ^~~~~~~~~
* html/FormController.cpp:
(WebCore::FormControlState::deserialize): Change type of
valueSize from uint64_t to size_t.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (121031 => 121032)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 16:48:49 UTC (rev 121031)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 16:49:31 UTC (rev 121032)
@@ -1,3 +1,18 @@
+2012-06-22 David Kilzer <[email protected]>
+
+ BUILD FIX: FormController.cpp fails to build on 32-bit architectures
+
+ This fixes the following build failure introduced in r121004 for
+ Bug 89628:
+
+ FormController.cpp:62:36: error: implicit conversion loses integer precision: 'uint64_t' (aka 'unsigned long long') to 'size_t' (aka 'unsigned long') [-Werror,-Wshorten-64-to-32]
+ state.m_values.reserveCapacity(valueSize);
+ ~~~~~ ^~~~~~~~~
+
+ * html/FormController.cpp:
+ (WebCore::FormControlState::deserialize): Change type of
+ valueSize from uint64_t to size_t.
+
2012-06-22 Abhishek Arya <[email protected]>
Crash in DragController::concludeEditDrag.
Modified: trunk/Source/WebCore/html/FormController.cpp (121031 => 121032)
--- trunk/Source/WebCore/html/FormController.cpp 2012-06-22 16:48:49 UTC (rev 121031)
+++ trunk/Source/WebCore/html/FormController.cpp 2012-06-22 16:49:31 UTC (rev 121032)
@@ -53,7 +53,7 @@
{
if (index >= stateVector.size())
return FormControlState(TypeFailure);
- uint64_t valueSize = stateVector[index++].toUInt64();
+ size_t valueSize = stateVector[index++].toUInt();
if (!valueSize)
return FormControlState();
if (index + valueSize > stateVector.size())
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
