Title: [137826] trunk/Source/WebCore
- Revision
- 137826
- Author
- [email protected]
- Date
- 2012-12-15 17:49:38 -0800 (Sat, 15 Dec 2012)
Log Message
Build fix.
* platform/network/FormData.cpp:
(WebCore::encodeElement):
(WebCore::decodeElement):
(WebCore::FormData::encode):
(WebCore::FormData::decode):
Disambiguated encode/decode functions. I'm not quite sure why the compiler was
confused, but distinct names should make the code more readable anyway.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (137825 => 137826)
--- trunk/Source/WebCore/ChangeLog 2012-12-16 01:31:00 UTC (rev 137825)
+++ trunk/Source/WebCore/ChangeLog 2012-12-16 01:49:38 UTC (rev 137826)
@@ -1,5 +1,17 @@
2012-12-15 Alexey Proskuryakov <[email protected]>
+ Build fix.
+
+ * platform/network/FormData.cpp:
+ (WebCore::encodeElement):
+ (WebCore::decodeElement):
+ (WebCore::FormData::encode):
+ (WebCore::FormData::decode):
+ Disambiguated encode/decode functions. I'm not quite sure why the compiler was
+ confused, but distinct names should make the code more readable anyway.
+
+2012-12-15 Alexey Proskuryakov <[email protected]>
+
<rdar://problem/12886312> Cannot upload patches to Bugzilla (<input type=file> doesn't work)
https://bugs.webkit.org/show_bug.cgi?id=105120
Modified: trunk/Source/WebCore/platform/network/FormData.cpp (137825 => 137826)
--- trunk/Source/WebCore/platform/network/FormData.cpp 2012-12-16 01:31:00 UTC (rev 137825)
+++ trunk/Source/WebCore/platform/network/FormData.cpp 2012-12-16 01:49:38 UTC (rev 137826)
@@ -424,7 +424,7 @@
info.addMember(m_boundary);
}
-static void encode(Encoder& encoder, const FormDataElement& element)
+static void encodeElement(Encoder& encoder, const FormDataElement& element)
{
encoder.encodeUInt32(element.m_type);
@@ -466,7 +466,7 @@
ASSERT_NOT_REACHED();
}
-static bool decode(Decoder& decoder, FormDataElement& element)
+static bool decodeElement(Decoder& decoder, FormDataElement& element)
{
uint32_t type;
if (!decoder.decodeUInt32(type))
@@ -548,7 +548,7 @@
size_t size = m_elements.size();
encoder.encodeUInt64(size);
for (size_t i = 0; i < size; ++i)
- encode(encoder, m_elements[i]);
+ encodeElement(encoder, m_elements[i]);
encoder.encodeBool(m_hasGeneratedFiles);
@@ -574,7 +574,7 @@
return 0;
for (size_t i = 0; i < elementsSize; ++i) {
FormDataElement element;
- if (!decode(decoder, element))
+ if (!decodeElement(decoder, element))
return 0;
data->m_elements.append(element);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
