Changeset 158956 in webkit

Timestamp:

Nov 8, 2013 2:09:55 PM (10 years ago)

Author:

zandobersek@gmail.com

Message:

Remove code guarded with ENABLE(STREAM)
​https://bugs.webkit.org/show_bug.cgi?id=123667

Reviewed by Anders Carlsson.

Remove ENABLE(STREAM)-guarded code. This was added in the effort to provide Stream API support, but
no port enables the feature and the work on this feature has wound down after the Chromium port forked,
leaving this code unmaintained.

• fileapi/FileReaderLoader.cpp:
• fileapi/FileReaderLoader.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• fileapi/FileReaderLoader.cpp (modified) (2 diffs)
• fileapi/FileReaderLoader.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-11-08  Zan Dobersek  <zdobersek@igalia.com>
+
+        Remove code guarded with ENABLE(STREAM)
+        https://bugs.webkit.org/show_bug.cgi?id=123667
+
+        Reviewed by Anders Carlsson.
+
+        Remove ENABLE(STREAM)-guarded code. This was added in the effort to provide Stream API support, but
+        no port enables the feature and the work on this feature has wound down after the Chromium port forked,
+        leaving this code unmaintained.
+
+        * fileapi/FileReaderLoader.cpp:
+        * fileapi/FileReaderLoader.h:
+
 2013-11-08  Bem Jones-Bey  <bjonesbe@adobe.com>
 

trunk/Source/WebCore/fileapi/FileReaderLoader.cpp

@@ -273 +273 @@
 }
 
-#if ENABLE(STREAM)
-PassRefPtr<Blob> FileReaderLoader::blobResult()
-{
-    ASSERT(m_readType == ReadAsBlob);
-
-    // If the loading is not finished or an error occurs, return an empty result.
-    if (!m_rawData || m_errorCode || !isCompleted())
-        return 0;
-
-    if (!m_blobResult) {
-        OwnPtr<BlobData> blobData = BlobData::create();
-        size_t size = 0;
-        RefPtr<RawData> rawData = RawData::create();
-        size = m_rawData->byteLength();
-        rawData->mutableData()->append(static_cast<char*>(m_rawData->data()), size);
-        blobData->appendData(rawData, 0, size);
-        blobData->setContentType(m_dataType);
-        m_blobResult = Blob::create(blobData.release(), size);
-    }
-    return m_blobResult;
-}
-#endif // ENABLE(STREAM)
-
 String FileReaderLoader::stringResult()
 {
@@ -383 +360 @@
 }
 
-#if ENABLE(STREAM)
-void FileReaderLoader::setRange(unsigned start, unsigned length)
-{
-    ASSERT(length > 0);
-    m_hasRange = true;
-    m_rangeStart = start;
-    m_rangeEnd = start + length - 1;
-}
-#endif // ENABLE(STREAM)
-
 } // namespace WebCore
  

trunk/Source/WebCore/fileapi/FileReaderLoader.h

@@ -78 +78 @@
     String stringResult();
     PassRefPtr<JSC::ArrayBuffer> arrayBufferResult() const;
-#if ENABLE(STREAM)
-    PassRefPtr<Blob> blobResult();
-#endif // ENABLE(STREAM)
     unsigned bytesLoaded() const { return m_bytesLoaded; }
     unsigned totalBytes() const { return m_totalBytes; }
@@ -87 +84 @@
     void setEncoding(const String&);
     void setDataType(const String& dataType) { m_dataType = dataType; }
-#if ENABLE(STREAM)
-    void setRange(unsigned, unsigned);
-#endif // ENABLE(STREAM)
 
 private: