Changeset 74952 in webkit

Timestamp:

Jan 3, 2011 5:57:35 PM (13 years ago)

Author:

Darin Adler

Message:

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.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/FormData.cpp (modified) (5 diffs)
• platform/network/FormData.h (modified) (4 diffs)
• platform/network/mac/FormDataStreamMac.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2011-01-03  Darin Adler  <darin@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@apple.com>
 

trunk/WebCore/platform/network/FormData.cpp

@@ -93 +93 @@
 }
 
-PassRefPtr<FormData> FormData::create(const Vector<uint8_t>& vector)
+PassRefPtr<FormData> FormData::create(const Vector<char>& vector)
 {
     RefPtr<FormData> result = create();
@@ -270 +270 @@
 }
 
-void FormData::flatten(Vector<uint8_t>& data) const
+void FormData::flatten(Vector<char>& data) const
 {
     // Concatenate all the byte arrays, but omit any files.
@@ -284 +284 @@
 String FormData::flattenToString() const
 {
-    Vector<uint8_t> bytes;
+    Vector<char> bytes;
     flatten(bytes);
     return Latin1Encoding().decode(reinterpret_cast<const char*>(bytes.data()), bytes.size());
@@ -336 +336 @@
     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;
 
@@ -368 +368 @@
 
     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: {

trunk/WebCore/platform/network/FormData.h

@@ -36 +36 @@
 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)
@@ -52 +52 @@
 #endif
     } m_type;
-    Vector<uint8_t> m_data;
+    Vector<char> m_data;
     String m_filename;
 #if ENABLE(BLOB)
@@ -95 +95 @@
     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*);
@@ -112 +112 @@
 #endif
 
-    void flatten(Vector<uint8_t>&) const; // omits files
+    void flatten(Vector<char>&) const; // omits files
     String flattenToString() const; // omits files
 

trunk/WebCore/platform/network/mac/FormDataStreamMac.mm

@@ -137 +137 @@
     long long currentStreamRangeLength;
 #endif
-    uint8_t* currentData;
+    char* currentData;
     CFReadStreamRef formStream;
     unsigned long long streamLength;
@@ -173 +173 @@
     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 {