diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebKit/chromium/src/WebHTTPBody.cpp | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebKit/chromium/src/WebHTTPBody.cpp')
| -rw-r--r-- | WebKit/chromium/src/WebHTTPBody.cpp | 14 |
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) |