[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
darin at apple.com
darin at apple.com
Fri Jan 21 14:54:08 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 2de5bd4f06b84ca805d6d968c6d442a111480156
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 4 01:57:35 2011 +0000
Fix build.
* platform/network/FormData.cpp:
(WebCore::FormData::create): Roll back uint8_t change.
(WebCore::FormData::flatten): Ditto.
(WebCore::FormData::flattenToString): Ditto.
(WebCore::encode): Ditto.
(WebCore::decode): Ditto.
(WebCore::FormData::encodeForBackForward):
* platform/network/FormData.h: Ditto.
* platform/network/mac/FormDataStreamMac.mm:
(WebCore::advanceCurrentStream): Ditto.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74952 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 65742eb..d189f8f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,20 @@
2011-01-03 Darin Adler <darin at apple.com>
+ Fix build.
+
+ * platform/network/FormData.cpp:
+ (WebCore::FormData::create): Roll back uint8_t change.
+ (WebCore::FormData::flatten): Ditto.
+ (WebCore::FormData::flattenToString): Ditto.
+ (WebCore::encode): Ditto.
+ (WebCore::decode): Ditto.
+ (WebCore::FormData::encodeForBackForward):
+ * platform/network/FormData.h: Ditto.
+ * platform/network/mac/FormDataStreamMac.mm:
+ (WebCore::advanceCurrentStream): Ditto.
+
+2011-01-03 Darin Adler <darin at apple.com>
+
Reviewed by Brady Eidson.
Add code to encode/decode the back/forward tree
diff --git a/WebCore/platform/network/FormData.cpp b/WebCore/platform/network/FormData.cpp
index 1511dc6..c61c501 100644
--- a/WebCore/platform/network/FormData.cpp
+++ b/WebCore/platform/network/FormData.cpp
@@ -92,7 +92,7 @@ PassRefPtr<FormData> FormData::create(const CString& string)
return result.release();
}
-PassRefPtr<FormData> FormData::create(const Vector<uint8_t>& vector)
+PassRefPtr<FormData> FormData::create(const Vector<char>& vector)
{
RefPtr<FormData> result = create();
result->appendData(vector.data(), vector.size());
@@ -269,7 +269,7 @@ void FormData::appendKeyValuePairItems(const FormDataList& list, const TextEncod
appendData(encodedData.data(), encodedData.size());
}
-void FormData::flatten(Vector<uint8_t>& data) const
+void FormData::flatten(Vector<char>& data) const
{
// Concatenate all the byte arrays, but omit any files.
data.clear();
@@ -283,7 +283,7 @@ void FormData::flatten(Vector<uint8_t>& data) const
String FormData::flattenToString() const
{
- Vector<uint8_t> bytes;
+ Vector<char> bytes;
flatten(bytes);
return Latin1Encoding().decode(reinterpret_cast<const char*>(bytes.data()), bytes.size());
}
@@ -335,7 +335,7 @@ static void encode(Encoder* encoder, const FormDataElement& element)
switch (element.m_type) {
case FormDataElement::data:
- encoder->encodeBytes(element.m_data.data(), element.m_data.size());
+ encoder->encodeBytes(reinterpret_cast<const uint8_t*>(element.m_data.data()), element.m_data.size());
return;
case FormDataElement::encodedFile:
@@ -367,8 +367,16 @@ static bool decode(Decoder* decoder, FormDataElement& element)
uint32_t type = element.m_type;
switch (type) {
- case FormDataElement::data:
- return decoder->decodeBytes(element.m_data);
+ case FormDataElement::data: {
+ element.m_type = FormDataElement::data;
+ Vector<uint8_t> data;
+ if (!decoder->decodeBytes(data))
+ return false;
+ size_t size = data.size();
+ element.m_data.resize(size);
+ memcpy(element.m_data.data(), data.data(), size);
+ return true;
+ }
case FormDataElement::encodedFile: {
element.m_type = FormDataElement::encodedFile;
diff --git a/WebCore/platform/network/FormData.h b/WebCore/platform/network/FormData.h
index e051bf4..3b29ba5 100644
--- a/WebCore/platform/network/FormData.h
+++ b/WebCore/platform/network/FormData.h
@@ -35,7 +35,7 @@ class TextEncoding;
class FormDataElement {
public:
FormDataElement() : m_type(data) { }
- explicit FormDataElement(const Vector<uint8_t>& array) : m_type(data), m_data(array) { }
+ explicit FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { }
#if ENABLE(BLOB)
FormDataElement(const String& filename, long long fileStart, long long fileLength, double expectedFileModificationTime, bool shouldGenerateFile) : m_type(encodedFile), m_filename(filename), m_fileStart(fileStart), m_fileLength(fileLength), m_expectedFileModificationTime(expectedFileModificationTime), m_shouldGenerateFile(shouldGenerateFile) { }
@@ -51,7 +51,7 @@ public:
, encodedBlob
#endif
} m_type;
- Vector<uint8_t> m_data;
+ Vector<char> m_data;
String m_filename;
#if ENABLE(BLOB)
long long m_fileStart;
@@ -94,7 +94,7 @@ public:
static PassRefPtr<FormData> create();
static PassRefPtr<FormData> create(const void*, size_t);
static PassRefPtr<FormData> create(const CString&);
- static PassRefPtr<FormData> create(const Vector<uint8_t>&);
+ static PassRefPtr<FormData> create(const Vector<char>&);
static PassRefPtr<FormData> create(const FormDataList&, const TextEncoding&);
static PassRefPtr<FormData> createMultiPart(const FormDataList&, const TextEncoding&, Document*);
PassRefPtr<FormData> copy() const;
@@ -111,7 +111,7 @@ public:
void appendBlob(const KURL& blobURL);
#endif
- void flatten(Vector<uint8_t>&) const; // omits files
+ void flatten(Vector<char>&) const; // omits files
String flattenToString() const; // omits files
bool isEmpty() const { return m_elements.isEmpty(); }
diff --git a/WebCore/platform/network/mac/FormDataStreamMac.mm b/WebCore/platform/network/mac/FormDataStreamMac.mm
index 7bb0403..03f4579 100644
--- a/WebCore/platform/network/mac/FormDataStreamMac.mm
+++ b/WebCore/platform/network/mac/FormDataStreamMac.mm
@@ -136,7 +136,7 @@ struct FormStreamFields {
#if ENABLE(BLOB)
long long currentStreamRangeLength;
#endif
- uint8_t* currentData;
+ char* currentData;
CFReadStreamRef formStream;
unsigned long long streamLength;
unsigned long long bytesSent;
@@ -172,8 +172,8 @@ static bool advanceCurrentStream(FormStreamFields* form)
if (nextInput.m_type == FormDataElement::data) {
size_t size = nextInput.m_data.size();
- uint8_t* data = nextInput.m_data.releaseBuffer();
- form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, data, size, kCFAllocatorNull);
+ char* data = nextInput.m_data.releaseBuffer();
+ form->currentStream = CFReadStreamCreateWithBytesNoCopy(0, reinterpret_cast<const UInt8*>(data), size, kCFAllocatorNull);
form->currentData = data;
} else {
#if ENABLE(BLOB)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list