Changeset 60799 in webkit

Timestamp:

Jun 7, 2010 1:55:00 PM (14 years ago)

Author:

kinuko@chromium.org

Message:

2010-06-07 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Refactor FormData and Blob for better support of Blobs synthesized by BlobBuilder.
​https://bugs.webkit.org/show_bug.cgi?id=39083

Replace FormDataList::Item list with BlobItemList to get it compiled
with the refactoring in FormDataList.

• src/WebSearchableFormData.cpp: (WebCore::HasSuitableTextElement):

2010-06-07 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Refactor FormData and Blob for better support of Blobs synthesized by BlobBuilder.
​https://bugs.webkit.org/show_bug.cgi?id=39083

• Introduces a new class BlobItem as a basic component of Blob and FormDataList.
• File would become a special type of Blob that contains only one FileBlobItem.
• Fix the dependency violation in FormData so that the files under platform/ do not include any html/ files.

The patch doesn't support the latest File API changes (e.g. type,
url and slice's type parameters) and should not change any of its
existing behaviors.

The existing tests should be able to be used for regression.

• CMakeLists.txt:
• GNUmakefile.am:
• WebCore.gypi:
• WebCore.pro:
• WebCore.vcproj/WebCore.vcproj:
• WebCore.xcodeproj/project.pbxproj:
• html/Blob.cpp: (WebCore::Blob::Blob): (WebCore::Blob::size): (WebCore::Blob::path): (WebCore::Blob::append): (WebCore::Blob::slice):
• html/Blob.h: (WebCore::Blob::create): (WebCore::Blob::type): (WebCore::Blob::items): (WebCore::Blob::Blob):
• html/File.cpp: (WebCore::File::File): (WebCore::File::name):
• html/File.h: (WebCore::File::fileName):
• html/FileReader.cpp: (WebCore::FileReader::readAsBinaryString): (WebCore::FileReader::readAsText):
• html/FileStream.cpp: (WebCore::FileStream::openForRead):
• html/FormDataList.cpp: (WebCore::FormDataList::appendString): Moved the line ending fix logic to StringBlobItem::convertToCString. (WebCore::FormDataList::appendBlob):
• html/FormDataList.h: (WebCore::FormDataList::items):
• html/HTMLFormElement.cpp: (WebCore::HTMLFormElement::createFormData):
• html/HTMLProgressElement.cpp:
• platform/BlobItem.cpp: Added.
• platform/BlobItem.h: Added.
• platform/network/FormData.cpp: (WebCore::FormDataElement::FormDataElement): (WebCore::FormData::create): (WebCore::FormData::createMultiPart): (WebCore::FormData::deepCopy): (WebCore::FormData::appendData): (WebCore::FormData::appendString): (WebCore::FormData::appendFile): (WebCore::FormData::appendFileRange): (WebCore::FormData::appendItems): (WebCore::FormData::appendItem): (WebCore::FormData::appendKeyValuePairItems):
• platform/network/FormData.h: (WebCore::operator!=):
• platform/network/mac/FormDataStreamMac.mm: (WebCore::closeCurrentStream): (WebCore::advanceCurrentStream): (WebCore::formCreate): (WebCore::formRead): (WebCore::setHTTPBody):
• xml/XMLHttpRequest.cpp: (WebCore::XMLHttpRequest::send):

Location:

trunk

Files:

• WebCore/CMakeLists.txt (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/WebCore.gypi (modified) (1 diff)
• WebCore/WebCore.pro (modified) (2 diffs)
• WebCore/WebCore.vcproj/WebCore.vcproj (modified) (1 diff)
• WebCore/WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• WebCore/html/Blob.cpp (modified) (4 diffs)
• WebCore/html/Blob.h (modified) (4 diffs)
• WebCore/html/File.cpp (modified) (1 diff)
• WebCore/html/File.h (modified) (1 diff)
• WebCore/html/FileReader.cpp (modified) (2 diffs)
• WebCore/html/FileStream.cpp (modified) (5 diffs)
• WebCore/html/FormDataList.cpp (modified) (1 diff)
• WebCore/html/FormDataList.h (modified) (2 diffs)
• WebCore/html/HTMLFormElement.cpp (modified) (1 diff)
• WebCore/html/HTMLMeterElement.cpp (modified) (1 diff)
• WebCore/html/HTMLProgressElement.cpp (modified) (1 diff)
• WebCore/platform/BlobItem.cpp (added)
• WebCore/platform/BlobItem.h (added)
• WebCore/platform/network/FormData.cpp (modified) (12 diffs)
• WebCore/platform/network/FormData.h (modified) (8 diffs)
• WebCore/platform/network/mac/FormDataStreamMac.mm (modified) (10 diffs)
• WebCore/xml/XMLHttpRequest.cpp (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebSearchableFormData.cpp (modified) (3 diffs)

trunk/WebCore/CMakeLists.txt

@@ -1123 +1123 @@
 
     platform/Arena.cpp
+    platform/BlobItem.cpp
     platform/ContentType.cpp
     platform/ContextMenu.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-07  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Refactor FormData and Blob for better support of Blobs synthesized by BlobBuilder.
+        https://bugs.webkit.org/show_bug.cgi?id=39083
+
+        - Introduces a new class BlobItem as a basic component of Blob and FormDataList.
+        - File would become a special type of Blob that contains only one FileBlobItem.
+        - Fix the dependency violation in FormData so that the files under platform/ do not include any html/ files.
+
+        The patch doesn't support the latest File API changes (e.g. type,
+        url and slice's type parameters) and should not change any of its
+        existing behaviors.
+
+        The existing tests should be able to be used for regression.
+
+        * CMakeLists.txt:
+        * GNUmakefile.am:
+        * WebCore.gypi:
+        * WebCore.pro:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.xcodeproj/project.pbxproj:
+        * html/Blob.cpp:
+        (WebCore::Blob::Blob):
+        (WebCore::Blob::size):
+        (WebCore::Blob::path):
+        (WebCore::Blob::append):
+        (WebCore::Blob::slice):
+        * html/Blob.h:
+        (WebCore::Blob::create):
+        (WebCore::Blob::type):
+        (WebCore::Blob::items):
+        (WebCore::Blob::Blob):
+        * html/File.cpp:
+        (WebCore::File::File):
+        (WebCore::File::name):
+        * html/File.h:
+        (WebCore::File::fileName):
+        * html/FileReader.cpp:
+        (WebCore::FileReader::readAsBinaryString):
+        (WebCore::FileReader::readAsText):
+        * html/FileStream.cpp:
+        (WebCore::FileStream::openForRead):
+        * html/FormDataList.cpp:
+        (WebCore::FormDataList::appendString): Moved the line ending fix logic to StringBlobItem::convertToCString.
+        (WebCore::FormDataList::appendBlob):
+        * html/FormDataList.h:
+        (WebCore::FormDataList::items):
+        * html/HTMLFormElement.cpp:
+        (WebCore::HTMLFormElement::createFormData):
+        * html/HTMLProgressElement.cpp:
+        * platform/BlobItem.cpp: Added.
+        * platform/BlobItem.h: Added.
+        * platform/network/FormData.cpp:
+        (WebCore::FormDataElement::FormDataElement):
+        (WebCore::FormData::create):
+        (WebCore::FormData::createMultiPart):
+        (WebCore::FormData::deepCopy):
+        (WebCore::FormData::appendData):
+        (WebCore::FormData::appendString):
+        (WebCore::FormData::appendFile):
+        (WebCore::FormData::appendFileRange):
+        (WebCore::FormData::appendItems):
+        (WebCore::FormData::appendItem):
+        (WebCore::FormData::appendKeyValuePairItems):
+        * platform/network/FormData.h:
+        (WebCore::operator!=):
+        * platform/network/mac/FormDataStreamMac.mm:
+        (WebCore::closeCurrentStream):
+        (WebCore::advanceCurrentStream):
+        (WebCore::formCreate):
+        (WebCore::formRead):
+        (WebCore::setHTTPBody):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::send):
+
 2010-06-07  Vangelis Kokkevis  <vangelis@chromium.org>
 

trunk/WebCore/GNUmakefile.am

@@ -1560 +1560 @@
         WebCore/platform/Arena.h \
         WebCore/platform/AutodrainedPool.h \
+        WebCore/platform/BlobItem.cpp \
+        WebCore/platform/BlobItem.h \
         WebCore/platform/ContentType.cpp \
         WebCore/platform/ContentType.h \

trunk/WebCore/WebCore.gypi

@@ -2881 +2881 @@
             'platform/Arena.h',
             'platform/AutodrainedPool.h',
+            'platform/BlobItem.cpp',
+            'platform/BlobItem.h',
             'platform/ContentType.cpp',
             'platform/ContentType.h',

trunk/WebCore/WebCore.pro

@@ -816 +816 @@
     platform/animation/AnimationList.cpp \
     platform/Arena.cpp \
+    platform/BlobItem.cpp \
     platform/text/Base64.cpp \
     platform/text/BidiContext.cpp \
@@ -1565 +1566 @@
     platform/animation/AnimationList.h \
     platform/Arena.h \
+    platform/BlobItem.h \
     platform/ContentType.h \
     platform/ContextMenu.h \

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -22370 +22370 @@
                         </File>
                         <File
+                                RelativePath="..\platform\BlobItem.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\platform\BlobItem.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\platform\ContentType.cpp"
                                 >

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -2281 +2281 @@
                 895253DF116C4F0600CABF00 /* FileThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 895253DE116C4F0600CABF00 /* FileThreadTask.h */; };
                 8FAC774D119872CB0015AE94 /* JSMainThreadExecState.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */; };
+                8988E10E11A3508B00DB732E /* BlobItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8988E10C11A3508B00DB732E /* BlobItem.cpp */; };
+                8988E10F11A3508B00DB732E /* BlobItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 8988E10D11A3508B00DB732E /* BlobItem.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9302B0BD0D79F82900C7EE83 /* PageGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */; };
                 9302B0BF0D79F82C00C7EE83 /* PageGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7889 +7891 @@
                 8F934D831189F1EE00508D5D /* JSMainThreadExecState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMainThreadExecState.h; sourceTree = "<group>"; };
                 8F934D841189F1EE00508D5D /* JSMainThreadExecState.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMainThreadExecState.cpp; sourceTree = "<group>"; };
+                8988E10C11A3508B00DB732E /* BlobItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlobItem.cpp; sourceTree = "<group>"; };
+                8988E10D11A3508B00DB732E /* BlobItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlobItem.h; sourceTree = "<group>"; };
                 9302B0BC0D79F82900C7EE83 /* PageGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageGroup.cpp; sourceTree = "<group>"; };
                 9302B0BE0D79F82C00C7EE83 /* PageGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageGroup.h; sourceTree = "<group>"; };
@@ -15863 +15867 @@
                                 BCFB2F75097A2E1A00BA703D /* Arena.h */,
                                 51E1ECB10C91C55600DC255B /* AutodrainedPool.h */,
+                                8988E10C11A3508B00DB732E /* BlobItem.cpp */,
+                                8988E10D11A3508B00DB732E /* BlobItem.h */,
                                 BCC8CFCA0986CD2400140BF2 /* ColorData.gperf */,
                                 41D015C90F4B5C71004A662F /* ContentType.cpp */,
@@ -16900 +16906 @@
                                 A89943280B42338800D7C802 /* BitmapImage.h in Headers */,
                                 2EAFAF0F10E2AF2D007ED3D6 /* Blob.h in Headers */,
+                                8988E10F11A3508B00DB732E /* BlobItem.h in Headers */,
                                 93F199BE08245E59001E9ABC /* BlockExceptions.h in Headers */,
                                 BC5EB5E10E81BE8700B25965 /* BorderData.h in Headers */,
@@ -19733 +19740 @@
                                 A89943290B42338800D7C802 /* BitmapImage.cpp in Sources */,
                                 2EAFAF0E10E2AF2D007ED3D6 /* Blob.cpp in Sources */,
+                                8988E10E11A3508B00DB732E /* BlobItem.cpp in Sources */,
                                 93F19AE108245E59001E9ABC /* BlockExceptions.mm in Sources */,
                                 BCEA4854097D93020094C9E4 /* break_lines.cpp in Sources */,

trunk/WebCore/html/Blob.cpp

@@ -32 +32 @@
 #include "Blob.h"
 
+#include "BlobItem.h"
 #include "FileSystem.h"
 
 namespace WebCore {
 
-#if ENABLE(BLOB_SLICE)
-const int Blob::toEndOfFile = -1;
-const double Blob::doNotCheckFileChange = 0;
-#endif
-
 Blob::Blob(const String& path)
-    : m_path(path)
-#if ENABLE(BLOB_SLICE)
-    , m_start(0)
-    , m_length(toEndOfFile)
-    , m_snapshotCaptured(false)
-    , m_snapshotSize(0)
-    , m_snapshotModificationTime(doNotCheckFileChange)
-#endif
 {
+    // Note: this doesn't initialize the type unlike File(path).
+    append(FileBlobItem::create(path));
 }
-
-#if ENABLE(BLOB_SLICE)
-Blob::Blob(const String& path, long long start, long long length, long long snapshotSize, double snapshotModificationTime)
-    : m_path(path)
-    , m_start(start)
-    , m_length(length)
-    , m_snapshotCaptured(true)
-    , m_snapshotSize(snapshotSize)
-    , m_snapshotModificationTime(snapshotModificationTime)
-{
-    ASSERT(start >= 0 && length >= 0 && start + length <= snapshotSize && snapshotModificationTime);
-}
-#endif
 
 unsigned long long Blob::size() const
@@ -70 +47 @@
     // FIXME: JavaScript cannot represent sizes as large as unsigned long long, we need to
     // come up with an exception to throw if file size is not represetable.
-#if ENABLE(BLOB_SLICE)
-    if (m_snapshotCaptured)
-        return m_length;
-#endif
-    long long size;
-    if (!getFileSize(m_path, size))
-        return 0;
-    return static_cast<unsigned long long>(size);
+    unsigned long long size = 0;
+    for (size_t i = 0; i < m_items.size(); ++i)
+        size += m_items[i]->size();
+    return size;
+}
+
+const String& Blob::path() const
+{
+    ASSERT(m_items.size() == 1 && m_items[0]->toFileBlobItem());
+    return m_items[0]->toFileBlobItem()->path();
+}
+
+void Blob::append(PassRefPtr<BlobItem> item)
+{
+    m_items.append(item);
 }
 
@@ -83 +67 @@
 PassRefPtr<Blob> Blob::slice(long long start, long long length) const
 {
-    // When we slice a file for the first time, we obtain a snapshot of the file by capturing its current size and modification time.
-    // The modification time will be used to verify if the file has been changed or not, when the underlying data are accessed.
-    long long snapshotSize;
-    double snapshotModificationTime;
-    if (m_snapshotCaptured) {
-        snapshotSize = m_snapshotSize;
-        snapshotModificationTime = m_snapshotModificationTime;
-    } else {
-        // If we fail to retrieve the size or modification time, probably due to that the file has been deleted, an empty blob will be returned.
-        time_t modificationTime;
-        if (!getFileSize(m_path, snapshotSize) || !getFileModificationTime(m_path, modificationTime)) {
-            snapshotSize = 0;
-            snapshotModificationTime = 0;
-        } else
-            snapshotModificationTime = modificationTime;
-    }
-
-    // Clamp the range if it exceeds the size limit.
     if (start < 0)
         start = 0;
@@ -106 +72 @@
         length = 0;
 
-    if (start > snapshotSize) {
+    // Clamp the range if it exceeds the size limit.
+    unsigned long long totalSize = size();
+    if (static_cast<unsigned long long>(start) > totalSize) {
         start = 0;
         length = 0;
-    } else if (start + length > snapshotSize)
-        length = snapshotSize - start;
+    } else if (static_cast<unsigned long long>(start + length) > totalSize)
+        length = totalSize - start;
 
-    return adoptRef(new Blob(m_path, m_start + start, length, snapshotSize, snapshotModificationTime));
+    size_t i = 0;
+    RefPtr<Blob> blob = Blob::create();
+    for (; i < m_items.size() && static_cast<unsigned long long>(start) >= m_items[i]->size(); ++i)
+        start -= m_items[i]->size();
+    for (; length > 0 && i < m_items.size(); ++i) {
+        blob->m_items.append(m_items[i]->slice(start, length));
+        length -= blob->m_items.last()->size();
+        start = 0;
+    }
+    return blob.release();
 }
-#endif
+#endif // ENABLE(BLOB_SLICE)
 
 } // namespace WebCore

trunk/WebCore/html/Blob.h

@@ -32 +32 @@
 #define Blob_h
 
-#include "ExceptionCode.h"
+#include "BlobItem.h"
 #include "PlatformString.h"
-#include <time.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
+#include <wtf/Vector.h>
 
 namespace WebCore {
@@ -42 +42 @@
 class Blob : public RefCounted<Blob> {
 public:
-#if ENABLE(BLOB_SLICE)
-    static const int toEndOfFile;
-    static const double doNotCheckFileChange;
-#endif
+    static PassRefPtr<Blob> create()
+    {
+        return adoptRef(new Blob());
+    }
 
+    // FIXME: Deprecated method.  This is called only from
+    // bindings/v8/SerializedScriptValue.cpp and the usage in it will become invalid once
+    // BlobBuilder is introduced.
     static PassRefPtr<Blob> create(const String& path)
     {
@@ -54 +57 @@
     virtual ~Blob() { }
 
+    unsigned long long size() const;
+    const String& type() const { return m_type; }
     virtual bool isFile() const { return false; }
+
+    // FIXME: Deprecated method.
+    const String& path() const;
+
+    void append(PassRefPtr<BlobItem>);
+    const BlobItemList& items() const { return m_items; }
 
 #if ENABLE(BLOB_SLICE)
@@ -60 +71 @@
 #endif
 
-    const String& path() const { return m_path; }
-    unsigned long long size() const;
-#if ENABLE(BLOB_SLICE)
-    long long start() const { return m_start; }
-    long long length() const { return m_length; }
-    double modificationTime() const { return m_snapshotModificationTime; }
-#endif
+protected:
+    Blob() { }
 
-protected:
+    // FIXME: Deprecated constructor.  See also the comment for Blob::create(path).
     Blob(const String& path);
 
-private:
-#if ENABLE(BLOB_SLICE)
-    Blob(const String& path, long long start, long long length, long long snapshotSize, double snapshotModificationTime);
-#endif
-
-    // The underlying path of the file-based blob. 
-    String m_path;
-
-#if ENABLE(BLOB_SLICE)
-    // The starting position of the file-based blob.
-    long long m_start;
-
-    // The length of the file-based blob. The value of -1 means to the end of the file.
-    long long m_length;
-
-    // A flag to tell if a snapshot has been captured.
-    bool m_snapshotCaptured;
-
-    // The size of the file when a snapshot is captured. It can be 0 if the file is empty.
-    long long m_snapshotSize;
-
-    // The last modification time of the file when a snapshot is captured. The value of 0 also means that the snapshot is not captured.
-    double m_snapshotModificationTime;
-#endif
+    BlobItemList m_items;
+    String m_type;
 };
 

trunk/WebCore/html/File.cpp

@@ -34 +34 @@
 File::File(const String& path)
     : Blob(path)
-    , m_name(pathGetFileName(path))
 {
     // We don't use MIMETypeRegistry::getMIMETypeForPath() because it returns "application/octet-stream" upon failure.
-    int index = m_name.reverseFind('.');
+    const String& fileName = name();
+    int index = fileName.reverseFind('.');
     if (index != -1)
-        m_type = MIMETypeRegistry::getMIMETypeForExtension(m_name.substring(index + 1));
+        m_type = MIMETypeRegistry::getMIMETypeForExtension(fileName.substring(index + 1));
+}
+
+const String& File::name() const
+{
+    return items().at(0)->toFileBlobItem()->name();
 }
 

trunk/WebCore/html/File.h

@@ -42 +42 @@
     virtual bool isFile() const { return true; }
 
-    const String& name() const { return m_name; }
-    const String& type() const { return m_type; }
+    const String& name() const;
 
     // FIXME: obsolete attributes. To be removed.
-    const String& fileName() const { return m_name; }
+    const String& fileName() const { return name(); }
     unsigned long long fileSize() const { return size(); }
 
 private:
     File(const String& path);
-
-    String m_name;
-    String m_type;
 };
 

trunk/WebCore/html/FileReader.cpp

@@ -86 +86 @@
 void FileReader::readAsBinaryString(Blob* fileBlob)
 {
+    // FIXME: needs to handle non-file blobs.
     LOG(FileAPI, "FileReader: reading as binary: %s\n", fileBlob->path().utf8().data());
 
@@ -93 +94 @@
 void FileReader::readAsText(Blob* fileBlob, const String& encoding)
 {
+    // FIXME: needs to handle non-file blobs.
     LOG(FileAPI, "FileReader: reading as text: %s\n", fileBlob->path().utf8().data());
 

trunk/WebCore/html/FileStream.cpp

@@ -73 +73 @@
         return;
 
+    // FIXME: Need to handle multiple items that may include non-file ones when BlobBuilder is introduced.
+    ASSERT(blob->items().size() >= 1);
+    const FileBlobItem* fileItem = blob->items().at(0)->toFileBlobItem();
+    if (!fileItem) {
+        ASSERT(false);
+        m_client->didFail(NOT_READABLE_ERR);
+        return;
+    }
+
     // Check if the file exists by querying its modification time. We choose not to call fileExists() in order to save an
     // extra file system call when the modification time is needed to check the validity of the sliced file blob.
@@ -78 +87 @@
     // openFile() could not tell use the failure reason.
     time_t currentModificationTime;
-    if (!getFileModificationTime(blob->path(), currentModificationTime)) {
+    if (!getFileModificationTime(fileItem->path(), currentModificationTime)) {
         m_client->didFail(NOT_FOUND_ERR);
         return;
@@ -84 +93 @@
 
     // Open the file blob.
-    m_handle = openFile(blob->path(), OpenForRead);
+    m_handle = openFile(fileItem->path(), OpenForRead);
     if (!isHandleValid(m_handle)) {
         m_client->didFail(NOT_READABLE_ERR);
@@ -91 +100 @@
 
 #if ENABLE(BLOB_SLICE)
-    // Check the modificationt time for the possible file change.
-    if (blob->modificationTime() != Blob::doNotCheckFileChange && static_cast<time_t>(blob->modificationTime()) != currentModificationTime) {
-        m_client->didFail(NOT_READABLE_ERR);
-        return;
-    }
-
-    // Jump to the beginning position if the file has been sliced.
-    if (blob->start() > 0) {
-        if (!seekFile(m_handle, blob->start(), SeekFromBeginning)) {
+    const FileRangeBlobItem* fileRangeItem = fileItem->toFileRangeBlobItem();
+    if (fileRangeItem) {
+        // Check the modificationt time for the possible file change.
+        if (static_cast<time_t>(fileRangeItem->snapshotModificationTime()) != currentModificationTime) {
             m_client->didFail(NOT_READABLE_ERR);
             return;
+        }
+
+        // Jump to the beginning position if the file has been sliced.
+        if (fileRangeItem->start() > 0) {
+            if (seekFile(m_handle, fileRangeItem->start(), SeekFromBeginning) < 0) {
+                m_client->didFail(NOT_READABLE_ERR);
+                return;
+            }
         }
     }
@@ -107 +119 @@
 
     // Get the size.
-#if ENABLE(BLOB_SLICE)
-    m_totalBytesToRead = blob->length();
-    if (m_totalBytesToRead == Blob::toEndOfFile)
-        m_totalBytesToRead = blob->size() - blob->start();
-#else
     m_totalBytesToRead = blob->size();
-#endif
-
     m_client->didGetSize(m_totalBytesToRead);
 }

trunk/WebCore/html/FormDataList.cpp

@@ -29 +29 @@
 }
 
+void FormDataList::appendString(const String& s)
+{
+    m_items.append(StringBlobItem::create(s, EndingCRLF, m_encoding));
+}
+
 void FormDataList::appendString(const CString& s)
 {
-    m_list.append(s);
+    m_items.append(StringBlobItem::create(s));
 }
 
-// Change plain CR and plain LF to CRLF pairs.
-static CString fixLineBreaks(const CString& s)
+void FormDataList::appendBlob(const String& key, PassRefPtr<Blob> blob)
 {
-    // Compute the length.
-    unsigned newLen = 0;
-    const char* p = s.data();
-    while (char c = *p++) {
-        if (c == '\r') {
-            // Safe to look ahead because of trailing '\0'.
-            if (*p != '\n') {
-                // Turn CR into CRLF.
-                newLen += 2;
-            }
-        } else if (c == '\n') {
-            // Turn LF into CRLF.
-            newLen += 2;
-        } else {
-            // Leave other characters alone.
-            newLen += 1;
-        }
-    }
-    if (newLen == s.length()) {
-        return s;
-    }
-    
-    // Make a copy of the string.
-    p = s.data();
-    char* q;
-    CString result = CString::newUninitialized(newLen, q);
-    while (char c = *p++) {
-        if (c == '\r') {
-            // Safe to look ahead because of trailing '\0'.
-            if (*p != '\n') {
-                // Turn CR into CRLF.
-                *q++ = '\r';
-                *q++ = '\n';
-            }
-        } else if (c == '\n') {
-            // Turn LF into CRLF.
-            *q++ = '\r';
-            *q++ = '\n';
-        } else {
-            // Leave other characters alone.
-            *q++ = c;
-        }
-    }
-    return result;
-}
-
-void FormDataList::appendString(const String& s)
-{
-    CString cstr = fixLineBreaks(m_encoding.encode(s.characters(), s.length(), EntitiesForUnencodables));
-    m_list.append(cstr);
+    appendString(key);
+    const BlobItemList& items = blob->items();
+    for (size_t i = 0; i < items.size(); ++i)
+        m_items.append(items.at(i));
 }
 

trunk/WebCore/html/FormDataList.h

@@ -47 +47 @@
         appendString(String::number(value));
     }
-    void appendBlob(const String& key, PassRefPtr<Blob> blob)
-    {
-        appendString(key);
-        m_list.append(blob);
-    }
+    void appendBlob(const String& key, PassRefPtr<Blob>);
 
-    class Item {
-    public:
-        Item() { }
-        Item(const WTF::CString& data) : m_data(data) { }
-        Item(PassRefPtr<Blob> blob) : m_blob(blob) { }
-
-        const WTF::CString& data() const { return m_data; }
-        Blob* blob() const { return m_blob.get(); }
-
-    private:
-        WTF::CString m_data;
-        RefPtr<Blob> m_blob;
-    };
-
-    const Vector<Item>& list() const { return m_list; }
+    const BlobItemList& items() const { return m_items; }
     const TextEncoding& encoding() const { return m_encoding; }
 
@@ -75 +57 @@
 
     TextEncoding m_encoding;
-    Vector<Item> m_list;
+    BlobItemList m_items;
 };
 

trunk/WebCore/html/HTMLFormElement.cpp

@@ -210 +210 @@
     }
 
-    RefPtr<FormData> result = (m_formDataBuilder.isMultiPartForm()) ? FormData::createMultiPart(*domFormData, document()) : FormData::create(*domFormData);
+    RefPtr<FormData> result = (m_formDataBuilder.isMultiPartForm()) ? FormData::createMultiPart(domFormData->items(), domFormData->encoding(), document()) : FormData::create(domFormData->items(), domFormData->encoding());
 
     result->setIdentifier(generateFormDataIdentifier());

trunk/WebCore/html/HTMLMeterElement.cpp

@@ -25 +25 @@
 #include "Attribute.h"
 #include "EventNames.h"
+#include "ExceptionCode.h"
 #include "FormDataList.h"
 #include "HTMLFormElement.h"

trunk/WebCore/html/HTMLProgressElement.cpp

@@ -25 +25 @@
 #include "Attribute.h"
 #include "EventNames.h"
+#include "ExceptionCode.h"
 #include "FormDataList.h"
 #include "HTMLFormElement.h"

trunk/WebCore/platform/network/FormData.cpp

@@ -20 +20 @@
 
 #include "config.h"
+
 #include "FormData.h"
 
-#include "Blob.h"
+#include "BlobItem.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
-#include "DOMFormData.h"
 #include "Document.h"
-#include "File.h"
 #include "FileSystem.h"
 #include "FormDataBuilder.h"
@@ -33 +32 @@
 #include "Page.h"
 #include "TextEncoding.h"
-#include "UUID.h"
 
 namespace WebCore {
+
+#if ENABLE(BLOB_SLICE)
+const long long FormDataElement::toEndOfFile = -1;
+const double FormDataElement::doNotCheckFileChange = 0;
+#endif
 
 inline FormData::FormData()
@@ -97 +100 @@
 }
 
-PassRefPtr<FormData> FormData::create(const DOMFormData& domFormData)
-{
-    RefPtr<FormData> result = create();
-    result->appendDOMFormData(domFormData, false, 0);
-    return result.release();
-}
-
-PassRefPtr<FormData> FormData::createMultiPart(const DOMFormData& domFormData, Document* document)
-{
-    RefPtr<FormData> result = create();
-    result->appendDOMFormData(domFormData, true, document);
+PassRefPtr<FormData> FormData::create(const BlobItemList& items, const TextEncoding& encoding)
+{
+    RefPtr<FormData> result = create();
+    result->appendKeyValuePairItems(items, encoding, false, 0);
+    return result.release();
+}
+
+PassRefPtr<FormData> FormData::createMultiPart(const BlobItemList& items, const TextEncoding& encoding, Document* document)
+{
+    RefPtr<FormData> result = create();
+    result->appendKeyValuePairItems(items, encoding, true, document);
     return result.release();
 }
@@ -155 +158 @@
 {
 #if ENABLE(BLOB_SLICE)
-    m_elements.append(FormDataElement(filename, 0, Blob::toEndOfFile, Blob::doNotCheckFileChange, shouldGenerateFile));
+    m_elements.append(FormDataElement(filename, 0, FormDataElement::toEndOfFile, FormDataElement::doNotCheckFileChange, shouldGenerateFile));
 #else
     m_elements.append(FormDataElement(filename, shouldGenerateFile));
@@ -161 +164 @@
 }
 
+void FormData::appendItems(const BlobItemList& items)
+{
+    for (BlobItemList::const_iterator iter(items.begin()); iter != items.end(); ++iter)
+        appendItem(iter->get(), false);
+}
+
+void FormData::appendItem(const BlobItem* item, bool shouldGenerateFile)
+{
+    const DataBlobItem* dataItem = item->toDataBlobItem();
+    if (dataItem) {
+        appendData(dataItem->data(), static_cast<size_t>(dataItem->size()));
+        return;
+    }
+
+    const FileBlobItem* fileItem = item->toFileBlobItem();
+    ASSERT(fileItem);
+    if (fileItem->path().isEmpty()) {
+        // If the path is empty do not add the item.
+        return;
+    }
+
+#if ENABLE(BLOB_SLICE)
+    const FileRangeBlobItem* fileRangeItem = item->toFileRangeBlobItem();
+    if (fileRangeItem) {
+        appendFileRange(fileItem->path(), fileRangeItem->start(), fileRangeItem->size(), fileRangeItem->snapshotModificationTime(), shouldGenerateFile);
+        return;
+    }
+#endif
+
+    appendFile(fileItem->path(), shouldGenerateFile);
+}
+
 #if ENABLE(BLOB_SLICE)
 void FormData::appendFileRange(const String& filename, long long start, long long length, double expectedModificationTime, bool shouldGenerateFile)
@@ -168 +203 @@
 #endif
 
-void FormData::appendDOMFormData(const DOMFormData& domFormData, bool isMultiPartForm, Document* document)
+void FormData::appendKeyValuePairItems(const BlobItemList& items, const TextEncoding& encoding, bool isMultiPartForm, Document* document)
 {
     FormDataBuilder formDataBuilder;
@@ -175 +210 @@
 
     Vector<char> encodedData;
-    TextEncoding encoding = domFormData.encoding();
-
-    const Vector<FormDataList::Item>& list = domFormData.list();
-    size_t formDataListSize = list.size();
+
+    size_t formDataListSize = items.size();
     ASSERT(!(formDataListSize % 2));
     for (size_t i = 0; i < formDataListSize; i += 2) {
-        const FormDataList::Item& key = list[i];
-        const FormDataList::Item& value = list[i + 1];
+        const StringBlobItem* key = items[i]->toStringBlobItem();
+        const BlobItem* value = items[i + 1].get();
+        ASSERT(key);
         if (isMultiPartForm) {
             Vector<char> header;
-            formDataBuilder.beginMultiPartHeader(header, m_boundary.data(), key.data());
+            formDataBuilder.beginMultiPartHeader(header, m_boundary.data(), key->cstr());
 
             bool shouldGenerateFile = false;
             // If the current type is FILE, then we also need to include the filename
-            if (value.blob()) {
-                const String& path = value.blob()->path();
-#if ENABLE(BLOB_SLICE)
-                String fileName;
-                if (value.blob()->isFile())
-                    fileName = static_cast<File*>(value.blob())->fileName();
-                else {
-                    // If a blob is sliced from a file, it does not have the filename. In this case, let's produce a unique filename.
-                    fileName = "Blob" + createCanonicalUUIDString();
-                    fileName.replace("-", ""); // For safty, remove '-' from the filename snce some servers may not like it.
-                }
-#else
-                ASSERT(value.blob()->isFile());
-                String fileName = static_cast<File*>(value.blob())->fileName();
-#endif
+            const FileBlobItem* fileItem = value->toFileBlobItem();
+            if (fileItem) {
+                const String& path = fileItem->path();
+                String fileName = fileItem->name();
 
                 // Let the application specify a filename if it's going to generate a replacement file for the upload.
@@ -218 +241 @@
                 formDataBuilder.addFilenameToMultiPartHeader(header, encoding, fileName);
 
-                // If a blob is sliced from a file, do not add the content type. 
-#if ENABLE(BLOB_SLICE)
-                if (!fileName.isEmpty() && value.blob()->isFile()) {
+                // If the item is sliced from a file, do not add the content type.
+#if ENABLE(BLOB_SLICE)
+                if (!fileName.isEmpty() && !value->toFileRangeBlobItem()) {
 #else
                 if (!fileName.isEmpty()) {
@@ -238 +261 @@
             // Append body
             appendData(header.data(), header.size());
-            if (size_t dataSize = value.data().length())
-                appendData(value.data().data(), dataSize);
-            else if (value.blob() && !value.blob()->path().isEmpty())
-#if ENABLE(BLOB_SLICE)
-                appendFileRange(value.blob()->path(), value.blob()->start(), value.blob()->length(), value.blob()->modificationTime(), shouldGenerateFile);
-#else
-                appendFile(value.blob()->path(), shouldGenerateFile);
-#endif
-
+            appendItem(value, shouldGenerateFile);
             appendData("\r\n", 2);
         } else {
             // Omit the name "isindex" if it's the first form data element.
             // FIXME: Why is this a good rule? Is this obsolete now?
-            if (encodedData.isEmpty() && key.data() == "isindex")
-                FormDataBuilder::encodeStringAsFormData(encodedData, value.data());
+            const StringBlobItem* stringValue = value->toStringBlobItem();
+            if (!stringValue)
+                continue;
+            if (encodedData.isEmpty() && key->cstr() == "isindex")
+                FormDataBuilder::encodeStringAsFormData(encodedData, stringValue->cstr());
             else
-                formDataBuilder.addKeyValuePairAsFormData(encodedData, key.data(), value.data());
-        }
-    } 
+                formDataBuilder.addKeyValuePairAsFormData(encodedData, key->cstr(), stringValue->cstr());
+        }
+    }
 
     if (isMultiPartForm)
@@ -271 +289 @@
     for (size_t i = 0; i < n; ++i) {
         const FormDataElement& e = m_elements[i];
-        if (e.m_type == FormDataElement::data) {
-            size_t oldSize = data.size();
-            size_t delta = e.m_data.size();
-            data.grow(oldSize + delta);
-            memcpy(data.data() + oldSize, e.m_data.data(), delta);
-        }
+        if (e.m_type == FormDataElement::data)
+            data.append(e.m_data.data(), static_cast<size_t>(e.m_data.size()));
     }
 }
@@ -290 +304 @@
 {
     ASSERT(!m_hasGeneratedFiles);
-    
+
     if (m_hasGeneratedFiles)
         return;
-    
+
     Page* page = document->page();
     if (!page)
@@ -313 +327 @@
     if (!m_hasGeneratedFiles)
         return;
-        
+
     size_t n = m_elements.size();
     for (size_t i = 0; i < n; ++i) {

trunk/WebCore/platform/network/FormData.h

@@ -27 +27 @@
 namespace WebCore {
 
-class DOMFormData;
+class BlobItem;
 class Document;
+class TextEncoding;
+typedef Vector<RefPtr<BlobItem> > BlobItemList;
 
 class FormDataElement {
@@ -34 +36 @@
     FormDataElement() : m_type(data) { }
     FormDataElement(const Vector<char>& array) : m_type(data), m_data(array) { }
+
 #if ENABLE(BLOB_SLICE)
     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) { }
@@ -50 +53 @@
     String m_generatedFilename;
     bool m_shouldGenerateFile;
+
+#if ENABLE(BLOB_SLICE)
+    static const long long toEndOfFile;
+    static const double doNotCheckFileChange;
+#endif
 };
 
@@ -56 +64 @@
     if (&a == &b)
         return true;
-    
+
     if (a.m_type != b.m_type)
         return false;
@@ -70 +78 @@
     return true;
 }
- 
+
 inline bool operator!=(const FormDataElement& a, const FormDataElement& b)
 {
     return !(a == b);
 }
- 
+
 class FormData : public RefCounted<FormData> {
 public:
@@ -82 +90 @@
     static PassRefPtr<FormData> create(const WTF::CString&);
     static PassRefPtr<FormData> create(const Vector<char>&);
-    static PassRefPtr<FormData> create(const DOMFormData&);
-    static PassRefPtr<FormData> createMultiPart(const DOMFormData&, Document*);
+    static PassRefPtr<FormData> create(const BlobItemList&, const TextEncoding&);
+    static PassRefPtr<FormData> createMultiPart(const BlobItemList&, const TextEncoding&, Document*);
     PassRefPtr<FormData> copy() const;
     PassRefPtr<FormData> deepCopy() const;
     ~FormData();
-    
+
     void appendData(const void* data, size_t);
+    void appendItems(const BlobItemList&);
     void appendFile(const String& filename, bool shouldGenerateFile = false);
 #if ENABLE(BLOB_SLICE)
@@ -116 +125 @@
     FormData(const FormData&);
 
-    void appendDOMFormData(const DOMFormData& domFormData, bool isMultiPartForm, Document* document);
+    void appendItem(const BlobItem*, bool shouldGenerateFile);
+    void appendKeyValuePairItems(const BlobItemList&, const TextEncoding&, bool isMultiPartForm, Document*);
 
     Vector<FormDataElement> m_elements;
+
     int64_t m_identifier;
     bool m_hasGeneratedFiles;
@@ -132 +143 @@
 inline bool operator!=(const FormData& a, const FormData& b)
 {
-    return a.elements() != b.elements();
+    return !(a == b);
 }
 

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

@@ -32 +32 @@
 #import "FormDataStreamMac.h"
 
-#import "Blob.h"
 #import "FileSystem.h"
 #import "FormData.h"
@@ -143 +142 @@
         form->currentStream = NULL;
 #if ENABLE(BLOB_SLICE)
-        form->currentStreamRangeLength = Blob::toEndOfFile;
+        form->currentStreamRangeLength = FormDataElement::toEndOfFile;
 #endif
     }
@@ -152 +151 @@
 }
 
-// Return false if we cannot advance the stream. Currently the only possible failure is that the underlying file has been changed since File.slice. 
+// Return false if we cannot advance the stream. Currently the only possible failure is that the underlying file has been removed or changed since File.slice.
 static bool advanceCurrentStream(FormStreamFields* form)
 {
@@ -162 +161 @@
     // Create the new stream.
     FormDataElement& nextInput = form->remainingElements.last();
+
     if (nextInput.m_type == FormDataElement::data) {
         size_t size = nextInput.m_data.size();
@@ -170 +170 @@
 #if ENABLE(BLOB_SLICE)
         // Check if the file has been changed or not if required.
-        if (nextInput.m_expectedFileModificationTime != Blob::doNotCheckFileChange) {
+        if (nextInput.m_expectedFileModificationTime != FormDataElement::doNotCheckFileChange) {
             time_t fileModificationTime;
             if (!getFileModificationTime(nextInput.m_filename, fileModificationTime) || fileModificationTime != static_cast<time_t>(nextInput.m_expectedFileModificationTime))
@@ -176 +176 @@
         }
 #endif
-
         const String& path = nextInput.m_shouldGenerateFile ? nextInput.m_generatedFilename : nextInput.m_filename;
         RetainPtr<CFStringRef> filename(AdoptCF, path.createCFString());
         RetainPtr<CFURLRef> fileURL(AdoptCF, CFURLCreateWithFileSystemPath(0, filename.get(), kCFURLPOSIXPathStyle, FALSE));
         form->currentStream = CFReadStreamCreateWithFile(0, fileURL.get());
+        if (!form->currentStream) {
+            // The file must have been removed or become unreadable.
+            return false;
+        }
 #if ENABLE(BLOB_SLICE)
         if (nextInput.m_fileStart > 0) {
@@ -223 +226 @@
     newInfo->currentStream = NULL;
 #if ENABLE(BLOB_SLICE)
-    newInfo->currentStreamRangeLength = Blob::toEndOfFile;
+    newInfo->currentStreamRangeLength = FormDataElement::toEndOfFile;
 #endif
     newInfo->currentData = 0;
@@ -271 +274 @@
         CFIndex bytesToRead = bufferLength;
 #if ENABLE(BLOB_SLICE)
-        if (form->currentStreamRangeLength != Blob::toEndOfFile && form->currentStreamRangeLength < bytesToRead)
+        if (form->currentStreamRangeLength != FormDataElement::toEndOfFile && form->currentStreamRangeLength < bytesToRead)
             bytesToRead = static_cast<CFIndex>(form->currentStreamRangeLength);
 #endif
@@ -284 +287 @@
             form->bytesSent += bytesRead;
 #if ENABLE(BLOB_SLICE)
-            if (form->currentStreamRangeLength != Blob::toEndOfFile)
+            if (form->currentStreamRangeLength != FormDataElement::toEndOfFile)
                 form->currentStreamRangeLength -= bytesRead;
 #endif
@@ -401 +404 @@
 #if ENABLE(BLOB_SLICE)
             // If we're sending the file range, use the existing range length for now. We will detect if the file has been changed right before we read the file and abort the operation if necessary.
-            if (element.m_fileLength != Blob::toEndOfFile) {
+            if (element.m_fileLength != FormDataElement::toEndOfFile) {
                 length += element.m_fileLength;
                 continue;

trunk/WebCore/xml/XMLHttpRequest.cpp

@@ -479 +479 @@
         // FIXME: add support for uploading bundles.
         m_requestEntityBody = FormData::create();
-#if ENABLE(BLOB_SLICE)
-        m_requestEntityBody->appendFileRange(body->path(), body->start(), body->length(), body->modificationTime());
-#else
-        m_requestEntityBody->appendFile(body->path(), false);
-#endif
+        m_requestEntityBody->appendItems(body->items());
     }
 
@@ -495 +491 @@
 
     if (m_method != "GET" && m_method != "HEAD" && m_url.protocolInHTTPFamily()) {
-        m_requestEntityBody = FormData::createMultiPart(*body, document());
+        m_requestEntityBody = FormData::createMultiPart(body->items(), body->encoding(), document());
 
         // We need to ask the client to provide the generated file names if needed. When FormData fills the element

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-06-07  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Refactor FormData and Blob for better support of Blobs synthesized by BlobBuilder.
+        https://bugs.webkit.org/show_bug.cgi?id=39083
+
+        Replace FormDataList::Item list with BlobItemList to get it compiled
+        with the refactoring in FormDataList.
+
+        * src/WebSearchableFormData.cpp:
+        (WebCore::HasSuitableTextElement):
+
 2010-06-07  Andrei Popescu  <andreip@google.com>
 

trunk/WebKit/chromium/src/WebSearchableFormData.cpp

@@ -188 +188 @@
           continue;
 
-      const Vector<FormDataList::Item>& itemList = dataList.list();
-      if (isTextElement && !itemList.isEmpty()) {
+      const BlobItemList& items = dataList.items();
+      if (isTextElement && !items.isEmpty()) {
           if (textElement) {
               // The auto-complete bar only knows how to fill in one value.
@@ -197 +197 @@
           textElement = static_cast<HTMLInputElement*>(formElement);
       }
-      for (Vector<FormDataList::Item>::const_iterator j(itemList.begin()); j != itemList.end(); ++j) {
+      for (BlobItemList::const_iterator j(items.begin()); j != items.end(); ++j) {
+          const StringBlobItem* item = (*j)->toStringBlobItem();
+          ASSERT(item);
           // Handle ISINDEX / <input name=isindex> specially, but only if it's
           // the first entry.
-          if (!encodedString->isEmpty() || j->data() != "isindex") {
+          if (!encodedString->isEmpty() || item->cstr() != "isindex") {
               if (!encodedString->isEmpty())
                   encodedString->append('&');
-              FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
+              FormDataBuilder::encodeStringAsFormData(*encodedString, item->cstr());
               encodedString->append('=');
           }
@@ -210 +212 @@
               encodedString->append("{searchTerms}", 13);
           else
-              FormDataBuilder::encodeStringAsFormData(*encodedString, j->data());
+              FormDataBuilder::encodeStringAsFormData(*encodedString, item->cstr());
       }
     }