projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
net
/
base
/
file_stream.cc
diff --git
a/src/net/base/file_stream.cc
b/src/net/base/file_stream.cc
index
bf56a49
..
cadbaed
100644
(file)
--- a/
src/net/base/file_stream.cc
+++ b/
src/net/base/file_stream.cc
@@
-30,12
+30,12
@@
int FileStream::Open(const base::FilePath& path, int open_flags,
}
DCHECK(open_flags & base::File::FLAG_ASYNC);
}
DCHECK(open_flags & base::File::FLAG_ASYNC);
- context_->Open
Async
(path, open_flags, callback);
+ context_->Open(path, open_flags, callback);
return ERR_IO_PENDING;
}
int FileStream::Close(const CompletionCallback& callback) {
return ERR_IO_PENDING;
}
int FileStream::Close(const CompletionCallback& callback) {
- context_->Close
Async
(callback);
+ context_->Close(callback);
return ERR_IO_PENDING;
}
return ERR_IO_PENDING;
}
@@
-43,13
+43,13
@@
bool FileStream::IsOpen() const {
return context_->file().IsValid();
}
return context_->file().IsValid();
}
-int FileStream::Seek(Whence whence,
+int FileStream::Seek(
base::File::
Whence whence,
int64 offset,
const Int64CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
int64 offset,
const Int64CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
- context_->Seek
Async
(whence, offset, callback);
+ context_->Seek(whence, offset, callback);
return ERR_IO_PENDING;
}
return ERR_IO_PENDING;
}
@@
-62,7
+62,7
@@
int FileStream::Read(IOBuffer* buf,
// read(..., 0) will return 0, which indicates end-of-file.
DCHECK_GT(buf_len, 0);
// read(..., 0) will return 0, which indicates end-of-file.
DCHECK_GT(buf_len, 0);
- return context_->Read
Async
(buf, buf_len, callback);
+ return context_->Read(buf, buf_len, callback);
}
int FileStream::Write(IOBuffer* buf,
}
int FileStream::Write(IOBuffer* buf,
@@
-71,17
+71,15
@@
int FileStream::Write(IOBuffer* buf,
if (!IsOpen())
return ERR_UNEXPECTED;
if (!IsOpen())
return ERR_UNEXPECTED;
- // write(..., 0) will return 0, which indicates end-of-file.
- DCHECK_GT(buf_len, 0);
-
- return context_->WriteAsync(buf, buf_len, callback);
+ DCHECK_GE(buf_len, 0);
+ return context_->Write(buf, buf_len, callback);
}
int FileStream::Flush(const CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
}
int FileStream::Flush(const CompletionCallback& callback) {
if (!IsOpen())
return ERR_UNEXPECTED;
- context_->Flush
Async
(callback);
+ context_->Flush(callback);
return ERR_IO_PENDING;
}
return ERR_IO_PENDING;
}