summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/file_util_proxy.cc57
-rw-r--r--base/file_util_proxy.h13
-rw-r--r--chrome/browser/file_system/file_system_dispatcher_host.cc6
-rw-r--r--chrome/common/file_system/file_system_dispatcher.cc3
-rw-r--r--chrome/common/file_system/webfilesystem_callback_dispatcher.cc37
-rw-r--r--chrome/common/file_system/webfilesystem_callback_dispatcher.h1
-rw-r--r--webkit/fileapi/file_system_callback_dispatcher.h3
-rw-r--r--webkit/fileapi/file_system_operation.cc101
-rw-r--r--webkit/fileapi/file_system_operation.h31
-rw-r--r--webkit/fileapi/file_system_operation_unittest.cc58
-rw-r--r--webkit/glue/plugins/pepper_file_system.cc8
-rw-r--r--webkit/tools/test_shell/simple_file_system.cc2
12 files changed, 229 insertions, 91 deletions
diff --git a/base/file_util_proxy.cc b/base/file_util_proxy.cc
index 7f7b03a..d71f374 100644
--- a/base/file_util_proxy.cc
+++ b/base/file_util_proxy.cc
@@ -498,7 +498,7 @@ class RelayRead : public MessageLoopRelay {
class RelayWrite : public MessageLoopRelay {
public:
RelayWrite(base::PlatformFile file,
- long long offset,
+ int64 offset,
const char* buffer,
int bytes_to_write,
base::FileUtilProxy::ReadWriteCallback* callback)
@@ -582,11 +582,11 @@ class RelayTouchFilePath : public RelayWithStatusCallback {
base::Time last_modified_time_;
};
-class RelayTruncate : public RelayWithStatusCallback {
+class RelayTruncatePlatformFile : public RelayWithStatusCallback {
public:
- RelayTruncate(base::PlatformFile file,
- int64 length,
- base::FileUtilProxy::StatusCallback* callback)
+ RelayTruncatePlatformFile(base::PlatformFile file,
+ int64 length,
+ base::FileUtilProxy::StatusCallback* callback)
: RelayWithStatusCallback(callback),
file_(file),
length_(length) {
@@ -603,6 +603,39 @@ class RelayTruncate : public RelayWithStatusCallback {
int64 length_;
};
+class RelayTruncate : public RelayWithStatusCallback {
+ public:
+ RelayTruncate(const FilePath& path,
+ int64 length,
+ base::FileUtilProxy::StatusCallback* callback)
+ : RelayWithStatusCallback(callback),
+ path_(path),
+ length_(length) {
+ }
+
+ protected:
+ virtual void RunWork() {
+ base::PlatformFileError error_code(base::PLATFORM_FILE_ERROR_FAILED);
+ base::PlatformFile file =
+ base::CreatePlatformFile(
+ path_,
+ base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_WRITE,
+ NULL,
+ &error_code);
+ if (error_code != base::PLATFORM_FILE_OK) {
+ set_error_code(error_code);
+ return;
+ }
+ if (!base::TruncatePlatformFile(file, length_))
+ set_error_code(base::PLATFORM_FILE_ERROR_FAILED);
+ base::ClosePlatformFile(file);
+ }
+
+ private:
+ FilePath path_;
+ int64 length_;
+};
+
class RelayFlush : public RelayWithStatusCallback {
public:
RelayFlush(base::PlatformFile file,
@@ -782,10 +815,20 @@ bool FileUtilProxy::Touch(
bool FileUtilProxy::Truncate(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
PlatformFile file,
- long long length,
+ int64 length,
+ StatusCallback* callback) {
+ return Start(FROM_HERE, message_loop_proxy,
+ new RelayTruncatePlatformFile(file, length, callback));
+}
+
+// static
+bool FileUtilProxy::Truncate(
+ scoped_refptr<MessageLoopProxy> message_loop_proxy,
+ const FilePath& path,
+ int64 length,
StatusCallback* callback) {
return Start(FROM_HERE, message_loop_proxy,
- new RelayTruncate(file, length, callback));
+ new RelayTruncate(path, length, callback));
}
// static
diff --git a/base/file_util_proxy.h b/base/file_util_proxy.h
index 081c11b..32b78630 100644
--- a/base/file_util_proxy.h
+++ b/base/file_util_proxy.h
@@ -138,7 +138,7 @@ class FileUtilProxy {
// Writes to a file. If |offset| is greater than the length of the file,
// |false| is returned. On success, the file pointer is moved to position
- // |offset + bytes_to_write| in the file. If The callback can be NULL.
+ // |offset + bytes_to_write| in the file. The callback can be NULL.
static bool Write(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
base::PlatformFile file,
@@ -169,7 +169,16 @@ class FileUtilProxy {
static bool Truncate(
scoped_refptr<MessageLoopProxy> message_loop_proxy,
base::PlatformFile file,
- long long length,
+ int64 length,
+ StatusCallback* callback);
+
+ // Truncates a file to the given length. If |length| is greater than the
+ // current length of the file, the file will be extended with zeroes.
+ // The callback can be NULL.
+ static bool Truncate(
+ scoped_refptr<MessageLoopProxy> message_loop_proxy,
+ const FilePath& path,
+ int64 length,
StatusCallback* callback);
// Flushes a file. The callback can be NULL.
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.cc b/chrome/browser/file_system/file_system_dispatcher_host.cc
index 18daec8..6dd6072 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.cc
+++ b/chrome/browser/file_system/file_system_dispatcher_host.cc
@@ -238,9 +238,11 @@ void FileSystemDispatcherHost::OnCancel(
fileapi::FileSystemOperation* write =
operations_.Lookup(request_id_to_cancel);
if (write) {
- write->Cancel();
- Send(new ViewMsg_FileSystem_DidSucceed(request_id));
+ // The cancel will eventually send both the write failure and the cancel
+ // success.
+ write->Cancel(GetNewOperation(request_id));
} else {
+ // The write already finished; report that we failed to stop it.
Send(new ViewMsg_FileSystem_DidFail(
request_id, base::PLATFORM_FILE_ERROR_INVALID_OPERATION));
}
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/chrome/common/file_system/file_system_dispatcher.cc
index e9bc96e..a8761a2 100644
--- a/chrome/common/file_system/file_system_dispatcher.cc
+++ b/chrome/common/file_system/file_system_dispatcher.cc
@@ -215,8 +215,7 @@ void FileSystemDispatcher::DidWrite(
fileapi::FileSystemCallbackDispatcher* dispatcher =
dispatchers_.Lookup(request_id);
DCHECK(dispatcher);
- // TODO(ericu): Coming soon.
- // dispatcher->DidWrite(bytes, complete);
+ dispatcher->DidWrite(bytes, complete);
if (complete)
dispatchers_.Remove(request_id);
}
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
index c68ff18..bf8d901 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -18,30 +18,6 @@ using WebKit::WebFileSystemEntry;
using WebKit::WebString;
using WebKit::WebVector;
-namespace {
-
-WebKit::WebFileError PlatformFileErrorToWebFileError(
- base::PlatformFileError error_code) {
- switch (error_code) {
- case base::PLATFORM_FILE_ERROR_NOT_FOUND:
- return WebKit::WebFileErrorNotFound;
- case base::PLATFORM_FILE_ERROR_INVALID_OPERATION:
- case base::PLATFORM_FILE_ERROR_EXISTS:
- case base::PLATFORM_FILE_ERROR_NOT_A_DIRECTORY:
- return WebKit::WebFileErrorInvalidModification;
- case base::PLATFORM_FILE_ERROR_ACCESS_DENIED:
- return WebKit::WebFileErrorNoModificationAllowed;
- case base::PLATFORM_FILE_ERROR_FAILED:
- return WebKit::WebFileErrorInvalidState;
- case base::PLATFORM_FILE_ERROR_ABORT:
- return WebKit::WebFileErrorAbort;
- default:
- return WebKit::WebFileErrorInvalidModification;
- }
-}
-
-}
-
WebFileSystemCallbackDispatcher::WebFileSystemCallbackDispatcher(
WebFileSystemCallbacks* callbacks)
: callbacks_(callbacks) {
@@ -56,6 +32,11 @@ void WebFileSystemCallbackDispatcher::DidReadMetadata(
const base::PlatformFileInfo& file_info) {
WebFileInfo web_file_info;
web_file_info.modificationTime = file_info.last_modified.ToDoubleT();
+ web_file_info.length = file_info.size;
+ if (file_info.is_directory)
+ web_file_info.type = WebFileInfo::TypeDirectory;
+ else
+ web_file_info.type = WebFileInfo::TypeFile;
callbacks_->didReadMetadata(web_file_info);
}
@@ -78,5 +59,11 @@ void WebFileSystemCallbackDispatcher::DidOpenFileSystem(
void WebFileSystemCallbackDispatcher::DidFail(
base::PlatformFileError error_code) {
- callbacks_->didFail(PlatformFileErrorToWebFileError(error_code));
+ callbacks_->didFail(
+ webkit_glue::PlatformFileErrorToWebFileError(error_code));
}
+
+void WebFileSystemCallbackDispatcher::DidWrite(int64 bytes, bool complete) {
+ NOTREACHED();
+}
+
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.h b/chrome/common/file_system/webfilesystem_callback_dispatcher.h
index ade811b..075d5bb 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/chrome/common/file_system/webfilesystem_callback_dispatcher.h
@@ -34,6 +34,7 @@ class WebFileSystemCallbackDispatcher
virtual void DidOpenFileSystem(const std::string&,
const FilePath&);
virtual void DidFail(base::PlatformFileError);
+ virtual void DidWrite(int64 bytes, bool complete);
private:
WebKit::WebFileSystemCallbacks* callbacks_;
diff --git a/webkit/fileapi/file_system_callback_dispatcher.h b/webkit/fileapi/file_system_callback_dispatcher.h
index c85c68a..e33dd69 100644
--- a/webkit/fileapi/file_system_callback_dispatcher.h
+++ b/webkit/fileapi/file_system_callback_dispatcher.h
@@ -41,6 +41,9 @@ class FileSystemCallbackDispatcher {
// Called with an error code when a requested operation has failed.
virtual void DidFail(base::PlatformFileError error_code) = 0;
+
+ // Callback for FileWriter's write() call.
+ virtual void DidWrite(int64 bytes, bool complete) = 0;
};
} // namespace fileapi
diff --git a/webkit/fileapi/file_system_operation.cc b/webkit/fileapi/file_system_operation.cc
index 140ade4..e636420 100644
--- a/webkit/fileapi/file_system_operation.cc
+++ b/webkit/fileapi/file_system_operation.cc
@@ -15,10 +15,11 @@ FileSystemOperation::FileSystemOperation(
scoped_refptr<base::MessageLoopProxy> proxy)
: proxy_(proxy),
dispatcher_(dispatcher),
- callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
+ cancel_operation_(NULL) {
DCHECK(dispatcher);
#ifndef NDEBUG
- operation_pending_ = false;
+ pending_operation_ = kOperationNone;
#endif
}
@@ -28,8 +29,8 @@ FileSystemOperation::~FileSystemOperation() {
void FileSystemOperation::CreateFile(const FilePath& path,
bool exclusive) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationCreateFile;
#endif
base::FileUtilProxy::CreateOrOpen(
@@ -43,8 +44,8 @@ void FileSystemOperation::CreateDirectory(const FilePath& path,
bool exclusive,
bool recursive) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationCreateDirectory;
#endif
base::FileUtilProxy::CreateDirectory(
@@ -55,8 +56,8 @@ void FileSystemOperation::CreateDirectory(const FilePath& path,
void FileSystemOperation::Copy(const FilePath& src_path,
const FilePath& dest_path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationCopy;
#endif
base::FileUtilProxy::Copy(proxy_, src_path, dest_path,
@@ -67,8 +68,8 @@ void FileSystemOperation::Copy(const FilePath& src_path,
void FileSystemOperation::Move(const FilePath& src_path,
const FilePath& dest_path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationMove;
#endif
base::FileUtilProxy::Move(proxy_, src_path, dest_path,
@@ -78,8 +79,8 @@ void FileSystemOperation::Move(const FilePath& src_path,
void FileSystemOperation::DirectoryExists(const FilePath& path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationDirectoryExists;
#endif
base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
@@ -88,8 +89,8 @@ void FileSystemOperation::DirectoryExists(const FilePath& path) {
void FileSystemOperation::FileExists(const FilePath& path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationFileExists;
#endif
base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
@@ -98,8 +99,8 @@ void FileSystemOperation::FileExists(const FilePath& path) {
void FileSystemOperation::GetMetadata(const FilePath& path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationGetMetadata;
#endif
base::FileUtilProxy::GetFileInfo(proxy_, path, callback_factory_.NewCallback(
@@ -108,8 +109,8 @@ void FileSystemOperation::GetMetadata(const FilePath& path) {
void FileSystemOperation::ReadDirectory(const FilePath& path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationReadDirectory;
#endif
base::FileUtilProxy::ReadDirectory(proxy_, path,
@@ -119,8 +120,8 @@ void FileSystemOperation::ReadDirectory(const FilePath& path) {
void FileSystemOperation::Remove(const FilePath& path) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationRemove;
#endif
base::FileUtilProxy::Delete(proxy_, path, callback_factory_.NewCallback(
@@ -128,36 +129,32 @@ void FileSystemOperation::Remove(const FilePath& path) {
}
void FileSystemOperation::Write(
- const FilePath&,
- const GURL&,
- int64) {
+ const FilePath& path,
+ const GURL& blob_url,
+ int64 offset) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationWrite;
#endif
NOTREACHED();
- // TODO(ericu):
- // Set up a loop that, via multiple callback invocations, reads from a
- // URLRequest wrapping blob_url, writes the bytes to the file, reports
- // progress events no more frequently than some set rate, and periodically
- // checks to see if it's been cancelled.
}
void FileSystemOperation::Truncate(const FilePath& path, int64 length) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationTruncate;
#endif
- // TODO(ericu):
- NOTREACHED();
+ base::FileUtilProxy::Truncate(proxy_, path, length,
+ callback_factory_.NewCallback(
+ &FileSystemOperation::DidFinishFileOperation));
}
void FileSystemOperation::TouchFile(const FilePath& path,
const base::Time& last_access_time,
const base::Time& last_modified_time) {
#ifndef NDEBUG
- DCHECK(!operation_pending_);
- operation_pending_ = true;
+ DCHECK(kOperationNone == pending_operation_);
+ pending_operation_ = kOperationTouchFile;
#endif
base::FileUtilProxy::Touch(
@@ -165,15 +162,18 @@ void FileSystemOperation::TouchFile(const FilePath& path,
callback_factory_.NewCallback(&FileSystemOperation::DidTouchFile));
}
-void FileSystemOperation::Cancel() {
+// We can only get here on a write or truncate that's not yet completed.
+// We don't support cancelling any other operation at this time.
+void FileSystemOperation::Cancel(FileSystemOperation* cancel_operation) {
#ifndef NDEBUG
- DCHECK(operation_pending_);
+ DCHECK(kOperationTruncate == pending_operation_);
+ // FIXME(ericu): Cancelling for writes coming soon.
#endif
- NOTREACHED();
- // TODO(ericu):
- // Make sure this was done on a FileSystemOperation used for a Write.
- // Then set a flag that ensures that the Write loop will exit without
- // reporting any more progress, with a failure notification.
+ // We're cancelling a truncate operation, but we can't actually stop it
+ // since it's been proxied to another thread. We need to save the
+ // cancel_operation so that when the truncate returns, it can see that it's
+ // been cancelled, report it, and report that the cancel has succeeded.
+ cancel_operation_ = cancel_operation;
}
void FileSystemOperation::DidCreateFileExclusive(
@@ -197,10 +197,19 @@ void FileSystemOperation::DidCreateFileNonExclusive(
void FileSystemOperation::DidFinishFileOperation(
base::PlatformFileError rv) {
- if (rv == base::PLATFORM_FILE_OK)
+ if (cancel_operation_) {
+#ifndef NDEBUG
+ DCHECK(kOperationTruncate == pending_operation_);
+#endif
+ FileSystemOperation *cancel_op = cancel_operation_;
+ // This call deletes us, so we have to extract cancel_op first.
+ dispatcher_->DidFail(base::PLATFORM_FILE_ERROR_ABORT);
+ cancel_op->dispatcher_->DidSucceed();
+ } else if (rv == base::PLATFORM_FILE_OK) {
dispatcher_->DidSucceed();
- else
+ } else {
dispatcher_->DidFail(rv);
+ }
}
void FileSystemOperation::DidDirectoryExists(
@@ -250,7 +259,7 @@ void FileSystemOperation::DidWrite(
int64 bytes,
bool complete) {
if (rv == base::PLATFORM_FILE_OK)
- /* dispatcher_->DidWrite(bytes, complete) TODO(ericu): Coming soon. */ {}
+ dispatcher_->DidWrite(bytes, complete);
else
dispatcher_->DidFail(rv);
}
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index 1107303..ab6d56c 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -61,8 +61,7 @@ class FileSystemOperation {
void Remove(const FilePath& path);
- void Write(
- const FilePath& path, const GURL& blob_url, int64 offset);
+ void Write(const FilePath& path, const GURL& blob_url, int64 offset);
void Truncate(const FilePath& path, int64 length);
@@ -70,9 +69,10 @@ class FileSystemOperation {
const base::Time& last_access_time,
const base::Time& last_modified_time);
- // Used to attempt to cancel the current operation. This currently does
- // nothing for any operation other than Write().
- void Cancel();
+ // Try to cancel the current operation [we support cancelling write or
+ // truncate only]. Report failure for the current operation, then tell the
+ // passed-in operation to report success.
+ void Cancel(FileSystemOperation* cancel_operation);
protected:
// Proxy for calling file_util_proxy methods.
@@ -114,9 +114,28 @@ class FileSystemOperation {
base::ScopedCallbackFactory<FileSystemOperation> callback_factory_;
+ FileSystemOperation* cancel_operation_;
+
#ifndef NDEBUG
+ enum OperationType {
+ kOperationNone,
+ kOperationCreateFile,
+ kOperationCreateDirectory,
+ kOperationCopy,
+ kOperationMove,
+ kOperationDirectoryExists,
+ kOperationFileExists,
+ kOperationGetMetadata,
+ kOperationReadDirectory,
+ kOperationRemove,
+ kOperationWrite,
+ kOperationTruncate,
+ kOperationTouchFile,
+ kOperationCancel,
+ };
+
// A flag to make sure we call operation only once per instance.
- bool operation_pending_;
+ OperationType pending_operation_;
#endif
DISALLOW_COPY_AND_ASSIGN(FileSystemOperation);
diff --git a/webkit/fileapi/file_system_operation_unittest.cc b/webkit/fileapi/file_system_operation_unittest.cc
index 93680a0..9148811 100644
--- a/webkit/fileapi/file_system_operation_unittest.cc
+++ b/webkit/fileapi/file_system_operation_unittest.cc
@@ -52,6 +52,10 @@ class MockDispatcher : public fileapi::FileSystemCallbackDispatcher {
NOTREACHED();
}
+ virtual void DidWrite(int64 bytes, bool complete) {
+ NOTREACHED();
+ }
+
// Helpers for testing.
int status() const { return status_; }
int request_id() const { return request_id_; }
@@ -553,3 +557,57 @@ TEST_F(FileSystemOperationTest, TestRemoveSuccess) {
EXPECT_FALSE(file_util::DirectoryExists(empty_dir.path()));
EXPECT_EQ(request_id_, mock_dispatcher_->request_id());
}
+
+TEST_F(FileSystemOperationTest, TestTruncate) {
+ ScopedTempDir dir;
+ ASSERT_TRUE(dir.CreateUniqueTempDir());
+ FilePath file;
+ file_util::CreateTemporaryFileInDir(dir.path(), &file);
+
+ char test_data[] = "test data";
+ EXPECT_EQ(sizeof(test_data),
+ file_util::WriteFile(file, test_data, sizeof(test_data)));
+
+ // Check that its length is the size of the data written.
+ operation()->GetMetadata(file);
+ MessageLoop::current()->RunAllPending();
+ EXPECT_EQ(kFileOperationSucceeded, mock_dispatcher_->status());
+ EXPECT_FALSE(mock_dispatcher_->info().is_directory);
+ EXPECT_EQ(sizeof(test_data), mock_dispatcher_->info().size);
+ EXPECT_EQ(request_id_, mock_dispatcher_->request_id());
+
+ // Extend the file by truncating it.
+ int length = 17;
+ operation()->Truncate(file, length);
+ MessageLoop::current()->RunAllPending();
+ EXPECT_EQ(kFileOperationSucceeded, mock_dispatcher_->status());
+ EXPECT_EQ(request_id_, mock_dispatcher_->request_id());
+
+ // Check that its length is now 17 and that it's all zeroes after the test
+ // data.
+ base::PlatformFileInfo info;
+ EXPECT_TRUE(file_util::GetFileInfo(file, &info));
+ EXPECT_EQ(length, info.size);
+ char data[100];
+ EXPECT_EQ(length, file_util::ReadFile(file, data, length));
+ for (int i = 0; i < length; ++i) {
+ if (i < sizeof(test_data))
+ EXPECT_EQ(test_data[i], data[i]);
+ else
+ EXPECT_EQ(0, data[i]);
+ }
+
+ // Shorten the file by truncating it.
+ length = 3;
+ operation()->Truncate(file, length);
+ MessageLoop::current()->RunAllPending();
+ EXPECT_EQ(kFileOperationSucceeded, mock_dispatcher_->status());
+ EXPECT_EQ(request_id_, mock_dispatcher_->request_id());
+
+ // Check that its length is now 3 and that it contains only bits of test data.
+ EXPECT_TRUE(file_util::GetFileInfo(file, &info));
+ EXPECT_EQ(length, info.size);
+ EXPECT_EQ(length, file_util::ReadFile(file, data, length));
+ for (int i = 0; i < length; ++i)
+ EXPECT_EQ(test_data[i], data[i]);
+}
diff --git a/webkit/glue/plugins/pepper_file_system.cc b/webkit/glue/plugins/pepper_file_system.cc
index 82a2fc8..6068ca5 100644
--- a/webkit/glue/plugins/pepper_file_system.cc
+++ b/webkit/glue/plugins/pepper_file_system.cc
@@ -54,6 +54,10 @@ class StatusCallback : public fileapi::FileSystemCallbackDispatcher {
RunCallback(error_code);
}
+ virtual void DidWrite(int64 bytes, bool complete) {
+ NOTREACHED();
+ }
+
private:
void RunCallback(base::PlatformFileError error_code) {
if (!module_.get() || !callback_.func)
@@ -105,6 +109,10 @@ class QueryInfoCallback : public fileapi::FileSystemCallbackDispatcher {
RunCallback(error_code, base::PlatformFileInfo());
}
+ virtual void DidWrite(int64 bytes, bool complete) {
+ NOTREACHED();
+ }
+
private:
void RunCallback(base::PlatformFileError error_code,
const base::PlatformFileInfo& file_info) {
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index 3739a62..8e059ea 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -92,7 +92,7 @@ class TestShellFileSystemCallbackDispatcher
file_system_->RemoveCompletedOperation(request_id_);
}
- virtual void DidWrite(int64, bool, fileapi::FileSystemOperation*) {
+ virtual void DidWrite(int64, bool) {
NOTREACHED();
}
generated by cgit v1.1 at 2025-02-01 14:45:27 +0000