diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 13:28:06 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-15 13:28:06 +0000 |
| commit | a10578310f22a457c56b761f6f420cdee20d6688 (patch) | |
| tree | 85369385458b2ead7d1c1cac25ea9ce376c50625 /webkit/chromeos | |
| parent | 3704abce04bb84f24dbb2b8a2c25b28f0f3c2357 (diff) | |
| download | chromium_src-a10578310f22a457c56b761f6f420cdee20d6688.zip chromium_src-a10578310f22a457c56b761f6f420cdee20d6688.tar.gz chromium_src-a10578310f22a457c56b761f6f420cdee20d6688.tar.bz2 | |
fileapi: Add modification time check for FileSystemFileStreamReader
The check is added since BlobData has expected_modification_time field.
Add tests (mostly copied from LocalFileStreamReaderTest).
BUG=141835
TEST=content_unittests --gtest_filter="FileSystemFileStreamReaderTest.*"
TBR=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11098067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161853 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/chromeos')
| -rw-r--r-- | webkit/chromeos/fileapi/cros_mount_point_provider.cc | 4 | ||||
| -rw-r--r-- | webkit/chromeos/fileapi/cros_mount_point_provider.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc index 978eb11..2d0c12e1 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc @@ -270,11 +270,13 @@ fileapi::FileSystemOperation* CrosMountPointProvider::CreateFileSystemOperation( webkit_blob::FileStreamReader* CrosMountPointProvider::CreateFileStreamReader( const fileapi::FileSystemURL& url, int64 offset, + const base::Time& expected_modification_time, fileapi::FileSystemContext* context) const { // For now we return a generic Reader implementation which utilizes // CreateSnapshotFile internally (i.e. will download everything first). // TODO(satorux,zel): implement more efficient reader for remote cases. - return new fileapi::FileSystemFileStreamReader(context, url, offset); + return new fileapi::FileSystemFileStreamReader( + context, url, offset, expected_modification_time); } fileapi::FileStreamWriter* CrosMountPointProvider::CreateFileStreamWriter( diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.h b/webkit/chromeos/fileapi/cros_mount_point_provider.h index 8c76db0..ad7c45a 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.h +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.h @@ -67,6 +67,7 @@ class FILEAPI_EXPORT CrosMountPointProvider virtual webkit_blob::FileStreamReader* CreateFileStreamReader( const fileapi::FileSystemURL& path, int64 offset, + const base::Time& expected_modification_time, fileapi::FileSystemContext* context) const OVERRIDE; virtual fileapi::FileStreamWriter* CreateFileStreamWriter( const fileapi::FileSystemURL& url, |