summaryrefslogtreecommitdiffstats
path: root/WebKit/chromium/src/WebHTTPBody.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'WebKit/chromium/src/WebHTTPBody.cpp')
-rw-r--r--WebKit/chromium/src/WebHTTPBody.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/WebKit/chromium/src/WebHTTPBody.cpp b/WebKit/chromium/src/WebHTTPBody.cpp
index e54b4e5..93b94c2 100644
--- a/WebKit/chromium/src/WebHTTPBody.cpp
+++ b/WebKit/chromium/src/WebHTTPBody.cpp
@@ -78,7 +78,9 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
result.filePath.reset();
result.fileStart = 0;
result.fileLength = 0;
+ // FIXME: remove this line once all users of Element have been switched to use 'modificationTime'.
result.fileInfo.modificationTime = 0.0;
+ result.modificationTime = 0.0;
result.blobURL = KURL();
switch (element.m_type) {
@@ -92,7 +94,9 @@ bool WebHTTPBody::elementAt(size_t index, Element& result) const
#if ENABLE(BLOB)
result.fileStart = element.m_fileStart;
result.fileLength = element.m_fileLength;
+ // FIXME: remove this line once all users of Element have been switched to use 'modificationTime'.
result.fileInfo.modificationTime = element.m_expectedFileModificationTime;
+ result.modificationTime = element.m_expectedFileModificationTime;
#endif
break;
#if ENABLE(BLOB)
@@ -123,14 +127,20 @@ void WebHTTPBody::appendFile(const WebString& filePath)
m_private->appendFile(filePath);
}
-void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, const WebFileInfo& fileInfo)
+void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, double modificationTime)
{
#if ENABLE(BLOB)
ensureMutable();
- m_private->appendFileRange(filePath, fileStart, fileLength, fileInfo.modificationTime);
+ m_private->appendFileRange(filePath, fileStart, fileLength, modificationTime);
#endif
}
+// FIXME: Remove this method once all callers have been switched to use the method above.
+void WebHTTPBody::appendFileRange(const WebString& filePath, long long fileStart, long long fileLength, const WebFileInfo& fileInfo)
+{
+ return appendFileRange(filePath, fileStart, fileLength, fileInfo.modificationTime);
+}
+
void WebHTTPBody::appendBlob(const WebURL& blobURL)
{
#if ENABLE(BLOB)