Title: [144212] trunk/Source/WebCore
- Revision
- 144212
- Author
- [email protected]
- Date
- 2013-02-27 10:38:44 -0800 (Wed, 27 Feb 2013)
Log Message
Add ENABLE_STREAM guards to FileReaderLoader
https://bugs.webkit.org/show_bug.cgi?id=110938
Patch by Zach Kuznia <[email protected]> on 2013-02-27
Reviewed by Hajime Morrita.
* fileapi/FileReaderLoader.cpp:
* fileapi/FileReaderLoader.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (144211 => 144212)
--- trunk/Source/WebCore/ChangeLog 2013-02-27 18:38:27 UTC (rev 144211)
+++ trunk/Source/WebCore/ChangeLog 2013-02-27 18:38:44 UTC (rev 144212)
@@ -1,3 +1,13 @@
+2013-02-27 Zach Kuznia <[email protected]>
+
+ Add ENABLE_STREAM guards to FileReaderLoader
+ https://bugs.webkit.org/show_bug.cgi?id=110938
+
+ Reviewed by Hajime Morrita.
+
+ * fileapi/FileReaderLoader.cpp:
+ * fileapi/FileReaderLoader.h:
+
2013-02-27 Allan Sandfeld Jensen <[email protected]>
Switch QtWebKit to GStreamer 1.0.
Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (144211 => 144212)
--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2013-02-27 18:38:27 UTC (rev 144211)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2013-02-27 18:38:44 UTC (rev 144212)
@@ -274,6 +274,7 @@
return ArrayBuffer::create(m_rawData.get());
}
+#if ENABLE(STREAM)
PassRefPtr<Blob> FileReaderLoader::blobResult()
{
ASSERT(m_readType == ReadAsBlob);
@@ -294,6 +295,7 @@
}
return m_blobResult;
}
+#endif // ENABLE(STREAM)
String FileReaderLoader::stringResult()
{
@@ -382,6 +384,7 @@
m_encoding = TextEncoding(encoding);
}
+#if ENABLE(STREAM)
void FileReaderLoader::setRange(unsigned start, unsigned length)
{
ASSERT(length > 0);
@@ -389,6 +392,7 @@
m_rangeStart = start;
m_rangeEnd = start + length - 1;
}
+#endif // ENABLE(STREAM)
} // namespace WebCore
Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.h (144211 => 144212)
--- trunk/Source/WebCore/fileapi/FileReaderLoader.h 2013-02-27 18:38:27 UTC (rev 144211)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.h 2013-02-27 18:38:44 UTC (rev 144212)
@@ -73,14 +73,18 @@
String stringResult();
PassRefPtr<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
