Title: [158956] trunk/Source/WebCore
- Revision
- 158956
- Author
- [email protected]
- Date
- 2013-11-08 14:09:55 -0800 (Fri, 08 Nov 2013)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158955 => 158956)
--- trunk/Source/WebCore/ChangeLog 2013-11-08 22:04:43 UTC (rev 158955)
+++ trunk/Source/WebCore/ChangeLog 2013-11-08 22:09:55 UTC (rev 158956)
@@ -1,3 +1,17 @@
+2013-11-08 Zan Dobersek <[email protected]>
+
+ 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 <[email protected]>
RenderBlockFlow::nextFloatLogicalBottomBelow should not use ShapeOutsideFloatOffsetMode
Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (158955 => 158956)
--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2013-11-08 22:04:43 UTC (rev 158955)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2013-11-08 22:09:55 UTC (rev 158956)
@@ -272,29 +272,6 @@
return ArrayBuffer::create(m_rawData.get());
}
-#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()
{
ASSERT(m_readType != ReadAsArrayBuffer && m_readType != ReadAsBlob);
@@ -382,16 +359,6 @@
m_encoding = TextEncoding(encoding);
}
-#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
#endif // ENABLE(BLOB)
Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.h (158955 => 158956)
--- trunk/Source/WebCore/fileapi/FileReaderLoader.h 2013-11-08 22:04:43 UTC (rev 158955)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.h 2013-11-08 22:09:55 UTC (rev 158956)
@@ -77,18 +77,12 @@
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; }
int errorCode() const { return m_errorCode; }
void setEncoding(const String&);
void setDataType(const String& dataType) { m_dataType = dataType; }
-#if ENABLE(STREAM)
- void setRange(unsigned, unsigned);
-#endif // ENABLE(STREAM)
private:
void terminate();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
